Skip to content

Commit 10d0345

Browse files
Copilotpmaytak
andcommitted
feat: Update to .NET 10 GA
Co-authored-by: pmaytak <[email protected]>
1 parent b0b333b commit 10d0345

File tree

6 files changed

+20
-32
lines changed

6 files changed

+20
-32
lines changed

.github/workflows/dotnetcore.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ jobs:
1414
uses: actions/setup-dotnet@v5
1515
with:
1616
dotnet-version: 8.0.x
17+
18+
- name: Setup .NET 10.0.100
19+
uses: actions/setup-dotnet@v5
20+
with:
21+
dotnet-version: 10.0.100
1722

1823
# Run the tests
1924
- name: Build with .NET 8.0.x
2025
run: dotnet test -v m --configuration Release Microsoft.Identity.Abstractions.sln
2126

22-
- name: Setup .NET 10.0.100-rc.1
23-
uses: actions/setup-dotnet@v5
24-
with:
25-
dotnet-version: 10.0.100-rc.1.25451.107
26-
2727
# Run the tests
28-
- name: Build with .NET 10.0.100-rc.1
29-
run: dotnet test -p:TargetNetNext=True -v m --configuration Release Microsoft.Identity.Abstractions.sln
28+
- name: Build with .NET 10.0.100
29+
run: dotnet test -v m --configuration Release Microsoft.Identity.Abstractions.sln
3030

3131
# Pack the library
3232
- name: Pack
33-
run: dotnet pack -p:TargetNetNext=True --configuration Release --no-restore --no-build -v m Microsoft.Identity.Abstractions.sln
33+
run: dotnet pack --configuration Release --no-restore --no-build -v m Microsoft.Identity.Abstractions.sln

Directory.Build.props

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,10 @@
1818
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1919
</PropertyGroup>
2020

21-
<!-- TargetNetNext must be set to True to build/test with NET 10.0 locally, you can uncomment this PropertyGroup or set TargetNetNext it in a CLI arg (`/p:TargetNetNext=true`), or set an environment
22-
variable (`Set TargetNetNext=true`) -->
23-
<!-- <TargetNetNext>True</TargetNetNext>
24-
</PropertyGroup> -->
2521

26-
<PropertyGroup Condition="'$(TargetNetNext)' == 'True'">
27-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
28-
<CheckEolTargetFramework>false</CheckEolTargetFramework>
29-
<!-- For NU5104 it prevents us from packing release packages with prerelease dependencies. But we want to do that so customers can get a preview of running with .NET 10. -->
30-
<WarningsNotAsErrors>$(WarningsNotAsErrors);NU5104</WarningsNotAsErrors>
31-
<NoWarn>$(NoWarn);NU5104</NoWarn>
32-
</PropertyGroup>
3322

3423
<PropertyGroup>
35-
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0;net9.0</TargetFrameworks>
36-
<TargetFrameworks Condition="'$(TargetNetNext)' == 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
24+
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0;net9.0;net10.0</TargetFrameworks>
3725
<SignAssembly>true</SignAssembly>
3826
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
3927
<GenerateDocumentationFile>true</GenerateDocumentationFile>

build/template-install-dotnet-core.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
steps:
55

66
- task: UseDotNet@2
7-
displayName: 'Use .Net Core SDK 10.0.100-rc.1'
8-
condition: eq(variables['TargetNetNext'], 'True')
7+
displayName: 'Use .Net Core SDK 10'
98
inputs:
10-
version: 10.0.100-rc.1.25451.107
9+
version: 10.0.x
1110

1211
- task: UseDotNet@2
1312
displayName: 'Use .Net Core SDK 8'

global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.100",
4+
"allowPrerelease": false,
5+
"rollForward": "latestFeature"
6+
}
7+
}

test/Directory.Build.props

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
55
</PropertyGroup>
66

7-
<!-- TargetNetNext must be set to True to build/test with NET 10.0 locally, you can uncomment this PropertyGroup or set TargetNetNext it in a CLI arg (`/p:TargetNetNext=true`), or set an environment
8-
variable (`Set TargetNetNext=true`) -->
9-
<!-- <TargetNetNext>True</TargetNetNext>
10-
</PropertyGroup> -->
11-
12-
<PropertyGroup>
7+
<PropertyGroup>
138
<MicrosoftNetTestSdkVersion>18.0.0</MicrosoftNetTestSdkVersion>
149
<!-- GHSA-5crp-9r3c-p9vr - Updated to 13.0.3 for .NET 10 compatibility -->
1510
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>

test/Microsoft.Identity.Abstractions.Tests/Microsoft.Identity.Abstractions.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net462</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetNetNext)' == 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net462;net10.0</TargetFrameworks>
65
<Nullable>enable</Nullable>
76
<IsPackable>false</IsPackable>
87
<LangVersion>12</LangVersion>

0 commit comments

Comments
 (0)