Skip to content

Commit e703311

Browse files
authored
feat: support for dotnet9.0 dotnet10 (#751)
* feat: support for dotnet9.0 dotnet10 * Update pr_run_test_ci.yml * chore: update * chore: update * fix: update async lock to SemaphoreSlim * chore: update test * chore: update * chore: update * chore: update * chroe: update * Update pr_run_test_ci.yml * chore: update unit tests env empty to null * chore: update * chore: update * chore: update
1 parent c6f3810 commit e703311

File tree

16 files changed

+254
-181
lines changed

16 files changed

+254
-181
lines changed

.github/workflows/pr_run_test_ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
uses: actions/setup-dotnet@v1
3939
with:
4040
dotnet-version: |
41+
10.0.x
42+
9.0.x
4143
8.0.x
4244
7.0.x
43-
6.0.x
45+
6.0.x
4446
4547
include-prerelease: true
4648

@@ -101,7 +103,13 @@ jobs:
101103
run: |
102104
dotnet-sonarscanner begin /k:"masastack_MASA.Framework" /o:"masastack" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
103105
dotnet build /p:ContinuousIntegrationBuild=true
104-
dotnet test --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
106+
107+
dotnet test --framework net6.0 --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
108+
dotnet test --framework net7.0 --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
109+
dotnet test --framework net8.0 --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
110+
dotnet test --framework net9.0 --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
111+
dotnet test --framework net10.0 --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
112+
105113
dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
106114
- name: Build and analyze for outside
107115
env:

Directory.Build.props

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4-
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</MicrosoftPackageVersion>
5-
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</MicrosoftPackageVersion>
6-
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</MicrosoftPackageVersion>
3+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0;</TargetFrameworks>
4+
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.*</MicrosoftPackageVersion>
5+
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.*</MicrosoftPackageVersion>
6+
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.*</MicrosoftPackageVersion>
7+
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.*</MicrosoftPackageVersion>
8+
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0.0-preview.*</MicrosoftPackageVersion>
9+
710
<BenchmarkDotNetPackageVersion>0.13.1</BenchmarkDotNetPackageVersion>
811
<MSTestPackageVersion>2.2.3</MSTestPackageVersion>
912
<MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
@@ -16,15 +19,11 @@
1619
<MedallionDistributedLockPackageVersion>1.0.4</MedallionDistributedLockPackageVersion>
1720
<FluentValidationPackageVersion>11.1.0</FluentValidationPackageVersion>
1821
<FluentValidationAspNetCorePackageVersion>11.1.2</FluentValidationAspNetCorePackageVersion>
19-
<StackExchangeRedisPackageVersion>2.2.4</StackExchangeRedisPackageVersion>
22+
<StackExchangeRedisPackageVersion>2.8.41</StackExchangeRedisPackageVersion>
2023
<NESTPackageVersion>7.17.4</NESTPackageVersion>
2124
<IdentityPackageVersion>7.5.0</IdentityPackageVersion>
2225
<IdentityModelPackageVersion>6.0.0</IdentityModelPackageVersion>
2326

24-
<OpenTelemetryVersion>1.5.1</OpenTelemetryVersion>
25-
<OpenTelemetryContribVersion>1.5.0</OpenTelemetryContribVersion>
26-
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.10</OpenTelemetryInstrumentationVersion>
27-
2827
<PackageId>$(AssemblyName)</PackageId>
2928
<PackageIcon>packageIcon.png</PackageIcon>
3029
<Authors>MASA Stack</Authors>

0 commit comments

Comments
 (0)