dapr
/
dotnet-sdk
mirror of https://github.com/dapr/dotnet-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add net7 to testing matrix (#1005) 

Signed-off-by: halspang <halspang@microsoft.com>

Signed-off-by: halspang <halspang@microsoft.com>
This commit is contained in:
halspang 2023-01-26 11:00:43 -08:00 committed by GitHub
parent 389de69180
commit 76d4b682ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 96 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.github/workflows/itests.yml vendored
View File

@ -19,26 +19,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ['3.1', '5.0', '6.0']
dotnet-version: ['3.1', '6.0', '7.0']
include:
- dotnet-version: '3.1'
install-3: true
install-5: false
display-name: '.NET Core 3.1'
framework: 'netcoreapp3.1'
prefix: 'netcoreapp31'
- dotnet-version: '5.0'
install-3: false
install-5: true
display-name: '.NET 5.0'
framework: 'net5'
prefix: 'net5'
install-version: '3.1.x' # We always need a new .NET
- dotnet-version: '6.0'
install-3: false
install-5: false
display-name: '.NET 6.0'
framework: 'net6'
prefix: 'net6'
install-version: '6.0.x'
- dotnet-version: '7.0'
install-3: false
display-name: '.NET 7.0'
framework: 'net7'
prefix: 'net7'
install-version: '7.0.x'
env:
NUPKG_OUTDIR: bin/Release/nugets
GOVER: 1.17
@ -110,20 +110,15 @@ jobs:
docker ps
- name: Setup Vault's test token
run: echo myroot > /tmp/.hashicorp_vault_token
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
if: matrix.install-3
with:
dotnet-version: 3.1.x
- name: Setup .NET 5.0
uses: actions/setup-dotnet@v1
if: matrix.install-5
with:
dotnet-version: 5.0.x
- name: Setup .NET 6.0 # We always need 6.0 to build.
- name: Setup ${{ matrix.display-name }}
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: ${{ matrix.install-version }}
- name: Setup .NET 7.0 # net7 is always required.
uses: actions/setup-dotnet@v1
if: ${{ matrix.install-version != '7.0.x' }}
with:
dotnet-version: 7.0.x
- name: Build
# disable deterministic builds, just for test run. Deterministic builds break coverage for some reason
run: dotnet build --configuration release /p:GITHUB_ACTIONS=false

39
.github/workflows/sdk_build.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x
- name: Build
run: dotnet build --configuration release
- name: Generate Packages
@ -42,44 +42,39 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ['3.1', '5.0', '6.0']
dotnet-version: ['3.1', '6.0', '7.0']
include:
- dotnet-version: '3.1'
install-3: true
install-5: false
display-name: '.NET Core 3.1'
framework: 'netcoreapp3.1'
prefix: 'netcoreapp31'
- dotnet-version: '5.0'
install-3: false
install-5: true
display-name: '.NET 5.0'
framework: 'net5'
prefix: 'net5'
install-version: '3.1.x' # We always need a new .NET
- dotnet-version: '6.0'
install-3: false
install-5: false
display-name: '.NET 6.0'
framework: 'net6'
prefix: 'net6'
install-version: '6.0.x'
- dotnet-version: '7.0'
install-3: false
display-name: '.NET 7.0'
framework: 'net7'
prefix: 'net7'
install-version: '7.0.x'
steps:
- uses: actions/checkout@v1
- name: Parse release version
run: python ./.github/scripts/get_release_version.py
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
if: matrix.install-3
with:
dotnet-version: 3.1.x
- name: Setup .NET 5.0
uses: actions/setup-dotnet@v1
if: matrix.install-5
with:
dotnet-version: 5.0.x
- name: Setup .NET 6.0 # We always need 6.0 to build.
- name: Setup ${{ matrix.display-name }}
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: ${{ matrix.install-version }}
- name: Setup .NET 7.0 # net7 is always required.
uses: actions/setup-dotnet@v1
if: ${{ matrix.install-version != '7.0.x' }}
with:
dotnet-version: 7.0.x
- name: Build
# disable deterministic builds, just for test run. Deterministic builds break coverage for some reason
run: dotnet build --configuration release /p:GITHUB_ACTIONS=false

4
global.json
View File

@ -1,7 +1,7 @@
{
"_comment": "This policy allows the 5.0.100 SDK or patches in that family.",
"_comment": "This policy allows the 7.0.101 SDK or patches in that family.",
"sdk": {
"version": "5.0.100",
"version": "7.0.101",
"rollForward": "latestMajor"
}
}

