diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 730a8b6e5782c..2646a43d73f5e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -30,10 +30,6 @@ jobs: RootFolder: '.' BuildSHA: $(Build.SourceVersion) RepoId: 'Azure/azure-sdk-for-net' - - task: UseDotNet@2 - displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)" - inputs: - version: "$(DotNetCoreSDKVersion)" - script: >- dotnet pack eng/service.proj -o $(Build.ArtifactStagingDirectory) -warnaserror /p:ServiceDirectory=${{parameters.ServiceToBuild}} /p:PublicSign=false $(VersioningProperties) /p:Configuration=$(BuildConfiguration) /p:CommitSHA=$(Build.SourceVersion) @@ -74,22 +70,11 @@ jobs: pip install doc-warden==$(DocWardenVersion) ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml displayName: "Verify Readmes" - - task: UseDotNet@2 - displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)" - inputs: - version: "$(DotNetCoreSDKVersion)" - task: UseDotNet@2 displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)" inputs: packageType: runtime version: "$(DotNetCoreRuntimeVersion)" - - task: DownloadPipelineArtifact@2 - displayName: "Download Build Artifacts" - condition: succeededOrFailed() - inputs: - artifact: packages - path: $(Pipeline.Workspace)/packages - patterns: "*.nupkg" - template: /eng/common/pipelines/templates/steps/verify-path-length.yml parameters: SourceDirectory: $(Build.SourcesDirectory) @@ -149,16 +134,11 @@ jobs: vmImage: "$(OSVmImage)" steps: - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - - task: DotNetCoreInstaller@2 + - task: UseDotNet@2 displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)" inputs: packageType: runtime version: "$(DotNetCoreRuntimeVersion)" - - task: DotNetCoreInstaller@2 - displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)" - inputs: - packageType: sdk - version: "$(DotNetCoreSDKVersion)" - script: >- dotnet test eng/service.proj --filter TestCategory!=Live --framework $(TestTargetFramework) --logger "trx;LogFileName=$(TestTargetFramework).trx" --logger:"console;verbosity=normal" /p:ServiceDirectory=${{parameters.ServiceToBuild}} /p:IncludeSrc=false /p:IncludeSamples=false /p:Configuration=$(BuildConfiguration) $(ConvertToProjectReferenceOption) /p:CollectCoverage=$(CollectCoverage) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml index 6893a124385ad..78101cc724d81 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml @@ -61,12 +61,6 @@ jobs: packageType: runtime version: "$(DotNetCoreRuntimeVersion)" - - task: UseDotNet@2 - displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)" - inputs: - packageType: sdk - version: "$(DotNetCoreSDKVersion)" - - template: /eng/common/TestResources/deploy-test-resources.yml parameters: Location: ${{ parameters.Location }} diff --git a/eng/pipelines/templates/steps/archetype-sdk-docs.yml b/eng/pipelines/templates/steps/archetype-sdk-docs.yml index 71e121fe1030a..b6b3e7cc990fa 100644 --- a/eng/pipelines/templates/steps/archetype-sdk-docs.yml +++ b/eng/pipelines/templates/steps/archetype-sdk-docs.yml @@ -1,8 +1,4 @@ steps: - - task: UseDotNet@2 - displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)" - inputs: - version: $(DotNetCoreSDKVersion) - pwsh: | # Download and Extract or restore Packages required for Doc Generation Write-Host "Download and Extract mdoc to Build.BinariesDirectory/mdoc" diff --git a/global.json b/global.json index 828d1361bce60..0c8e67e80f4b4 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,9 @@ { "msbuild-sdks": { "Microsoft.Build.Traversal": "1.0.45" + }, + "sdk": { + "version": "3.1.301", + "rollForward": "disable" } } \ No newline at end of file