diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml index a1e32115fa..6aac99af19 100644 --- a/.github/workflows/aot-check.yml +++ b/.github/workflows/aot-check.yml @@ -18,16 +18,16 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 1 - name: Setup .NET SDK from global.json - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: ./global.json - name: Runs powershell script id: aot-powershell - run: build\test-aot.ps1 'net8.0' + run: build\test-aot.ps1 'net10.0' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 22e9dedfe8..1875a32bd2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,12 +22,12 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 2 - name: Setup .NET SDK from global.json - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: global-json-file: ./global.json diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index af4cf71b01..95615bb5f8 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -18,7 +18,7 @@ on: - dev env: - TargetNetNext: True + TargetNetNext: False jobs: build: @@ -44,11 +44,6 @@ jobs: with: global-json-file: ./global.json - - name: Setup latest .NET 10 RC SDK - uses: actions/setup-dotnet@v5 - with: - dotnet-version: 10.0.100-rc.1.25451.107 - - name: Strong name bypass run: | regedit /s .\build\strongNameBypass.reg diff --git a/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj b/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj index aeb36836e7..f35a224d23 100644 --- a/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj +++ b/benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj @@ -4,8 +4,8 @@ Microsoft.IdentityModel.Benchmarks Microsoft.IdentityModel.Benchmarks Exe - net6.0;net8.0;net9.0 - $(TargetFrameworks);net10.0 + net6.0;net8.0;net9.0;net10.0 + $(TargetFrameworks); True True $(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk @@ -24,10 +24,6 @@ --> - - true - - false diff --git a/build/dependencies.props b/build/dependencies.props index f0232f5953..6705437e30 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -16,14 +16,13 @@ true - false $(WarningsNotAsErrors);NU1510;NU5104 $(NoWarn);NU5104 - 10.0.0-rc.1.25451.107 + 10.0.0 diff --git a/build/dependenciesTest.props b/build/dependenciesTest.props index d725d4b5c8..4f1f75932f 100644 --- a/build/dependenciesTest.props +++ b/build/dependenciesTest.props @@ -24,10 +24,6 @@ 2.3.24 - - true - - 3.0.0-pre.49 diff --git a/build/targets.props b/build/targets.props index cfb404af62..df6240172d 100644 --- a/build/targets.props +++ b/build/targets.props @@ -1,12 +1,12 @@ - + - net462;net472;netstandard2.0;net6.0;net8.0;net9.0 - netstandard2.0;net8.0;net9.0 - $(SrcTargets);net10.0 + net462;net472;netstandard2.0;net6.0;net8.0;net9.0;net10.0 + netstandard2.0;net8.0;net9.0;net10.0 + $(SrcTargets) diff --git a/build/targetsTest.props b/build/targetsTest.props index 129c6f909b..689c442898 100644 --- a/build/targetsTest.props +++ b/build/targetsTest.props @@ -1,12 +1,12 @@ - + - net462;net472;net6.0;net8.0;net9.0 - net8.0;net9.0 - $(TestTargets);net10.0 + net462;net472;net6.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 + $(TestTargets) diff --git a/build/template-Build-run-tests-sign.yml b/build/template-Build-run-tests-sign.yml index 992c76fabd..b500082e5b 100644 --- a/build/template-Build-run-tests-sign.yml +++ b/build/template-Build-run-tests-sign.yml @@ -2,7 +2,7 @@ parameters: - name: TargetNetNext type: string - default: "True" + default: "False" steps: - script: echo $(BuildConfiguration) @@ -37,14 +37,6 @@ steps: version: 8.x installationPath: $(Agent.ToolsDirectory)/dotnet -- task: UseDotNet@2 - displayName: 'Use .Net Core SDK 10.x' - inputs: - useGlobalJson: false - includePreviewVersions: true - version: 10.x - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: DotNetCoreCLI@2 displayName: 'dotnet --list-sdks' inputs: diff --git a/global.json b/global.json index acbbe213d0..aefdc4601d 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "sdk": { - "version": "9.0.111", - "allowPrerelease": true, - "rollForward": "latestMajor" + "version": "10.0.100", + "allowPrerelease": false, + "rollForward": "latestFeature" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.56" diff --git a/runTests.ps1 b/runTests.ps1 index add5da168f..5a04a6eb55 100644 --- a/runTests.ps1 +++ b/runTests.ps1 @@ -30,9 +30,19 @@ function WriteSectionFooter($sectionName) ################################################# Functions ############################################################ -$env:TargetNetNext = "True" - WriteSectionHeader("runTests.ps1"); + +if (Test-Path $env:TargetNetNext) +{ + Write-Host "using TargetNetNext from env:" $env:TargetNetNext +} +else +{ + Write-Host "using TargetNetNext as false" + $env:TargetNetNext = "False" +} + + Write-Host "buildType: " $buildType; Write-Host "dotnetDir: " $dotnetDir Write-Host "root: " $root; @@ -48,7 +58,6 @@ $startTime = Get-Date Write-Host "Start Time: " $startTime Write-Host "PSScriptRoot: " $PSScriptRoot; Write-Host "dotnetexe: " $dotnetexe; -Write-Host "TargetNetNext: " $env:TargetNetNext; $ErrorActionPreference = "Stop" diff --git a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj index 18b86da304..5684fd7dd0 100644 --- a/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj +++ b/src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj @@ -8,8 +8,8 @@ true Microsoft.IdentityModel.LoggingExtensions .NET;Windows;Authentication;Identity;Extensions;Logging - netstandard2.0;net9.0 - $(TargetFrameworks);net10.0 + netstandard2.0;net9.0;net10.0 + $(TargetFrameworks) enable diff --git a/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj b/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj index 84b01a3c1e..f1f5488fa0 100644 --- a/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj +++ b/test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj @@ -1,8 +1,8 @@  - net8.0;net9.0 - $(TargetFrameworks);net10.0 + net8.0;net9.0;net10.0 + $(TargetFrameworks) Exe true full