2
test/Dapr.Actors.AspNetCore.IntegrationTest.App/Dapr.Actors.AspNetCore.IntegrationTest.App.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

4
test/Dapr.Actors.AspNetCore.IntegrationTest/ActivationTests.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ namespace Dapr.Actors.AspNetCore.IntegrationTest
public async Task CanActivateActorWithDependencyInjection()
{
using var factory = new AppWebApplicationFactory();
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
// Doing this twice verifies that the Actor stays active and retains state using DI.
var text = await IncrementCounterAsync(httpClient, "A");

2
test/Dapr.Actors.AspNetCore.IntegrationTest/Dapr.Actors.AspNetCore.IntegrationTest.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

8
test/Dapr.Actors.AspNetCore.IntegrationTest/HostingTests.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -14,6 +14,8 @@
using System;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Hosting;
@ -24,8 +26,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Xunit;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Xunit.Sdk;
namespace Dapr.Actors.AspNetCore.IntegrationTest
@ -56,7 +56,7 @@ namespace Dapr.Actors.AspNetCore.IntegrationTest
{
using var factory = new AppWebApplicationFactory();
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var response = await httpClient.GetAsync("/healthz");
await Assert2XXStatusAsync(response);
}

2
test/Dapr.Actors.AspNetCore.Test/Dapr.Actors.AspNetCore.Test.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
<BaseNamespace>Dapr.Actors.AspNetCore</BaseNamespace>
</PropertyGroup>

2
test/Dapr.Actors.Test/Dapr.Actors.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
<RootNamespace>Dapr.Actors</RootNamespace>
<DefineConstants>$(DefineConstants);ACTORS</DefineConstants>
</PropertyGroup>

2
test/Dapr.AspNetCore.IntegrationTest.App/Dapr.AspNetCore.IntegrationTest.App.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

10
test/Dapr.AspNetCore.IntegrationTest/AuthenticationTest.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------
using System.Net;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
@ -33,7 +33,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
Name = "jimmy"
};
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/requires-api-token")
{
Content = new StringContent(JsonConvert.SerializeObject(userInfo), Encoding.UTF8, "application/json")
@ -56,14 +56,14 @@ namespace Dapr.AspNetCore.IntegrationTest
{
Name = "jimmy"
};
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/requires-api-token")
{
Content = new StringContent(JsonConvert.SerializeObject(userInfo), Encoding.UTF8, "application/json")
};
request.Headers.Add("Dapr-Api-Token", "asdfgh");
var response = await httpClient.SendAsync(request);
response.StatusCode.Should().Be(HttpStatusCode.Unauthorized);
}
}

