From 06735b253cd9a8201a425327cdc9eeb82fe7f438 Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Tue, 1 Sep 2020 11:45:29 -0700 Subject: [PATCH] Remove use UseDotNetCore Task --- .../templates/jobs/archetype-sdk-client.yml | 16 ++++------------ .../templates/jobs/archetype-sdk-tests-jobs.yml | 6 ------ global.json | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 2646a43d73f5..4334917ff746 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -70,11 +70,6 @@ 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 runtime $(DotNetCoreRuntimeVersion)" - inputs: - packageType: runtime - version: "$(DotNetCoreRuntimeVersion)" - template: /eng/common/pipelines/templates/steps/verify-path-length.yml parameters: SourceDirectory: $(Build.SourcesDirectory) @@ -134,14 +129,11 @@ jobs: vmImage: "$(OSVmImage)" steps: - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - - task: UseDotNet@2 - displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)" - inputs: - packageType: runtime - version: "$(DotNetCoreRuntimeVersion)" - 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) + 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) displayName: "Build & Test ($(TestTargetFramework))" env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml index 78101cc724d8..9f89d5723406 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml @@ -55,12 +55,6 @@ jobs: - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - - task: UseDotNet@2 - displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)" - inputs: - packageType: runtime - version: "$(DotNetCoreRuntimeVersion)" - - template: /eng/common/TestResources/deploy-test-resources.yml parameters: Location: ${{ parameters.Location }} diff --git a/global.json b/global.json index 0c8e67e80f4b..13c0deebbbaa 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "sdk": { "version": "3.1.301", - "rollForward": "disable" + "rollForward": "feature" } } \ No newline at end of file