Skip to content

Commit d9951ed

Browse files
Retire Net core installer (#14567)
* Specify SDK version in b=global.json * Retire Dotnet Installer Task * Retire UseDotNet task * Remove DownloadPipelineArtifact in analyze stage
1 parent 3dfda66 commit d9951ed

File tree

4 files changed

+5
-31
lines changed

4 files changed

+5
-31
lines changed

eng/pipelines/templates/jobs/archetype-sdk-client.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
RootFolder: '.'
3131
BuildSHA: $(Build.SourceVersion)
3232
RepoId: 'Azure/azure-sdk-for-net'
33-
- task: UseDotNet@2
34-
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
35-
inputs:
36-
version: "$(DotNetCoreSDKVersion)"
3733
- script: >-
3834
dotnet pack eng/service.proj -o $(Build.ArtifactStagingDirectory) -warnaserror /p:ServiceDirectory=${{parameters.ServiceToBuild}}
3935
/p:PublicSign=false $(VersioningProperties) /p:Configuration=$(BuildConfiguration) /p:CommitSHA=$(Build.SourceVersion)
@@ -74,22 +70,11 @@ jobs:
7470
pip install doc-warden==$(DocWardenVersion)
7571
ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml
7672
displayName: "Verify Readmes"
77-
- task: UseDotNet@2
78-
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
79-
inputs:
80-
version: "$(DotNetCoreSDKVersion)"
8173
- task: UseDotNet@2
8274
displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
8375
inputs:
8476
packageType: runtime
8577
version: "$(DotNetCoreRuntimeVersion)"
86-
- task: DownloadPipelineArtifact@2
87-
displayName: "Download Build Artifacts"
88-
condition: succeededOrFailed()
89-
inputs:
90-
artifact: packages
91-
path: $(Pipeline.Workspace)/packages
92-
patterns: "*.nupkg"
9378
- template: /eng/common/pipelines/templates/steps/verify-path-length.yml
9479
parameters:
9580
SourceDirectory: $(Build.SourcesDirectory)
@@ -149,16 +134,11 @@ jobs:
149134
vmImage: "$(OSVmImage)"
150135
steps:
151136
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
152-
- task: DotNetCoreInstaller@2
137+
- task: UseDotNet@2
153138
displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
154139
inputs:
155140
packageType: runtime
156141
version: "$(DotNetCoreRuntimeVersion)"
157-
- task: DotNetCoreInstaller@2
158-
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
159-
inputs:
160-
packageType: sdk
161-
version: "$(DotNetCoreSDKVersion)"
162142
- script: >-
163143
dotnet test eng/service.proj --filter TestCategory!=Live --framework $(TestTargetFramework) --logger "trx;LogFileName=$(TestTargetFramework).trx" --logger:"console;verbosity=normal"
164144
/p:ServiceDirectory=${{parameters.ServiceToBuild}} /p:IncludeSrc=false /p:IncludeSamples=false /p:Configuration=$(BuildConfiguration) $(ConvertToProjectReferenceOption) /p:CollectCoverage=$(CollectCoverage)

eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ jobs:
6161
packageType: runtime
6262
version: "$(DotNetCoreRuntimeVersion)"
6363

64-
- task: UseDotNet@2
65-
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
66-
inputs:
67-
packageType: sdk
68-
version: "$(DotNetCoreSDKVersion)"
69-
7064
- template: /eng/common/TestResources/deploy-test-resources.yml
7165
parameters:
7266
Location: ${{ parameters.Location }}

eng/pipelines/templates/steps/archetype-sdk-docs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
steps:
2-
- task: UseDotNet@2
3-
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
4-
inputs:
5-
version: $(DotNetCoreSDKVersion)
62
- pwsh: |
73
# Download and Extract or restore Packages required for Doc Generation
84
Write-Host "Download and Extract mdoc to Build.BinariesDirectory/mdoc"

global.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"msbuild-sdks": {
33
"Microsoft.Build.Traversal": "1.0.45"
4+
},
5+
"sdk": {
6+
"version": "3.1.301",
7+
"rollForward": "disable"
48
}
59
}

0 commit comments

Comments
 (0)