Skip to content

Commit a4baac9

Browse files
Upgrade .NET SDK from 6.0 to 8.0 (#27250) (#27337)
Co-authored-by: Vincent Dai <[email protected]>
1 parent 5327ecd commit a4baac9

Some content is hidden

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

41 files changed

+202
-213
lines changed

.azure-pipelines/azure-powershell-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ jobs:
9292
# Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$ghToken"
9393
- template: util/get-github-pat-steps.yml
9494
- task: UseDotNet@2
95-
displayName: 'Use .NET Core sdk 6.0.x'
95+
displayName: 'Use .NET SDK for Build'
9696
inputs:
9797
packageType: sdk
98-
version: 6.0.x
98+
version: 8.0.x
9999
- task: NodeTool@0
100100
displayName: Install Autorest
101101
inputs:
@@ -143,7 +143,7 @@ jobs:
143143
exit 1
144144
}
145145
$filesChanged | Select-Object -Unique | Out-File $filesChangedOutputPath
146-
146+
147147
$sourceBranchName = "$(Build.SourceBranch)".Replace("refs/heads/","")
148148
$baseBranchName = "origin/$sourceBranchName"
149149
$tmpBranchName = "archive/$sourceBranchName/$(Build.Reason)"
@@ -186,7 +186,7 @@ jobs:
186186
git add $generatedPath
187187
git commit -m $prTitle
188188
git push origin $tmpBranchName --force
189-
189+
190190
& $prScriptPath -Title $prTitle -HeadBranch $tmpBranchName -BaseBranch $sourceBranchName -BotAccessToken '$(GithubToken)' -Description $prDescription
191191
192192
<#
@@ -221,10 +221,10 @@ jobs:
221221
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
222222
pwsh: true
223223
- task: UseDotNet@2
224-
displayName: 'Use .NET Core sdk 6.0.x'
224+
displayName: 'Use .NET SDK for Static Analysis'
225225
inputs:
226226
packageType: sdk
227-
version: 6.0.x
227+
version: 8.0.x
228228
- task: PowerShell@2
229229
displayName: 'Analyze'
230230
inputs:
@@ -263,10 +263,10 @@ jobs:
263263
parameters:
264264
artifactName: build-${{ variables.TestFramework }}
265265
- task: UseDotNet@2
266-
displayName: 'Use .NET SDK 6 for tests'
266+
displayName: 'Use .NET SDK for Test'
267267
inputs:
268268
packageType: sdk
269-
version: 6.0.x
269+
version: 8.0.x
270270
- task: PowerShell@2
271271
displayName: 'Test'
272272
inputs:
@@ -280,4 +280,4 @@ jobs:
280280
testResultsFiles: '**/*.trx'
281281
- template: util/publish-artifacts-steps.yml
282282
parameters:
283-
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)
283+
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)

.azure-pipelines/daily-build.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
# Wipe any changes from a previous branch
2929
git clean -xdf
3030
- task: UseDotNet@2
31-
displayName: 'Use .NET Core sdk 6.0.x for build'
31+
displayName: 'Use .NET SDK'
3232
inputs:
3333
packageType: sdk
34-
version: 6.0.x
34+
version: 8.0.x
3535
- task: PowerShell@2
3636
displayName: Prepare Powershell $(PSVersion)
3737
inputs:
@@ -85,11 +85,11 @@ jobs:
8585
- task: EsrpCodeSigning@5
8686
displayName: "Sign Dll [Authenticode + Strong Name]"
8787
inputs:
88-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
89-
AppRegistrationClientId: '$(ESRPAppClientId)'
90-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
91-
AuthAKVName: '$(ESRPKVName)'
92-
AuthCertName: '$(ESRPAuthCertName)'
88+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
89+
AppRegistrationClientId: '$(ESRPAppClientId)'
90+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
91+
AuthAKVName: '$(ESRPKVName)'
92+
AuthCertName: '$(ESRPAuthCertName)'
9393
AuthSignCertName: '$(ESRPSignCertName)'
9494
FolderPath: 'artifacts'
9595
Pattern: |
@@ -142,11 +142,11 @@ jobs:
142142
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
143143
displayName: "Sign Scripts [Authenticode]"
144144
inputs:
145-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
146-
AppRegistrationClientId: '$(ESRPAppClientId)'
147-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
148-
AuthAKVName: '$(ESRPKVName)'
149-
AuthCertName: '$(ESRPAuthCertName)'
145+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
146+
AppRegistrationClientId: '$(ESRPAppClientId)'
147+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
148+
AuthAKVName: '$(ESRPKVName)'
149+
AuthCertName: '$(ESRPAuthCertName)'
150150
AuthSignCertName: '$(ESRPSignCertName)'
151151
FolderPath: 'artifacts'
152152
Pattern: |
@@ -183,11 +183,11 @@ jobs:
183183
- task: EsrpCodeSigning@5
184184
displayName: 'Sign 3rd Party [Strong Name]'
185185
inputs:
186-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
187-
AppRegistrationClientId: '$(ESRPAppClientId)'
188-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
189-
AuthAKVName: '$(ESRPKVName)'
190-
AuthCertName: '$(ESRPAuthCertName)'
186+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
187+
AppRegistrationClientId: '$(ESRPAppClientId)'
188+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
189+
AuthAKVName: '$(ESRPKVName)'
190+
AuthCertName: '$(ESRPAuthCertName)'
191191
AuthSignCertName: '$(ESRPSignCertName)'
192192
FolderPath: artifacts
193193
Pattern: 'Release/**/FuzzySharp.dll'

