Skip to content

Commit bbe6b2f

Browse files
authored
Upgrade .NET SDK from 6.0 to 8.0 (Azure#27250)
1 parent 6ddf8d6 commit bbe6b2f

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
-217
lines changed

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

+9-9
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:
@@ -147,7 +147,7 @@ jobs:
147147
exit 1
148148
}
149149
$filesChanged | Select-Object -Unique | Out-File $filesChangedOutputPath
150-
150+
151151
$sourceBranchName = "$(Build.SourceBranch)".Replace("refs/heads/","")
152152
$baseBranchName = "origin/$sourceBranchName"
153153
$tmpBranchName = "archive/$sourceBranchName/$(Build.Reason)"
@@ -190,7 +190,7 @@ jobs:
190190
git add $generatedPath
191191
git commit -m $prTitle
192192
git push origin $tmpBranchName --force
193-
193+
194194
& $prScriptPath -Title $prTitle -HeadBranch $tmpBranchName -BaseBranch $sourceBranchName -BotAccessToken '$(GithubToken)' -Description $prDescription
195195
196196
<#
@@ -225,10 +225,10 @@ jobs:
225225
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
226226
pwsh: true
227227
- task: UseDotNet@2
228-
displayName: 'Use .NET Core sdk 6.0.x'
228+
displayName: 'Use .NET SDK for Static Analysis'
229229
inputs:
230230
packageType: sdk
231-
version: 6.0.x
231+
version: 8.0.x
232232
- task: PowerShell@2
233233
displayName: 'Analyze'
234234
inputs:
@@ -267,10 +267,10 @@ jobs:
267267
parameters:
268268
artifactName: build-${{ variables.TestFramework }}
269269
- task: UseDotNet@2
270-
displayName: 'Use .NET SDK 6 for tests'
270+
displayName: 'Use .NET SDK for Test'
271271
inputs:
272272
packageType: sdk
273-
version: 6.0.x
273+
version: 8.0.x
274274
- task: PowerShell@2
275275
displayName: 'Test'
276276
inputs:
@@ -284,4 +284,4 @@ jobs:
284284
testResultsFiles: '**/*.trx'
285285
- template: util/publish-artifacts-steps.yml
286286
parameters:
287-
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)
287+
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)

.azure-pipelines/daily-build.yml

+17-17
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

+7-7
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:
@@ -118,10 +118,10 @@ jobs:
118118
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
119119
pwsh: true
120120
- task: UseDotNet@2
121-
displayName: 'Use .NET Core sdk 6.0.x'
121+
displayName: 'Use .NET SDK for Static Analysis'
122122
inputs:
123123
packageType: sdk
124-
version: 6.0.x
124+
version: 8.0.x
125125
- task: PowerShell@2
126126
displayName: 'Analyze'
127127
inputs:
@@ -160,10 +160,10 @@ jobs:
160160
parameters:
161161
artifactName: build-${{ variables.TestFramework }}
162162
- task: UseDotNet@2
163-
displayName: 'Use .NET SDK 6 for tests'
163+
displayName: 'Use .NET SDK for Test'
164164
inputs:
165165
packageType: sdk
166-
version: 6.0.x
166+
version: 8.0.x
167167
- task: PowerShell@2
168168
displayName: 'Test'
169169
inputs:

.azure-pipelines/security-tools.yml

+7-7
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:
@@ -51,7 +51,7 @@ jobs:
5151
if ("Manual" -eq "$(Build.Reason)") {
5252
#TODO: change value of $trigger to the account who trigger this run
5353
$trigger = 'Manual'
54-
} elseif ("Schedule" -eq "$(Build.Reason)") {
54+
} elseif ("Schedule" -eq "$(Build.Reason)") {
5555
#TODO: change value of $trigger to datetime this run was scheduled
5656
$trigger = 'Schedule'
5757
} else {
@@ -69,7 +69,7 @@ jobs:
6969
} else {
7070
Get-AllModule -RepoRoot "$(Build.SourcesDirectory)" | ForEach-Object { Join-Path 'src' $_ } | Out-File $filesChangedOutputPath
7171
}
72-
72+
7373
Write-Host "`n##[group]build steps"
7474
$buildStepsPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'build-steps.ps1'
7575
& $buildStepsPath -RepoRoot "$(Build.SourcesDirectory)" -Configuration "Debug" -FilesChangedOutputPath $filesChangedOutputPath -IsSecurityCheck $true -BuildReason $(Build.Reason) -Trigger $trigger
@@ -81,10 +81,10 @@ jobs:
8181
script: Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser
8282
pwsh: true
8383
- task: UseDotNet@2
84-
displayName: 'Use .NET Core sdk 8.x for CredScan tools'
84+
displayName: 'Use .NET SDK 6.0 for CredScan'
8585
inputs:
8686
packageType: sdk
87-
version: 8.x
87+
version: 6.0.x
8888
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
8989
displayName: Run CredScan
9090
inputs:
@@ -158,4 +158,4 @@ jobs:
158158
GdnBreakAllTools: false
159159
GdnBreakGdnToolBinSkim: true
160160
GdnBreakGdnToolCredScan: true
161-
GdnBreakGdnToolPoliCheck: true
161+
GdnBreakGdnToolPoliCheck: true

.azure-pipelines/sync-aliases.yml

+1-1
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

+4-4
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

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

3535
- pwsh: 'Install-Module "platyPS", "PSScriptAnalyzer" -Force -Confirm:$false -Scope CurrentUser'
3636
displayName: 'Install PowerShell Dependencies'
@@ -45,7 +45,7 @@ steps:
4545
tar -xvzf "Az-Cmdlets-latest/Az-Cmdlets-latest.tar.gz" -C "Az-Cmdlets-latest"
4646
. Az-Cmdlets-latest/InstallModule.ps1
4747
pwsh: true
48-
48+
4949
- task: DotNetCoreCLI@2
5050
displayName: 'Generate Help'
5151
inputs:

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

+4-4
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

+2-2
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

+2-2
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)"'

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

+2-12
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ steps:
1111
artifactName: build-${{ parameters.testFramework }}
1212

1313
- task: UseDotNet@2
14-
displayName: 'Use .NET SDK 6 for tests'
14+
displayName: 'Use .NET SDK'
1515
inputs:
1616
packageType: sdk
17-
version: 6.0.x
17+
version: 8.0.x
1818

1919
- task: PowerShell@2
2020
displayName: Remove pre-installed Az modules
@@ -33,16 +33,6 @@ steps:
3333
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
3434
continueOnError: true
3535

36-
# Comment this because it's not triggered for 3 years
37-
# - powershell: |
38-
# Install-Module -Name Pester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck
39-
# Install-Module -Name Az.Accounts -Scope CurrentUser -Force
40-
# $env:PSModulePath = $env:PSModulePath + ";" + (pwd).Path
41-
# Get-ChildItem -File -Recurse -Depth 1 test-module.ps1 | ForEach-Object {. $_; if ($LastExitCode -ne 0) {throw "test fails when executing $_"}}
42-
# workingDirectory: 'artifacts/Debug'
43-
# displayName: Test for AutoGen Modules With Windows PowerShell
44-
# condition: and(succeeded(), ne('${{ parameters.testTarget }}', 'Test'))
45-
4636
- pwsh: |
4737
Install-Module -Name Pester -RequiredVersion 4.10.1 -Force
4838
if ($IsWindows) { $sp = ";" } else { $sp = ":" }

0 commit comments

Comments
 (0)