Skip to content

Commit b8877de

Browse files
gladjohnGladwinJohnsonbgavrilMS
authored
Update to NET 8 (#5033)
* net8 * WAM fix * test fix * platform proxy * more fixes * 1 * net8 * WAM fix * test fix * platform proxy * more fixes --------- Co-authored-by: Gladwin Johnson <[email protected]> Co-authored-by: Bogdan Gavril <[email protected]>
1 parent 3787cbd commit b8877de

File tree

94 files changed

+527
-815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+527
-815
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Have a feature request for MSAL? Complete a [Feature request](https://github.com
137137
### Visual Studio
138138

139139
Use the latest Visual Studio. It will guide you on the components needed to be installed.
140-
For MAUI, edit the .csproj and enable the MAUI targets.
140+
For MAUI, edit the .csproj and enable the mobile targets.
141141

142142
### Package
143143

build/pipeline-perf-tests-automation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pool:
1616
variables:
1717
BuildPlatform: 'any cpu'
1818
BuildConfiguration: 'release'
19-
BuildRuntime: 'net6.0'
19+
BuildRuntime: 'net8.0'
2020

2121
jobs:
2222
- job: 'BuildJob'
@@ -28,9 +28,9 @@ jobs:
2828
versionSpec: 6.x
2929

3030
- task: UseDotNet@2
31-
displayName: 'Use the latest .NET 6'
31+
displayName: 'Use the latest .NET 8'
3232
inputs:
33-
version: 6.x
33+
version: 8.x
3434

3535
- task: NuGetCommand@2
3636
displayName: 'NuGet restore'
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Project>
2-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetCore)' or '$(TargetFramework)' == '$(TargetFrameworkNet6)'">
2+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetCore)' or '$(TargetFramework)' == '$(TargetFrameworkNet)'">
33
<DefineConstants>$(DefineConstants);NET_CORE;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_BROKER;SUPPORTS_WIN32;</DefineConstants>
44
</PropertyGroup>
5-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6)'" >
5+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet)'" >
66
<DefineConstants>$(DefineConstants);SUPPORTS_SYSTEM_TEXT_JSON</DefineConstants>
77
</PropertyGroup>
8-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop472)' or '$(TargetFramework)' == '$(TargetFrameworkNetStandard)'">
8+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop472)' or '$(TargetFramework)' == '$(TargetFrameworkNetStandard)'">
99
<DefineConstants>$(DefineConstants);SUPPORTS_OTEL;</DefineConstants>
1010
</PropertyGroup>
11-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop472)'">
11+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop472)'">
1212
<DefineConstants>$(DefineConstants);SUPPORTS_MTLS;</DefineConstants>
1313
</PropertyGroup>
14-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6Android)'">
14+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetAndroid)'">
1515
<DefineConstants>$(DefineConstants);ANDROID;SUPPORTS_BROKER</DefineConstants>
1616
</PropertyGroup>
1717
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop462)' or '$(TargetFramework)' == '$(TargetFrameworkNetDesktop472)'">
1818
<DefineConstants>$(DefineConstants);SUPPORTS_BROKER;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_CUSTOM_CACHE;SUPPORTS_WIN32</DefineConstants>
1919
</PropertyGroup>
20-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6Ios)'">
20+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetIos)'">
2121
<DefineConstants>$(DefineConstants);iOS;SUPPORTS_BROKER</DefineConstants>
2222
</PropertyGroup>
2323
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetStandard)'">
2424
<DefineConstants>$(DefineConstants);NETSTANDARD;SUPPORTS_CONFIDENTIAL_CLIENT;SUPPORTS_BROKER;SUPPORTS_CUSTOM_CACHE;SUPPORTS_WIN32;</DefineConstants>
2525
</PropertyGroup>
26-
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNet6Android)' or '$(TargetFramework)' == '$(TargetFrameworkNet6Ios)'">
26+
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetAndroid)' or '$(TargetFramework)' == '$(TargetFrameworkNetIos)'">
2727
<DefineConstants>$(DefineConstants);MOBILE</DefineConstants>
2828
</PropertyGroup>
2929
</Project>

build/template-OneBranch-CI-libsandsamples.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ steps:
1818

