Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retire Net core installer #14567

Merged
merged 4 commits into from
Sep 1, 2020
Merged

Retire Net core installer #14567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1b41b1
Specify SDK version in b=global.json
chidozieononiwu Aug 25, 2020
6b9e23d
Retire Dotnet Installer Task
chidozieononiwu Aug 25, 2020
a5c920b
Retire UseDotNet task
chidozieononiwu Aug 26, 2020
de3ad4a
Remove DownloadPipelineArtifact in analyze stage
chidozieononiwu Aug 27, 2020
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
22 changes: 1 addition & 21 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)"
chidozieononiwu marked this conversation as resolved.
Show resolved Hide resolved
inputs:
packageType: runtime
version: "$(DotNetCoreRuntimeVersion)"
- task: DownloadPipelineArtifact@2
chidozieononiwu marked this conversation as resolved.
Show resolved Hide resolved
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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 0 additions & 4 deletions eng/pipelines/templates/steps/archetype-sdk-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 4 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.45"
},
"sdk": {
chidozieononiwu marked this conversation as resolved.
Show resolved Hide resolved
"version": "3.1.301",
"rollForward": "disable"
}
}