.azure-pipelines/powershell-core.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variables:
88
MacOSName: macOS
99
MacOSAgentPoolName: 'Azure Pipelines'
1010
MacOSAgentPoolVMImage: macOS-latest
11-
TestFramework: net6.0
11+
TestFramework: net8.0
1212
TestTarget: Test
1313
Configuration: Debug
1414
DebugLocalBuildTasks: true
@@ -40,10 +40,10 @@ jobs:
4040
steps:
4141
- checkout: self
4242
- task: UseDotNet@2
43-
displayName: 'Use .NET Core sdk 6.0.x'
43+
displayName: 'Use .NET SDK for Build'
4444
inputs:
4545
packageType: sdk
46-
version: 6.0.x
46+
version: 8.0.x
4747
- task: NodeTool@0
4848
displayName: Install Autorest
4949
inputs:
@@ -113,10 +113,10 @@ jobs:
113113
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
114114
pwsh: true
115115
- task: UseDotNet@2
116-
displayName: 'Use .NET Core sdk 6.0.x'
116+
displayName: 'Use .NET SDK for Static Analysis'
117117
inputs:
118118
packageType: sdk
119-
version: 6.0.x
119+
version: 8.0.x
120120
- task: PowerShell@2
121121
displayName: 'Analyze'
122122
inputs:
@@ -155,10 +155,10 @@ jobs:
155155
parameters:
156156
artifactName: build-${{ variables.TestFramework }}
157157
- task: UseDotNet@2
158-
displayName: 'Use .NET SDK 6 for tests'
158+
displayName: 'Use .NET SDK for Test'
159159
inputs:
160160
packageType: sdk
161-
version: 6.0.x
161+
version: 8.0.x
162162
- task: PowerShell@2
163163
displayName: 'Test'
164164
inputs:

.azure-pipelines/security-tools.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
- checkout: self
2121
fetchTags: false
2222
- task: UseDotNet@2
23-
displayName: 'Use .NET Core sdk 6.0.x'
23+
displayName: 'Use .NET SDK 8.0 for Build'
2424
inputs:
2525
packageType: sdk
26-
version: 6.0.x
26+
version: 8.0.x
2727
- task: NodeTool@0
2828
displayName: Install Autorest
2929
inputs:
@@ -46,7 +46,7 @@ jobs:
4646
if ("Manual" -eq "$(Build.Reason)") {
4747
#TODO: change value of $trigger to the account who trigger this run
4848
$trigger = 'Manual'
49-
} elseif ("Schedule" -eq "$(Build.Reason)") {
49+
} elseif ("Schedule" -eq "$(Build.Reason)") {
5050
#TODO: change value of $trigger to datetime this run was scheduled
5151
$trigger = 'Schedule'
5252
} else {
@@ -64,7 +64,7 @@ jobs:
6464
} else {
6565
Get-AllModule -RepoRoot "$(Build.SourcesDirectory)" | ForEach-Object { Join-Path 'src' $_ } | Out-File $filesChangedOutputPath
6666
}
67-
67+
6868
Write-Host "`n##[group]build steps"
6969
$buildStepsPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'build-steps.ps1'
7070
& $buildStepsPath -RepoRoot "$(Build.SourcesDirectory)" -Configuration "Debug" -FilesChangedOutputPath $filesChangedOutputPath -IsSecurityCheck $true -BuildReason $(Build.Reason) -Trigger $trigger
@@ -76,10 +76,10 @@ jobs:
7676
script: Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser
7777
pwsh: true
7878
- task: UseDotNet@2
79-
displayName: 'Use .NET Core sdk 8.x for CredScan tools'
79+
displayName: 'Use .NET SDK 6.0 for CredScan'
8080
inputs:
8181
packageType: sdk
82-
version: 8.x
82+
version: 6.0.x
8383
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
8484
displayName: Run CredScan
8585
inputs:
@@ -153,4 +153,4 @@ jobs:
153153
GdnBreakAllTools: false
154154
GdnBreakGdnToolBinSkim: true
155155
GdnBreakGdnToolCredScan: true
156-
GdnBreakGdnToolPoliCheck: true
156+
GdnBreakGdnToolPoliCheck: true

.azure-pipelines/sync-aliases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- task: UseDotNet@2
26-
displayName: Install .NET 8 SDK
26+
displayName: Install .NET SDK
2727
inputs:
2828
packageType: sdk
2929
version: 8.0.x