12
test/Dapr.AspNetCore.IntegrationTest/CloudEventsIntegrationTest.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -35,7 +35,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/B")
{
@ -53,7 +53,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/register-user")
{
@ -83,7 +83,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/register-user")
{
@ -114,7 +114,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/register-user-plaintext")
{
@ -145,7 +145,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/register-user")
{

19
test/Dapr.AspNetCore.IntegrationTest/ControllerIntegrationTest.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -13,7 +13,6 @@
namespace Dapr.AspNetCore.IntegrationTest
{
using System;
using System.Net.Http;
using System.Threading.Tasks;
using Dapr.AspNetCore.IntegrationTest.App;
@ -28,7 +27,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
await daprClient.SaveStateAsync("testStore", "test", new Widget() { Size = "small", Count = 17, });
@ -47,7 +46,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
var widget = new Widget() { Size = "small", Count = 17, };
@ -67,7 +66,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/controllerwithoutstateentry/test");
@ -84,7 +83,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
await daprClient.SaveStateAsync("testStore", "test", new Widget() { Size = "small", Count = 17, });
@ -103,7 +102,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
await daprClient.SaveStateAsync("testStore", "test", new Widget() { Size = "small", Count = 17, });
@ -122,7 +121,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
var widget = new Widget() { Size = "small", Count = 17, };
@ -142,7 +141,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/controllerwithstateentry/test");
@ -159,7 +158,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/echo-user?name=jimmy");

2
test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

4
test/Dapr.AspNetCore.IntegrationTest/RoutingIntegrationTest.cs
View File

@ -1,4 +1,4 @@
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Copyright 2021 The Dapr Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var daprClient = factory.DaprClient;
await daprClient.SaveStateAsync("testStore", "test", new Widget() { Size = "small", Count = 17, });

8
test/Dapr.AspNetCore.IntegrationTest/SubscribeEndpointTest.cs
View File

@ -28,7 +28,7 @@ namespace Dapr.AspNetCore.IntegrationTest
{
using (var factory = new AppWebApplicationFactory())
{
var httpClient = factory.CreateClient();
var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/dapr/subscribe");
var response = await httpClient.SendAsync(request);
@ -61,8 +61,8 @@ namespace Dapr.AspNetCore.IntegrationTest
{
rawPayload = rawPayloadJson.GetString();
}
foreach (var originalMetadataProperty in metadata.EnumerateObject().OrderBy(c=>c.Name))
foreach (var originalMetadataProperty in metadata.EnumerateObject().OrderBy(c => c.Name))
{
if (!originalMetadataProperty.Name.Equals("rawPayload"))
{
@ -70,7 +70,7 @@ namespace Dapr.AspNetCore.IntegrationTest
}
}
}
var originalMetadataString= string.Empty;
var originalMetadataString = string.Empty;
if (originalMetadata.Count > 0)
{
originalMetadataString = string.Join(";", originalMetadata.Select(c => $"{c.Key}={c.Value}"));

2
test/Dapr.AspNetCore.Test/Dapr.AspNetCore.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/Dapr.Client.Test/Dapr.Client.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/Dapr.E2E.Test.Actors/Dapr.E2E.Test.Actors.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/Dapr.E2E.Test.App.Grpc/Dapr.E2E.Test.App.Grpc.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.39.0" />

2
test/Dapr.E2E.Test.App.ReentrantActor/Dapr.E2E.Test.App.ReentrantActors.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Dapr.E2E.Test.App.ReentrantActor' " />

2
test/Dapr.E2E.Test.App/Dapr.E2E.Test.App.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/Dapr.E2E.Test/Dapr.E2E.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.9.0" />

26
test/Dapr.E2E.Test/DaprTestApp.cs
View File

@ -11,16 +11,16 @@
// limitations under the License.
// ------------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Runtime.Versioning;
using Xunit.Abstractions;
using static System.IO.Path;
using System.Runtime.Versioning;
using System;
using System.Collections.Generic;
using System.Globalization;
namespace Dapr.E2E.Test
{
@ -28,8 +28,8 @@ namespace Dapr.E2E.Test
{
static string daprBinaryName = "dapr";
private string appId;
private readonly string[] outputToMatchOnStart = new string[]{ "dapr initialized. Status: Running.", };
private readonly string[] outputToMatchOnStop = new string[]{ "app stopped successfully", "failed to stop app id", };
private readonly string[] outputToMatchOnStart = new string[] { "dapr initialized. Status: Running.", };
private readonly string[] outputToMatchOnStop = new string[] { "app stopped successfully", "failed to stop app id", };
private ITestOutputHelper testOutput;
@ -63,12 +63,12 @@ namespace Dapr.E2E.Test
if (configuration.UseAppPort)
{
arguments.AddRange(new[]{ "--app-port", appPort.ToString(CultureInfo.InvariantCulture), });
arguments.AddRange(new[] { "--app-port", appPort.ToString(CultureInfo.InvariantCulture), });
}
if (!string.IsNullOrEmpty(configuration.AppProtocol))
{
arguments.AddRange(new[]{ "--app-protocol", configuration.AppProtocol });
arguments.AddRange(new[] { "--app-protocol", configuration.AppProtocol });
}
arguments.AddRange(new[]
@ -85,8 +85,8 @@ namespace Dapr.E2E.Test
if (configuration.UseAppPort)
{
// The first argument is the port, if the application needs it.
arguments.AddRange(new[]{ "--", $"{appPort.ToString(CultureInfo.InvariantCulture)}" });
arguments.AddRange(new[]{ "--urls", $"http://localhost:{appPort.ToString(CultureInfo.InvariantCulture)}", });
arguments.AddRange(new[] { "--", $"{appPort.ToString(CultureInfo.InvariantCulture)}" });
arguments.AddRange(new[] { "--urls", $"http://localhost:{appPort.ToString(CultureInfo.InvariantCulture)}", });
}
// TODO: we don't do any quoting right now because our paths are guaranteed not to contain spaces
@ -136,10 +136,14 @@ namespace Dapr.E2E.Test
{
frameworkMoniker = "net5";
}
else
else if (targetFrameworkName == ".NETCoreApp,Version=v6.0")
{
frameworkMoniker = "net6";
}
else
{
frameworkMoniker = "net7";
}
return frameworkMoniker;
}

2
test/Dapr.Extensions.Configuration.Test/Dapr.Extensions.Configuration.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6;net7</TargetFrameworks>
</PropertyGroup>
<ItemGroup>