Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .NET 9 GA. Update some test dependencies. #2990

Merged
merged 12 commits into from
Nov 14, 2024
Merged

Update to .NET 9 GA. Update some test dependencies. #2990

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b2432ea
Update to .NET 9 GA. Update some test dependencies.
pmaytak Nov 9, 2024
17e5251
Merge remote-tracking branch 'origin/dev' into pmaytak/net9
pmaytak Nov 11, 2024
0bc49b6
Remove installing extra SDKs in YAML.
pmaytak Nov 12, 2024
cd7e0c8
Add TargetNetNext flag.
pmaytak Nov 12, 2024
f1f5397
Update template-Build-run-tests-sign.yml
pmaytak Nov 12, 2024
6ab1d5d
Merge remote-tracking branch 'origin/dev' into pmaytak/net9
pmaytak Nov 13, 2024
f23507c
Nit.
pmaytak Nov 13, 2024
1a9f885
Update aot-check.yml
pmaytak Nov 13, 2024
a226e09
Update yaml.
pmaytak Nov 14, 2024
c3fb82c
Merge remote-tracking branch 'origin/dev' into pmaytak/net9
pmaytak Nov 14, 2024
6a16ad6
Fix AOT test.
pmaytak Nov 14, 2024
d462a44
Add strong name bypass
pmaytak Nov 14, 2024
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
17 changes: 4 additions & 13 deletions .github/workflows/dotnetcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ on:
- dev

env:
TargetNet9: True
pmaytak marked this conversation as resolved.
Show resolved Hide resolved
TargetNet8: True
TargetNetNext: True

jobs:
build:
Expand All @@ -29,19 +28,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Setup .NET 6.0.x
msbw2 marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/[email protected]
with:
dotnet-version: 6.0.x
- name: Setup .NET 8.0.x
uses: actions/[email protected]
with:
dotnet-version: 8.0.x
- name: Setup .NET 9.0.x

- name: Setup .NET 9.x
uses: actions/[email protected]
with:
dotnet-version: 9.0.100-rc.2.24474.11
dotnet-version: 9.x
pmaytak marked this conversation as resolved.
Show resolved Hide resolved

- name: Run the tests
run: dotnet test Wilson.sln --collect:"XPlat Code Coverage" --settings:./build/CodeCoverage.runsettings
pmaytak marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<AssemblyName>Microsoft.IdentityModel.Benchmarks</AssemblyName>
<PackageId>Microsoft.IdentityModel.Benchmarks</PackageId>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
pmaytak marked this conversation as resolved.
Show resolved Hide resolved
<TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFrameworks); net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand Down
2 changes: 1 addition & 1 deletion build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<ItemGroup>
<!-- Protects against sync-over-async: https://github.com/microsoft/vs-threading/blob/main/doc/analyzers/index.md. -->
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All"/>
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions build/dependenciesTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<BannedApiAnalyzersVersion>3.3.4</BannedApiAnalyzersVersion>
<DotNetCoreAppRuntimeVersion>2.1.30</DotNetCoreAppRuntimeVersion>
<MicrosoftAzureKeyVaultCryptographyVersion>3.0.5</MicrosoftAzureKeyVaultCryptographyVersion>
<MicrosoftNETTestSdkVersion>17.11.0</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<NetStandardVersion>2.0.3</NetStandardVersion>
<NewtonsoftVersion>13.0.3</NewtonsoftVersion>
<SystemNetHttp>4.3.4</SystemNetHttp>
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
<SystemTextJson>8.0.5</SystemTextJson>
<SystemTextRegularExpressions>4.3.1</SystemTextRegularExpressions>
<XunitRunnerConsoleVersion>2.9.0</XunitRunnerConsoleVersion>
<XunitRunnerConsoleVersion>2.9.2</XunitRunnerConsoleVersion>
<XunitRunnerVisualStudioVersion>2.8.2</XunitRunnerVisualStudioVersion>
<XunitVersion>2.9.0</XunitVersion>
<XunitVersion>2.9.2</XunitVersion>
<MicrosoftRestClientRuntimeVersion>2.3.24</MicrosoftRestClientRuntimeVersion>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
<XunitRunnerVisualStudioVersion>3.0.0-pre.35</XunitRunnerVisualStudioVersion>
<XunitRunnerVisualStudioVersion>3.0.0-pre.49</XunitRunnerVisualStudioVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions build/targets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<SrcTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;netstandard2.0;net6.0;net8.0</SrcTargets>
<SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0;net8.0</SrcTargets>
<SrcTargets Condition="'$(TargetNet9)' == 'True'">$(SrcTargets);net9.0</SrcTargets>
pmaytak marked this conversation as resolved.
Show resolved Hide resolved
<SrcTargets Condition="'$(LocalBuild)' != 'True'">net462; net472; netstandard2.0; net6.0; net8.0; net9.0</SrcTargets>
<SrcTargets Condition="'$(LocalBuild)' == 'True'">netstandard2.0; net8.0; net9.0</SrcTargets>
<SrcTargets Condition="'$(TargetNetNext)'== 'True'">$(SrcTargets); </SrcTargets>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions build/targetsTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<TestTargets Condition="'$(LocalBuild)' != 'True'">net462;net472;net6.0;net8.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0</TestTargets>
<TestTargets Condition="'$(TargetNet9)' == 'True'">$(TestTargets);net9.0</TestTargets>
</PropertyGroup>
<TestTargets Condition="'$(LocalBuild)' != 'True'">net462; net472; net6.0; net8.0; net9.0</TestTargets>
<TestTargets Condition="'$(LocalBuild)' == 'True'">net8.0; net9.0</TestTargets>
<TestTargets Condition="'$(TargetNetNext)'== 'True'">$(TestTargets); </TestTargets>
</PropertyGroup>
</Project>
23 changes: 2 additions & 21 deletions build/template-Build-run-tests-sign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,11 @@ steps:
- script: echo $(MicrosoftIdentityModelVersion)
displayName: 'display MicrosoftIdentityModelVersion'

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 2.x'
inputs:
version: 2.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 6.x'
inputs:
version: 6.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 8.x'
inputs:
version: 8.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: UseDotNet@2
displayName: 'Use .Net Core SDK 9.x'
inputs:
version: 9.0.100-rc.2.24474.11
includePreviewVersions: true
condition: eq(variables['TargetNet9'], 'True')
version: 9.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: DotNetCoreCLI@2
displayName: 'dotnet --list-sdks'
Expand Down
4 changes: 2 additions & 2 deletions ...ityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks Condition="'$(TargetNet9)' == 'True'">$(TargetFramework); net9.0</TargetFrameworks>
<TargetFrameworks>net8.0; net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
<OutputType>Exe</OutputType>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>full</TrimMode>
Expand Down
4 changes: 2 additions & 2 deletions ...dentityModel.AotCompatibility.Tests/Microsoft.IdentityModel.AotCompatibility.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<PropertyGroup>
<!-- This test only needs to run on .NET -->
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNet9)'== 'True'">$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks>net8.0; net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
<langversion>12</langversion>
<Version>1.0.0-preview</Version>
</PropertyGroup>
Expand Down
Loading