1919
# Use the latest .NET SDK
2020
- task: UseDotNet@2
21-
displayName: 'Use .Net Core sdk 6.x'
21+
displayName: 'Use .Net Core sdk 8.x'
2222
inputs:
23-
version: 6.x
23+
version: 8.x
2424

2525
# Compute the source directory based on the parameter MsalSourceDir
2626
- task: PowerShell@2

build/template-build-and-prep-automation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ steps:
66
versionSpec: 6.x
77

88
- task: UseDotNet@2
9-
displayName: 'Use the latest .NET 6'
9+
displayName: 'Use the latest .NET 8'
1010
inputs:
11-
version: 6.x
11+
version: 8.x
1212

1313
# Nuget Restore and Build
1414
- template: template-restore-build-libsandsamples.yaml
@@ -78,7 +78,7 @@ steps:
7878
#dev apps to check
7979
$AppsToCheck = @('MSIX\WPF\bin\Release\',
8080
'MSIX\WPF.Package\bin\AnyCPU\Release\WPF\',
81-
'NetCoreWinFormsWam\bin\Release\net6.0-windows10.0.17763.0\',
81+
'NetCoreWinFormsWam\bin\Release\net8.0-windows10.0.17763.0\',
8282
'NetDesktopWpf\bin\Release\',
8383
'NetFrameworkWam\bin\Release\',
8484
'WAMClassLibrary\bin\Release\',

build/template-desktop-unit-and-automation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
steps:
22
- task: UseDotNet@2
3-
displayName: 'Use the latest .NET 6'
3+
displayName: 'Use the latest .NET 8'
44
inputs:
5-
version: 6.x
5+
version: 8.x
66

77
- task: DownloadPipelineArtifact@2
88
displayName: 'Download Drop'

build/template-pack-and-sign-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ steps:
1818

1919
# Use the latest .NET SDK
2020
- task: UseDotNet@2
21-
displayName: 'Use the latest .NET 6'
21+
displayName: 'Use the latest .NET 8'
2222
inputs:
23-
version: 6.x
23+
version: 8.x
2424

2525
- task: Bash@3
2626
displayName: Install MAUI

build/template-prebuild-code-analysis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ steps:
88
versionSpec: '16.x'
99

1010
- task: UseDotNet@2
11-
displayName: 'Use the latest .NET 6'
11+
displayName: 'Use the latest .NET 8'
1212
inputs:
13-
version: 6.x
13+
version: 8.x
1414

1515
- task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
1616
displayName: 'Run PoliCheck'

build/template-run-unit-tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
steps:
88

99
- task: VSTest@2
10-
displayName: 'Run unit tests (.NET FX)'
10+
displayName: 'Run unit tests NetFwk (vanilla CI)'
1111
condition: and(succeeded(), eq(variables['PipelineType'], 'legacy'))
1212
inputs:
1313
testSelector: 'testAssemblies'
@@ -20,7 +20,7 @@ steps:
2020
pathtoCustomTestAdapters: 'C:\temp' # Workaround for test failure, as NUnit Test Adapter that gets detected seems to mess something up
2121

2222
- task: VSTest@2
23-
displayName: 'Run unit tests (.NET FX) on OneBranch'
23+
displayName: 'Run unit tests NetFwk on OneBranch'
2424
condition: and(succeeded(), eq(variables['PipelineType'], 'OneBranch'))
2525
inputs:
2626
testSelector: 'testAssemblies'
@@ -32,10 +32,10 @@ steps:
3232
minimumExpectedTests: '1'
3333

3434
- task: VSTest@2
35-
displayName: 'Run unit tests (.NET 6)'
35+
displayName: 'Run unit tests .NET '
3636
inputs:
3737
testSelector: 'testAssemblies'
38-
testAssemblyVer2: '**\Microsoft.Identity.Test.Unit\bin\**\net6.0\Microsoft.Identity.Test.Unit.dll'
38+
testAssemblyVer2: '**\Microsoft.Identity.Test.Unit\bin\**\net8.0\Microsoft.Identity.Test.Unit.dll'
3939
searchFolder: '$(System.DefaultWorkingDirectory)'
4040
runInParallel: true
4141
codeCoverageEnabled: true

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.428",
3+
"version": "8.0.404",
44
"rollForward": "latestFeature"
55
}
66
}

0 commit comments

Comments
 (0)