Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/Codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
10.0.x
9.0.x
8.0.x
7.0.x
6.0.x
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci_test_reports_to_oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
10.0.x
9.0.x
8.0.x
7.0.x
6.0.x
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/package_push_nuget.org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
10.0.x
9.0.x
8.0.x
7.0.x
6.0.x
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/pr_run_test_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
10.0.x
9.0.x
8.0.x
7.0.x
6.0.x
6.0.x

include-prerelease: true

Expand Down Expand Up @@ -101,7 +103,13 @@ jobs:
run: |
dotnet-sonarscanner begin /k:"masastack_MASA.Framework" /o:"masastack" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
dotnet build /p:ContinuousIntegrationBuild=true
dotnet test --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal --collect "Code Coverage" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"

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]*"
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]*"
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]*"
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]*"
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]*"

dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
- name: Build and analyze for outside
env:
Expand Down
17 changes: 8 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</MicrosoftPackageVersion>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0;</TargetFrameworks>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0.0-preview.*</MicrosoftPackageVersion>

<BenchmarkDotNetPackageVersion>0.13.1</BenchmarkDotNetPackageVersion>
<MSTestPackageVersion>2.2.3</MSTestPackageVersion>
<MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
Expand All @@ -16,15 +19,11 @@
<MedallionDistributedLockPackageVersion>1.0.4</MedallionDistributedLockPackageVersion>
<FluentValidationPackageVersion>11.1.0</FluentValidationPackageVersion>
<FluentValidationAspNetCorePackageVersion>11.1.2</FluentValidationAspNetCorePackageVersion>
<StackExchangeRedisPackageVersion>2.2.4</StackExchangeRedisPackageVersion>
<StackExchangeRedisPackageVersion>2.8.41</StackExchangeRedisPackageVersion>
<NESTPackageVersion>7.17.4</NESTPackageVersion>
<IdentityPackageVersion>7.5.0</IdentityPackageVersion>
<IdentityModelPackageVersion>6.0.0</IdentityModelPackageVersion>

<OpenTelemetryVersion>1.5.1</OpenTelemetryVersion>
<OpenTelemetryContribVersion>1.5.0</OpenTelemetryContribVersion>
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.10</OpenTelemetryInstrumentationVersion>

<PackageId>$(AssemblyName)</PackageId>
<PackageIcon>packageIcon.png</PackageIcon>
<Authors>MASA Stack</Authors>
Expand Down
Loading
Loading