Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we using these properties anywhere else? If not we might want to remove them from the globals.yml file now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets get this PR in ASAP to unblock the sdk roll-forward issue, so we can follow-up in another PR about cleaning up the variables.

inputs:
packageType: runtime
version: "$(DotNetCoreRuntimeVersion)"
- template: /eng/common/pipelines/templates/steps/verify-path-length.yml
parameters:
SourceDirectory: $(Build.SourcesDirectory)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
},
"sdk": {
"version": "3.1.301",
"rollForward": "disable"
"rollForward": "feature"
}
}