.azure-pipelines/test-coverage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ parameters:
22
- name: dotnet_sdk
33
displayName: .NET SDK
44
type: string
5-
default: 6.0.x
5+
default: 8.0.x
66
- name: testFramework
77
displayName: Test Framework
88
type: string
9-
default: net6.0
9+
default: net8.0
1010
- name: testPoolName
1111
displayName: Test Pool Name
1212
type: string
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- task: UseDotNet@2
33-
displayName: 'Install .NET SDK'
33+
displayName: 'Install .NET SDK for Build'
3434
inputs:
3535
packageType: sdk
3636
version: ${{ parameters.dotnet_sdk }}
@@ -57,7 +57,7 @@ jobs:
5757

5858
steps:
5959
- task: UseDotNet@2
60-
displayName: 'Install .NET SDK'
60+
displayName: 'Install .NET SDK for Test'
6161
inputs:
6262
packageType: sdk
6363
version: ${{ parameters.dotnet_sdk }}

.azure-pipelines/util/analyze-steps.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ steps:
2121
targetType: inline
2222
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
2323
pwsh: true
24-
24+
- task: Npm@1
25+
displayName: Install tsp client
26+
inputs:
27+
command: custom
28+
customCommand: install -g @azure-tools/[email protected]
2529
- task: UseDotNet@2
26-
displayName: 'Use .NET Core sdk 6.0.x'
30+
displayName: 'Use .NET SDK'
2731
inputs:
2832
packageType: sdk
29-
version: 6.0.x
33+
version: 8.0.x
3034

3135
- pwsh: 'Install-Module "platyPS", "PSScriptAnalyzer" -Force -Confirm:$false -Scope CurrentUser'
3236
displayName: 'Install PowerShell Dependencies'
@@ -41,7 +45,7 @@ steps:
4145
tar -xvzf "Az-Cmdlets-latest/Az-Cmdlets-latest.tar.gz" -C "Az-Cmdlets-latest"
4246
. Az-Cmdlets-latest/InstallModule.ps1
4347
pwsh: true
44-
48+
4549
- task: DotNetCoreCLI@2
4650
displayName: 'Generate Help'
4751
inputs:

.azure-pipelines/util/build-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
testFramework: net6.0
2+
testFramework: net8.0
33
configuration: Debug
44
powerShellPlatform: PowerShell Core
55
ForceRegenerate: false
@@ -9,10 +9,10 @@ parameters:
99

1010
steps:
1111
- task: UseDotNet@2
12-
displayName: 'Use .NET Core sdk 6.0.x'
12+
displayName: 'Use .NET SDK'
1313
inputs:
1414
packageType: sdk
15-
version: 6.0.x
15+
version: 8.0.x
1616
- task: DotNetCoreCLI@2
1717
displayName: Filter changed files
1818
inputs:
@@ -147,4 +147,4 @@ steps:
147147
arguments: 'build.proj /t:AzToolsInstaller'
148148
- template: publish-artifacts-steps.yml
149149
parameters:
150-
artifactName: build-${{ parameters.testFramework }}
150+
artifactName: build-${{ parameters.testFramework }}

.azure-pipelines/util/live-test-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222

2323
steps:
2424
- task: UseDotNet@2
25-
displayName: Install desired .NET version ${{ parameters.dotnetVersion }}
25+
displayName: Install .NET SDK ${{ parameters.dotnetVersion }}
2626
condition: ne('${{ parameters.dotnetVersion }}', '')
2727
inputs:
2828
packageType: sdk
2929
version: ${{ parameters.dotnetVersion }}
3030

3131
- task: PowerShell@2
32-
displayName: Install desired Powershell version ${{ parameters.psVersion }}
32+
displayName: Install Powershell ${{ parameters.psVersion }}
3333
condition: ne('${{ parameters.psVersion }}', '')
3434
inputs:
3535
pwsh: true

.azure-pipelines/util/smoke-test-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- task: UseDotNet@2
1818
condition: ne('${{ parameters.dotnetVersion }}', '')
19-
displayName: 'Prepare .NET Core ${{ parameters.dotnetVersion }}'
19+
displayName: 'Install .NET SDK ${{ parameters.dotnetVersion }}'
2020
inputs:
2121
packageType: sdk
2222
version: ${{ parameters.dotnetVersion }}
@@ -39,7 +39,7 @@ jobs:
3939
overwriteExistingFiles: true
4040

4141
- task: PowerShell@2
42-
displayName: Prepare Powershell ${{ parameters.psVersion }}
42+
displayName: Install Powershell ${{ parameters.psVersion }}
4343
inputs:
4444
filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
4545
arguments: '-RequiredPsVersion ${{ parameters.psVersion }} -PowerShellPath "${{ parameters.PowerShellPath }}" -AgentOS "$(Agent.OS)"'

0 commit comments

Comments
 (0)