From 90546a25da1ae2568393536dbcb93268427d7105 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 23:00:53 +0000 Subject: [PATCH 01/52] Update dependencies from https://github.com/dotnet/toolset build 20191111.5 (#5616) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19561.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19561.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d915f08c8..5d125daa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 4742a2d9c56b249808bab066a12a50554377a90b + ce344a71e6f2704e742b5109700666c38493802a https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea + 590f10ed02c0dc45d5cbed6105d25b0b80b6e4f7 diff --git a/eng/Versions.props b/eng/Versions.props index dd6ef2b11..70c5b543b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19554.11 + 3.0.101-servicing.19561.5 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19554.2 + 3.0.101-servicing.19561.1 0.2.0 From c87cf069441467d8705b6a0069e935e09a8caf4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 18:32:25 +0000 Subject: [PATCH 02/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5717) * Update dependencies from https://github.com/dotnet/toolset build 20191119.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19569.2 * Update dependencies from https://github.com/dotnet/toolset build 20191120.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d125daa7..d5186025a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - ce344a71e6f2704e742b5109700666c38493802a + 224f1cfbaf977c2d6c50b2b17ff33e8dde9ad14d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 70c5b543b..215ac2a2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19561.5 + 3.0.102-servicing.19570.1 From 532a3921583f50ecf91090fcb26aa9dc78130e2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 19:10:58 +0000 Subject: [PATCH 03/52] Update dependencies from https://github.com/dotnet/toolset build 20191120.2 (#5726) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5186025a..1f91e0af0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 224f1cfbaf977c2d6c50b2b17ff33e8dde9ad14d + 125d5b114ec2a3c83eeff83994b942d11a948ed1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 215ac2a2d..421b3f443 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19570.1 + 3.0.102-servicing.19570.2 From c45806b2071c523750c103f32aad0db765014eed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 20:23:26 +0000 Subject: [PATCH 04/52] Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#5728) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/execute-sdl.yml | 28 ++- ...al-30.yml => generic-internal-channel.yml} | 25 ++- ...ease-31.yml => generic-public-channel.yml} | 40 ++-- .../channels/netcore-3-tools-validation.yml | 95 ---------- .../post-build/channels/netcore-3-tools.yml | 130 ------------- .../post-build/channels/netcore-dev-31.yml | 130 ------------- .../post-build/channels/netcore-dev-5.yml | 130 ------------- .../channels/netcore-release-30.yml | 130 ------------- .../channels/netcore-tools-latest.yml | 130 ------------- .../channels/netcore-tools-validation.yml | 95 ---------- .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 173 +++++++++++++++--- global.json | 2 +- 14 files changed, 226 insertions(+), 898 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f91e0af0..3b745c1d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f996419..52e2ff021 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df3..68fdec029 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c..c4bc1897d 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031f..000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e..000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db2125418..000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16ac..000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db2..000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b9..000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49a..000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f18..0a2c40c10 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff..ec80c65a9 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 0ae3965f1..d01b89c2d 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" } } From 5b36a101bb9fa8397d8b8466c0e416fb9e54863c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 21:21:33 +0000 Subject: [PATCH 05/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5727) * Update dependencies from https://github.com/dotnet/toolset build 20191120.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19570.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191120.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19570.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191120.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19570.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b745c1d6..36ff0d790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 125d5b114ec2a3c83eeff83994b942d11a948ed1 + 3b27357dbd4a4619e615bd2d3f1b2fe82117ecb6 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - 590f10ed02c0dc45d5cbed6105d25b0b80b6e4f7 + cc05a5a378baa9a67748b1269a2d0150ada66de2 diff --git a/eng/Versions.props b/eng/Versions.props index 421b3f443..a43695548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19570.2 + 3.0.102-servicing.19570.5 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19561.1 + 3.0.102-servicing.19570.1 0.2.0 From efa41c71087e9135db0ca17259b37c3095191843 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 01:06:35 +0000 Subject: [PATCH 06/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5731) * Update dependencies from https://github.com/dotnet/toolset build 20191120.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19570.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191120.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.10 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19570.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19570.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36ff0d790..e1b4aacb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,21 +67,21 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/dotnet/templating - a776e417c83c52908298b3767e462feae8b18b98 + 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 3b27357dbd4a4619e615bd2d3f1b2fe82117ecb6 + 76ba37f7dd1c1e8f22a3e6aece372c3de2d2d937 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - cc05a5a378baa9a67748b1269a2d0150ada66de2 + fcf7c320ac2ae70b83a61fb57c9a602eeebc3228 diff --git a/eng/Versions.props b/eng/Versions.props index a43695548..f90b9c6f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19570.5 + 3.0.102-servicing.19570.10 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19570.1 + 3.0.102-servicing.19570.5 0.2.0 From d99f74b344959bcbb89f7f93b538b7422aa7e7c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 05:15:50 +0000 Subject: [PATCH 07/52] Update dependencies from https://github.com/dotnet/toolset build 20191120.12 (#5735) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19570.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1b4aacb4..e2beea661 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 76ba37f7dd1c1e8f22a3e6aece372c3de2d2d937 + a8e75fb5884a888139e7ec81d1df4a6d1336c609 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f90b9c6f4..1be2d6359 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19570.10 + 3.0.102-servicing.19570.12 From 4d0064c97c17f6528eb255744e7dccc71597a259 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 20:15:52 +0000 Subject: [PATCH 08/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.02 (#5739) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-02 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-02 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-02 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-02 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-02 --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index d6d5860c2..23ba8e092 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2beea661..404ebb513 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 diff --git a/eng/Versions.props b/eng/Versions.props index 1be2d6359..f7182be74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.1-servicing-19516-12 - 3.0.1 - 3.0.1 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 3.0.0 - 3.0.1 - 3.0.1 + 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-02 3.0.0 2.1.0 From e2180c8c503fda4a5dab42042f90992c6d815c80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 20:40:47 +0000 Subject: [PATCH 09/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.2 (#5740) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 404ebb513..7d999ba6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - a8e75fb5884a888139e7ec81d1df4a6d1336c609 + 1904886689dcc64ad9e165c637aed91e3ce7196a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f7182be74..b7a2772bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19570.12 + 3.0.102-servicing.19571.2 From 849c440a110600c126f774b31f2ee78dae86a223 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 21:50:03 +0000 Subject: [PATCH 10/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.3 (#5741) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19571.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d999ba6e..483c1f571 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 1904886689dcc64ad9e165c637aed91e3ce7196a + 5bb1c537b3a9389e31036885facc6da209b00563 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - fcf7c320ac2ae70b83a61fb57c9a602eeebc3228 + fe03c281dfb7cacbda842e5235421d4f68f4cd86 diff --git a/eng/Versions.props b/eng/Versions.props index b7a2772bb..f38dd6040 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.2 + 3.0.102-servicing.19571.3 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19570.5 + 3.0.102-servicing.19571.2 0.2.0 From a787c9810e6ab297a08195ac2725701aeee37787 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2019 22:25:47 +0000 Subject: [PATCH 11/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.4 (#5742) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 483c1f571..8c499a6a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 5bb1c537b3a9389e31036885facc6da209b00563 + 75df017a8139ac2358e61f19acfe917033f61c37 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f38dd6040..8758af8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.3 + 3.0.102-servicing.19571.4 From 000db26b0bd7b8ece3943490b91a99fb02a8401e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 00:30:43 +0000 Subject: [PATCH 12/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.5 (#5744) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c499a6a9..39f52ee0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 75df017a8139ac2358e61f19acfe917033f61c37 + e7c87f4f568c1142bd3434b24a0783f91e11f2bb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8758af8b6..30eb611f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.4 + 3.0.102-servicing.19571.5 From 98b05000f6869dc871da05305c634fb0cf84905f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 01:00:45 +0000 Subject: [PATCH 13/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.04 (#5745) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-04 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-04 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-04 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-04 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-04 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.1-servicing.19571.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f52ee0a..059b22d3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 - + https://github.com/dotnet/core-setup - 07f338c15044f71b1ea6acdfcbb917d790fa4cc2 + 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf - a4f24b6a7849ad33e29a50bd1d607f424953013b + f59734d7fe9bf8d9a165bdaefca20def2b373e1f diff --git a/eng/Versions.props b/eng/Versions.props index 30eb611f7..c8aa0a041 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.1-servicing.19510.3 + 3.0.1-servicing.19571.2 @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 3.0.0 - 3.0.2-servicing-19571-02 - 3.0.2-servicing-19571-02 + 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-04 3.0.0 2.1.0 From 51cf2f03cb819811168f57d6d15af5398b568073 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 01:27:17 +0000 Subject: [PATCH 14/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.6 (#5746) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 059b22d3e..f8745198e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - e7c87f4f568c1142bd3434b24a0783f91e11f2bb + 26003596b279cb59886ffb4e93f4bb968400cf5c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c8aa0a041..0fc582483 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.5 + 3.0.102-servicing.19571.6 From a4236f423d68aebba67b490e96f3cc62e1c15976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 02:30:44 +0000 Subject: [PATCH 15/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.7 (#5748) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19571.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8745198e..d2d48b2a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 26003596b279cb59886ffb4e93f4bb968400cf5c + c1106bc0aa13fbb411a237c826c7d23f6129f116 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - fe03c281dfb7cacbda842e5235421d4f68f4cd86 + 1b609e394a5ec94be569e4ff78a8c12e8dc9809a diff --git a/eng/Versions.props b/eng/Versions.props index 0fc582483..644372c41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.6 + 3.0.102-servicing.19571.7 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19571.2 + 3.0.102-servicing.19571.3 0.2.0 From 85cc88b1404c7576a28238b23d54e90e7eff86e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 03:05:49 +0000 Subject: [PATCH 16/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.06 (#5749) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-06 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-06 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-06 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-06 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-06 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.1-servicing.19571.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2d48b2a6..7bdac5abd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a - + https://github.com/dotnet/core-setup - 1c5c5dc1d535de9af2a3115cacec9f1ee2e730e1 + 67d553d070f4e1e25e64ba45c5de21e71675af7a @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf - f59734d7fe9bf8d9a165bdaefca20def2b373e1f + fd11e071ec91058ccbcacb2f8fea1622e3418c23 diff --git a/eng/Versions.props b/eng/Versions.props index 644372c41..25f3764cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.1-servicing.19571.2 + 3.0.1-servicing.19571.3 @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 3.0.0 - 3.0.2-servicing-19571-04 - 3.0.2-servicing-19571-04 + 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-06 3.0.0 2.1.0 From 50d0e7cfb1fbe33db1459428742695a09f5a18ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 04:35:40 +0000 Subject: [PATCH 17/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.10 (#5750) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19571.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bdac5abd..b7b03bd69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - c1106bc0aa13fbb411a237c826c7d23f6129f116 + 71ac6b23137a221d04c2fe6d7c07b2b9b7579108 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - 1b609e394a5ec94be569e4ff78a8c12e8dc9809a + 6197df6baacf56da50d57e8c159e062b15c32e0a diff --git a/eng/Versions.props b/eng/Versions.props index 25f3764cd..519e5e6a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.7 + 3.0.102-servicing.19571.10 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19571.3 + 3.0.102-servicing.19571.4 0.2.0 From 221db29ade66ddef5bbc950946044467cda8ed01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 05:40:44 +0000 Subject: [PATCH 18/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.08 (#5751) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-08 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-08 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-08 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-08 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-08 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7b03bd69..a10ec0527 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 - + https://github.com/dotnet/core-setup - 67d553d070f4e1e25e64ba45c5de21e71675af7a + ced6a9739002ddbc2470f0b42a21306c49b18ab1 diff --git a/eng/Versions.props b/eng/Versions.props index 519e5e6a0..518dd67d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 3.0.0 - 3.0.2-servicing-19571-06 - 3.0.2-servicing-19571-06 + 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-08 3.0.0 2.1.0 From c2f01c10af47ca94b2c54d70bb55c646977985f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 06:05:42 +0000 Subject: [PATCH 19/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.11 (#5752) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a10ec0527..5222279c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 71ac6b23137a221d04c2fe6d7c07b2b9b7579108 + 6cf8fc4bfc6d790caf65f1f876ca18040ffa165c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 518dd67d4..bd334358f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.10 + 3.0.102-servicing.19571.11 From 08e690095c775b76aa4839c39adc16d7bc136836 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 07:10:40 +0000 Subject: [PATCH 20/52] Update dependencies from https://github.com/dotnet/toolset build 20191121.13 (#5753) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19571.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19571.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5222279c0..815da1ba8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 6cf8fc4bfc6d790caf65f1f876ca18040ffa165c + 7ea3bc7d624aa02da3e7ea9857de4fe2255c6476 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - 6197df6baacf56da50d57e8c159e062b15c32e0a + bde0da3a340d287cd429f5a621905f7b2377276f diff --git a/eng/Versions.props b/eng/Versions.props index bd334358f..5939179f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.11 + 3.0.102-servicing.19571.13 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19571.4 + 3.0.102-servicing.19571.5 0.2.0 From 46ef82cc30c8dae234a0547626bb1ff5d576f34f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 08:25:45 +0000 Subject: [PATCH 21/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.09 (#5754) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-09 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-09 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-09 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-09 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-09 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 815da1ba8..0ead5ad5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 - + https://github.com/dotnet/core-setup - ced6a9739002ddbc2470f0b42a21306c49b18ab1 + e16006fdb878571435c093f2fda5f4e6daa55654 diff --git a/eng/Versions.props b/eng/Versions.props index 5939179f0..839f050d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 3.0.0 - 3.0.2-servicing-19571-08 - 3.0.2-servicing-19571-08 + 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-09 3.0.0 2.1.0 From f67b9ccecf4a04dd4c5627a86792f0666ff0b34e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 08:55:45 +0000 Subject: [PATCH 22/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.1 (#5755) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ead5ad5d..5fed99310 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 7ea3bc7d624aa02da3e7ea9857de4fe2255c6476 + df074780875c54d38352c9b49aa24a36f92f3b65 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 839f050d4..a902c48e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19571.13 + 3.0.102-servicing.19572.1 From a69a3cfba29335a30e0f28d2895dd3a40c65acec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 10:10:44 +0000 Subject: [PATCH 23/52] Update dependencies from https://github.com/dotnet/core-setup build 20191121.10 (#5756) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19571-10 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19571-10 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19571-10 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19571-10 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19571-10 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fed99310..707a2f311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 - + https://github.com/dotnet/core-setup - e16006fdb878571435c093f2fda5f4e6daa55654 + 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 diff --git a/eng/Versions.props b/eng/Versions.props index a902c48e8..8fdb99630 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-10 + 3.0.2-servicing-19571-10 + 3.0.2-servicing-19571-10 3.0.0 - 3.0.2-servicing-19571-09 - 3.0.2-servicing-19571-09 + 3.0.2-servicing-19571-10 + 3.0.2-servicing-19571-10 3.0.0 2.1.0 From d5af4deef932d90b22f004a176d46979f31066fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 10:15:40 +0000 Subject: [PATCH 24/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.2 (#5757) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19572.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 707a2f311..84d776df7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - df074780875c54d38352c9b49aa24a36f92f3b65 + e41e391dd5a50cc8e9e68266deb989b13945d7a1 https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - bde0da3a340d287cd429f5a621905f7b2377276f + 3e0bda2f22a69320cb02a520667a220b7b7a0f82 diff --git a/eng/Versions.props b/eng/Versions.props index 8fdb99630..d2e741690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.1 + 3.0.102-servicing.19572.2 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19571.5 + 3.0.102-servicing.19572.1 0.2.0 From 1616869d5d4d78144dfe880c08b34a1566361e6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 12:25:43 +0000 Subject: [PATCH 25/52] Update dependencies from https://github.com/dotnet/core-setup build 20191122.01 (#5759) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-01 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-01 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19572-01 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19572-01 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19572-01 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84d776df7..d5e74be13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 - + https://github.com/dotnet/core-setup - 0a1cbe342c0dbe8662b6de6b8c045bf6208b6b20 + d8780975138879dcbbdda4aee1534d67ca6d3e29 diff --git a/eng/Versions.props b/eng/Versions.props index d2e741690..b696794b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19571-10 - 3.0.2-servicing-19571-10 - 3.0.2-servicing-19571-10 + 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-01 3.0.0 - 3.0.2-servicing-19571-10 - 3.0.2-servicing-19571-10 + 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-01 3.0.0 2.1.0 From c1b612dd47f895b3b2ba8b710f05199e9d3614e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 12:51:47 +0000 Subject: [PATCH 26/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5758) * Update dependencies from https://github.com/dotnet/toolset build 20191122.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.3 * Update dependencies from https://github.com/dotnet/toolset build 20191122.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5e74be13..f19cfa6e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - e41e391dd5a50cc8e9e68266deb989b13945d7a1 + fa3e6b315583a6e56169d7d9eed7d218e77bfef7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b696794b5..0f511bacd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.2 + 3.0.102-servicing.19572.4 From 7b0f60d87186180dcdd15fd56859ee25bbde044b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 22 Nov 2019 11:25:16 -0800 Subject: [PATCH 27/52] [release/3.0.1xx] Update branding for 3.0.102 (#5725) --- src/redist/targets/Versions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 44726c949..e83c1b348 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -3,12 +3,12 @@ 3 0 1 - 01 + 02 servicing - true + false From bd4beac00fed2bbe93414ebde49b8141857eaf2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 21:21:05 +0000 Subject: [PATCH 28/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.7 (#5764) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f19cfa6e1..52cd2856d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - fa3e6b315583a6e56169d7d9eed7d218e77bfef7 + 1c8612658a36f9252c68bd948bd35ec17bb768c7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0f511bacd..f984ceb9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.4 + 3.0.102-servicing.19572.7 From 60b24b9d0daf64d623c44f617d0b8790c637494d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 04:20:44 +0000 Subject: [PATCH 29/52] Update dependencies from https://github.com/dotnet/core-setup build 20191122.05 (#5771) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-05 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-05 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19572-05 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19572-05 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19572-05 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.0.1-servicing.19572.1 (parent: Microsoft.NETCore.App.Internal) --- NuGet.config | 1 - eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23ba8e092..f1a71cc37 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52cd2856d..7aadd77dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 - + https://github.com/dotnet/core-setup - d8780975138879dcbbdda4aee1534d67ca6d3e29 + 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 @@ -36,9 +36,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + 1c64bf53a2c835d8157ddede4cb8b6902fa5c3dd diff --git a/eng/Versions.props b/eng/Versions.props index f984ceb9a..9d89f5ddd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,16 +45,16 @@ - 3.0.0 + 3.0.1-servicing.19572.1 - 3.0.2-servicing-19572-01 - 3.0.2-servicing-19572-01 - 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 3.0.0 - 3.0.2-servicing-19572-01 - 3.0.2-servicing-19572-01 + 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-05 3.0.0 2.1.0 From 6875c4de92a01612487069147e8e4b407c7c7b09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:06:53 +0000 Subject: [PATCH 30/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5770) * Update dependencies from https://github.com/dotnet/toolset build 20191122.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.15 * Update dependencies from https://github.com/dotnet/toolset build 20191122.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7aadd77dd..f6fdbd341 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 1c8612658a36f9252c68bd948bd35ec17bb768c7 + 4bc7c1c52e5da0468ff8842b11ccb91a65581f66 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9d89f5ddd..cb6fac2a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.7 + 3.0.102-servicing.19572.16 From 42f98fff51c62061b3045de90e7eb7771f97c522 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 06:20:45 +0000 Subject: [PATCH 31/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.20 (#5773) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19572.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6fdbd341..da4b864a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 4bc7c1c52e5da0468ff8842b11ccb91a65581f66 + 1e97f71e3bebde4d4abb058b0565c70a767e38ee https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - 3e0bda2f22a69320cb02a520667a220b7b7a0f82 + cb72305831df077a78b5c3893eaac2971d2df7d1 diff --git a/eng/Versions.props b/eng/Versions.props index cb6fac2a8..9e746d749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.16 + 3.0.102-servicing.19572.20 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19572.1 + 3.0.102-servicing.19572.5 0.2.0 From 828eeb7d1f0b7c832d152c5b3505b92128141358 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 06:25:42 +0000 Subject: [PATCH 32/52] Update dependencies from https://github.com/dotnet/core-setup build 20191122.07 (#5774) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-07 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-07 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19572-07 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19572-07 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19572-07 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da4b864a1..8059845bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd - + https://github.com/dotnet/core-setup - 84c8bdc161ce5f1e414eb76993a8ec388dc6f167 + 431229fd2b99f84ccdccdb0fde3390c7386ff8cd diff --git a/eng/Versions.props b/eng/Versions.props index 9e746d749..74927290a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-07 3.0.0 - 3.0.2-servicing-19572-05 - 3.0.2-servicing-19572-05 + 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-07 3.0.0 2.1.0 From b395dcdb53b2cc320dec2f7aa79e7d1bd0cbc865 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 07:00:43 +0000 Subject: [PATCH 33/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.21 (#5776) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8059845bc..2859511c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 1e97f71e3bebde4d4abb058b0565c70a767e38ee + ffd846fe03c71b6df2757163dc400fc92b5c6575 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 74927290a..c640c861a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.20 + 3.0.102-servicing.19572.21 From 70aa85c291d523dd4d73f139439d470fb5eeb28f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:15:43 +0000 Subject: [PATCH 34/52] Update dependencies from https://github.com/dotnet/core-setup build 20191122.09 (#5777) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-09 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19572-09 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19572-09 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19572-09 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19572-09 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.0.1-servicing.19572.6 (parent: Microsoft.NETCore.App.Internal) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.1-servicing.19572.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2859511c5..800044b0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 431229fd2b99f84ccdccdb0fde3390c7386ff8cd + 626c14488261f91192e39a4c6c2d9480a7cd1f37 @@ -36,9 +36,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 1c64bf53a2c835d8157ddede4cb8b6902fa5c3dd + a2b312cfb6b50fa9c224c1954a6ba2fe3095796b @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf - fd11e071ec91058ccbcacb2f8fea1622e3418c23 + 906bf50af904c13a9ff42cbd1a475be0f7a3cc6c diff --git a/eng/Versions.props b/eng/Versions.props index c640c861a..e70b6aa94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.1-servicing.19571.3 + 3.0.1-servicing.19572.5 @@ -45,16 +45,16 @@ - 3.0.1-servicing.19572.1 + 3.0.1-servicing.19572.6 - 3.0.2-servicing-19572-07 - 3.0.2-servicing-19572-07 - 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 3.0.0 - 3.0.2-servicing-19572-07 - 3.0.2-servicing-19572-07 + 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 3.0.0 2.1.0 From 5803e4291f6bee67e29b437d825d95351f9df694 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 08:50:58 +0000 Subject: [PATCH 35/52] Update dependencies from https://github.com/dotnet/toolset build 20191122.25 (#5779) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19572.25 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 800044b0c..baeec3c89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - ffd846fe03c71b6df2757163dc400fc92b5c6575 + 67845a5815245c1e2b1d0a1bc21690878b0b2bad https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e70b6aa94..4ad82ccd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.21 + 3.0.102-servicing.19572.25 From 64e6bf8c237c26507077f33f42ea37750bad59ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 10:05:41 +0000 Subject: [PATCH 36/52] Update dependencies from https://github.com/dotnet/toolset build 20191123.2 (#5780) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19573.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.102-servicing.19573.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baeec3c89..4284f2a6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,17 +71,17 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 67845a5815245c1e2b1d0a1bc21690878b0b2bad + d413623d6498c9fff98e8c2781397d3cc3a97d4a https://github.com/dotnet/sdk 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a - + https://github.com/dotnet/cli - cb72305831df077a78b5c3893eaac2971d2df7d1 + f8ae9c892d145680eac10074d4ed3c924d47708b diff --git a/eng/Versions.props b/eng/Versions.props index 4ad82ccd8..b819ebd68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19572.25 + 3.0.102-servicing.19573.2 @@ -33,7 +33,7 @@ - 3.0.102-servicing.19572.5 + 3.0.102-servicing.19573.1 0.2.0 From f7d368bf46078d8ba7e6d4be9f7f58bca379ad07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 16:39:48 +0000 Subject: [PATCH 37/52] Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#5767) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 --- eng/Version.Details.xml | 4 +- .../templates/post-build/common-variables.yml | 14 ++-- .../templates/post-build/post-build.yml | 80 ++++++++++++++++++- global.json | 4 +- 4 files changed, 87 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4284f2a6d..26ac075c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 0a2c40c10..216d043e4 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -13,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ec80c65a9..9921743bc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -126,8 +126,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Tools_Latest_Publish' - channelName: '.NET Tools - Latest' + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' channelId: 2 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -138,8 +138,8 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'PVR_Publish' - channelName: '.NET Tools - Validation' + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' channelId: 9 transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' @@ -264,3 +264,75 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index d01b89c2d..018e2bd2e 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "3.0.100" + "dotnet": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" } } From 8703e586c1eb3f99cac246eeded146bc3adb6f50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 17:05:46 +0000 Subject: [PATCH 38/52] Update dependencies from https://github.com/dotnet/toolset build 20191126.5 (#5788) - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19576.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26ac075c9..ba0e70fc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - d413623d6498c9fff98e8c2781397d3cc3a97d4a + 295f543afd41bdfd28c7d65c04b8c3a8b2b73538 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b819ebd68..623986e8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19573.2 + 3.0.102-servicing.19576.5 From 77416513e4cdc8526b9a1e32a3d84e9f4fe58baf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 22:35:47 +0000 Subject: [PATCH 39/52] Update dependencies from https://github.com/dotnet/core-setup build 20191126.03 (#5789) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-03 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19576-03 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19576-03 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19576-03 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19576-03 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba0e70fc8..307340a96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 62e9d13376ca698367b5f7682cce8a2bf4666f42 diff --git a/eng/Versions.props b/eng/Versions.props index 623986e8e..f076c1407 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 3.0.0 - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-03 3.0.0 2.1.0 From 9d1b9822c262e839e075fab8695b283fb061d0dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2019 00:45:51 +0000 Subject: [PATCH 40/52] Update dependencies from https://github.com/dotnet/core-setup build 20191126.05 (#5792) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-05 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19576-05 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19576-05 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19576-05 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19576-05 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 307340a96..bee3498a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 - + https://github.com/dotnet/core-setup - 62e9d13376ca698367b5f7682cce8a2bf4666f42 + bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 diff --git a/eng/Versions.props b/eng/Versions.props index f076c1407..abe90a106 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,12 +49,12 @@ - 3.0.2-servicing-19576-03 - 3.0.2-servicing-19576-03 - 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-05 3.0.0 - 3.0.2-servicing-19576-03 - 3.0.2-servicing-19576-03 + 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-05 3.0.0 2.1.0 From 2da3d94c7b6fed06484945db67e03778ece9c081 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 27 Nov 2019 06:45:56 -0800 Subject: [PATCH 41/52] Remove incorrect stage dependencies (#5793) Remove dependencies on stages that do not exist. Keep stages that are necessary for servicing branches --- .vsts-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 094e31178..929575453 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -276,13 +276,8 @@ stages: - stage: copy_to_latest displayName: Copy to latest dependsOn: - # This will run only after all the publishing stages have run. - # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - - NetCore_Dev31_Publish - - NetCore_Dev5_Publish - NetCore_Release30_Publish - NetCore_Release31_Publish - - PVR_Publish jobs: - job: Copy_SDK_To_Latest pool: From a55d963811655b6c65c06ae5ec720e2566a1b638 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2019 01:34:22 +0000 Subject: [PATCH 42/52] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#5800) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bee3498a2..1dcaea832 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000..2cb40c294 --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000..126452131 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index 018e2bd2e..8879b279e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" } } From 307fb4cc1eece0bf53555562d4f43347883934e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 00:18:42 +0000 Subject: [PATCH 43/52] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#5822) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 24 ++++++++-- eng/common/SetupNugetSources.sh | 80 ++++++++++++++++++++++---------- global.json | 2 +- 4 files changed, 78 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dcaea832..2e12929a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - 99c6b59a8afff97fe891341b39abe985f1d3c565 + 8e47254f93b276c974968aff83222f89ec3931ed diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2cb40c294..f7867a56b 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -16,7 +16,7 @@ # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { } if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 } +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -121,7 +126,16 @@ if ($creds -eq $null) { # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password -AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} -$doc.Save($filename) +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +} + +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 126452131..4ebb1e5a4 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -17,7 +17,7 @@ # displayName: Setup Private Feeds Credentials # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) @@ -42,7 +42,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then - echo "Couldn't find the file NuGet config file: $ConfigFile" + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" ExitWithExitCode 1 fi @@ -52,7 +57,7 @@ if [[ `uname -s` == "Darwin" ]]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." ConfigNodeHeader="" @@ -62,7 +67,7 @@ if [ "$?" != "0" ]; then fi # Ensure there is a ... section. -grep -i "" $ConfigFile +grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -72,37 +77,64 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." +PackageSources=() - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') fi -# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi # I want things split line by line PrevIFS=$IFS IFS=$'\n' -PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -PackageSources+=('dotnet3-internal') -PackageSources+=('dotnet3-internal-transport') - for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile @@ -112,6 +144,6 @@ for FeedName in ${PackageSources[@]} ; do PackageSourceCredentialsNodeFooter="" NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi -done +done \ No newline at end of file diff --git a/global.json b/global.json index 8879b279e..9797e6777 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From ba831f9396406500fbc02badc8026cba017ef14a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:42:18 +0000 Subject: [PATCH 44/52] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5790) * Update dependencies from https://github.com/dotnet/toolset build 20191126.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19576.7 * Update dependencies from https://github.com/dotnet/toolset build 20191126.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19576.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e12929a9..3ee35f49b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/templating 7a6c23bdddc0f12d7f0dee0a1b655375a08888c7 - + https://github.com/dotnet/toolset - 295f543afd41bdfd28c7d65c04b8c3a8b2b73538 + cdaf3fbfbc08fa3c2f190a4c6e479e1fb050e15a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index abe90a106..d9693fb74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.102-servicing.19576.5 + 3.0.102-servicing.19576.8 From f864fc8dea3d3c1a8401f37bb9c6e125a420105c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:43:46 +0000 Subject: [PATCH 45/52] Update dependencies from https://github.com/dotnet/core-setup build 20191126.08 (#5795) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-08 - Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19576-08 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19576-08 - Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19576-08 - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19576-08 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.0.1-servicing.19576.7 (parent: Microsoft.NETCore.App.Internal) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ee35f49b..a9dac3a89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - bf4c7b66bc5aea96c8569384aa11fa88a8966cf8 + 547ae1f5f072d130b32ec3089876711070b2dc4f @@ -36,9 +36,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - a2b312cfb6b50fa9c224c1954a6ba2fe3095796b + 552078bd73ff238b312f8b92ad49f535c3445f25 diff --git a/eng/Versions.props b/eng/Versions.props index d9693fb74..16ae31366 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,16 +45,16 @@ - 3.0.1-servicing.19572.6 + 3.0.1-servicing.19576.7 - 3.0.2-servicing-19576-05 - 3.0.2-servicing-19576-05 - 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-08 + 3.0.2-servicing-19576-08 + 3.0.2-servicing-19576-08 3.0.0 - 3.0.2-servicing-19576-05 - 3.0.2-servicing-19576-05 + 3.0.2-servicing-19576-08 + 3.0.2-servicing-19576-08 3.0.0 2.1.0 From f53322dd5347da78da4513c9dc0bb23b2ad70404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 23:01:22 +0000 Subject: [PATCH 46/52] Update dependencies from https://github.com/dotnet/arcade build 20191205.2 (#5834) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9dac3a89..b6374d761 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 194fdce1e0692b4f43afacb1d386fbfe664d95cf diff --git a/global.json b/global.json index 9797e6777..e4e2d0366 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" } } From 46d6c84bd4b46b56c410d591ea051b4915eebc41 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 6 Dec 2019 15:28:16 -0800 Subject: [PATCH 47/52] Enable ci on internal branches (#5840) --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 929575453..88b6b0576 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -4,6 +4,7 @@ trigger: include: - master - release/* + - internal/release/* variables: - name: _PublishBlobFeedUrl From 4004a7f1991d58ed51888483cb0e0fa7cf0fbcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Divino=20C=C3=A9sar?= Date: Sat, 7 Dec 2019 12:47:03 -0300 Subject: [PATCH 48/52] Update dockerrun.sh (#5309) --- eng/dockerrun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index a41b3c059..762e177a7 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -143,7 +143,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e BUILD_BUILDNUMBER \ -e BUILD_SOURCEVERSION \ -e SYSTEM_TEAMPROJECT \ - -e DOTNECLIMSRC_READ_SAS_TOKEN \ + -e DOTNETCLIMSRC_READ_SAS_TOKEN \ -e AGENT_JOBNAME \ -e AGENT_OS \ -e VSS_NUGET_URI_PREFIXES \ From 624ec5e7b34b1aeb838c5004298a35c7efc72f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Divino=20C=C3=A9sar?= Date: Sat, 7 Dec 2019 20:05:24 -0300 Subject: [PATCH 49/52] Augment DownloadFile task to make it able to download from public/private location (#5414) * Patch to DownloadFile: retries + only use PrivateUri on 404 errors. * Refactor PrivateURL in GenerateLayout.targets * Address PR feedback. * Addressing PR feedback. * PR feedback * PR feedback. Bug fix. * Removing test related typo * Fixup blob replacement * Fixup blob replacement * Broaden usage of read sas token to include PRs --- eng/build.yml | 2 +- src/core-sdk-tasks/DownloadFile.cs | 107 ++++++++++++++++++---- src/redist/targets/GenerateLayout.targets | 89 ++++++++---------- 3 files changed, 127 insertions(+), 71 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index 944d1e0ce..750111576 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -43,7 +43,7 @@ phases: - _SignType: test - _DOTNETCLIMSRC_READ_SAS_TOKEN: '' - - ${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(variables['Build.SourceBranch'], 'internal')) }}: + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-MSRC-Storage - _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token) diff --git a/src/core-sdk-tasks/DownloadFile.cs b/src/core-sdk-tasks/DownloadFile.cs index 895a6749f..40178d1eb 100644 --- a/src/core-sdk-tasks/DownloadFile.cs +++ b/src/core-sdk-tasks/DownloadFile.cs @@ -3,23 +3,39 @@ using System; using System.IO; +using System.Net; using System.Net.Http; +using System.Threading.Tasks; +using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; namespace Microsoft.DotNet.Cli.Build { - public class DownloadFile : Task + public class DownloadFile : Microsoft.Build.Utilities.Task { [Required] public string Uri { get; set; } + /// + /// If this field is set and the task fail to download the file from `Uri`, with a NotFound + /// status, it will try to download the file from `PrivateUri`. + /// + public string PrivateUri { get; set; } + + public int MaxRetries { get; set; } = 5; + [Required] public string DestinationPath { get; set; } public bool Overwrite { get; set; } public override bool Execute() + { + return ExecuteAsync().GetAwaiter().GetResult(); + } + + private async System.Threading.Tasks.Task ExecuteAsync() { string destinationDir = Path.GetDirectoryName(DestinationPath); if (!Directory.Exists(destinationDir)) @@ -39,31 +55,84 @@ namespace Microsoft.DotNet.Cli.Build var filePath = Uri.Substring(FileUriProtocol.Length); Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'"); File.Copy(filePath, DestinationPath); + return true; } - else + + List errorMessages = new List(); + bool? downloadStatus = await DownloadWithRetriesAsync(Uri, DestinationPath, errorMessages); + + if (downloadStatus == false && !string.IsNullOrEmpty(PrivateUri)) { - Log.LogMessage(MessageImportance.High, $"Downloading '{Uri}' to '{DestinationPath}'"); + downloadStatus = await DownloadWithRetriesAsync(PrivateUri, DestinationPath, errorMessages); + } - using (var httpClient = new HttpClient()) + if (downloadStatus != true) + { + foreach (var error in errorMessages) { - var getTask = httpClient.GetStreamAsync(Uri); - - try - { - using (var outStream = File.Create(DestinationPath)) - { - getTask.Result.CopyTo(outStream); - } - } - catch (Exception) - { - File.Delete(DestinationPath); - throw; - } + Log.LogError(error); } } - return true; + return downloadStatus == true; + } + + /// + /// Attempt to download file from `source` with retries when response error is different of FileNotFound and Success. + /// + /// URL to the file to be downloaded. + /// Local path where to put the downloaded file. + /// true: Download Succeeded. false: Download failed with 404. null: Download failed but is retriable. + private async Task DownloadWithRetriesAsync(string source, string target, List errorMessages) + { + Random rng = new Random(); + + Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'"); + + using (var httpClient = new HttpClient()) + { + for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++) + { + try + { + var httpResponse = await httpClient.GetAsync(source); + + Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); + + // The Azure Storage REST API returns '400 - Bad Request' in some cases + // where the resource is not found on the storage. + // https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes + if (httpResponse.StatusCode == HttpStatusCode.NotFound || + httpResponse.ReasonPhrase.IndexOf("The requested URI does not represent any resource on the server.", StringComparison.OrdinalIgnoreCase) == 0) + { + errorMessages.Add($"Problems downloading file from '{source}'. Does the resource exist on the storage? {httpResponse.StatusCode} : {httpResponse.ReasonPhrase}"); + return false; + } + + httpResponse.EnsureSuccessStatusCode(); + + using (var outStream = File.Create(target)) + { + await httpResponse.Content.CopyToAsync(outStream); + } + + Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); + return true; + } + catch (Exception e) + { + Log.LogMessage(MessageImportance.High, $"returning error in {source} "); + errorMessages.Add($"Problems downloading file from '{source}'. {e.Message} {e.StackTrace}"); + File.Delete(target); + } + + await System.Threading.Tasks.Task.Delay(rng.Next(1000, 10000)); + } + } + + Log.LogMessage(MessageImportance.High, $"giving up {source} "); + errorMessages.Add($"Giving up downloading the file from '{source}' after {MaxRetries} retries."); + return null; } } } diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index e595067aa..8f93245f2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -19,23 +19,18 @@ 3.0.0 3.0.0 - + $(RedistLayoutPath)sdk\$(SdkVersion)\ - - true - $(DOTNETCLIMSRC_READ_SAS_TOKEN) - https://dotnetclimsrc.blob.core.windows.net/dotnet/ + true + https://dotnetclimsrc.blob.core.windows.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ - - https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ - - https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ - + $(HostRid) $(HostMonikerRid) @@ -104,7 +99,6 @@ $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(CombinedFrameworkHostCompressedFileName) - $(CoreSetupBlobAccessTokenParam) @@ -121,7 +115,7 @@ $(NetStandardTargetingPackTargetFramework) packs/%(PackageName)/%(PackageVersion) - + Microsoft.AspNetCore.App.Ref $(MicrosoftAspNetCoreAppRefPackageVersion) @@ -147,62 +141,53 @@ Condition="('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedRuntimeDepsInstallerFileName) - $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedFrameworkInstallerFileName) - $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedHostInstallerFileName) - $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedHostFxrInstallerFileName) - $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) $(DownloadedNetCoreAppTargetingPackInstallerFileName) - $(CoreSetupBlobAccessTokenParam) $(CoreSetupRootUrl)$(NETStandardTargetingPackBlobVersion) $(DownloadedNetStandardTargetingPackInstallerFileName) - $(CoreSetupBlobAccessTokenParam) $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) - $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackBlobVersion) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) - $(CoreSetupBlobAccessTokenParam) $(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip - $(CoreSetupBlobAccessTokenParam) sdk/$(SdkVersion) @@ -211,7 +196,6 @@ $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxArchiveFileName) - $(CoreSetupBlobAccessTokenParam) @@ -221,38 +205,34 @@ Condition="'$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(AspNetTargetingPackArchiveFileName) - $(CoreSetupBlobAccessTokenParam) - + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(DownloadedAspNetTargetingPackInstallerFileName) - $(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) - $(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) - $(CoreSetupBlobAccessTokenParam) - + false true false - + Microsoft.WindowsDesktop.App.Ref @@ -264,14 +244,12 @@ $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(WinFormsAndWpfSharedFxArchiveFileName) - $(CoreSetupBlobAccessTokenParam) $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) - $(CoreSetupBlobAccessTokenParam) @@ -287,11 +265,20 @@ true + + + %(BaseUrl) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(CoreSetupBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetExtensionsBlobRootUrl)', '$(InternalBaseURL)')) + $([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(DotnetToolsetBlobRootUrl)', '$(InternalBaseURL)')) - + @@ -315,7 +302,7 @@ $([MSBuild]::ValueOrDefault('%(BundledLayoutPackage.PackageName)', '').ToLower()) - + %(BundledLayoutPackage.RelativeLayoutPath) %(BundledLayoutPackage.Identity) @@ -355,7 +342,7 @@ DestinationFiles="@(BundledLayoutPackageDownloadFilesWithDestination->'%(DestinationPath)')" SkipUnchangedFiles="true" /> - + @@ -372,24 +359,24 @@ ReplacementPatterns="$(ReplacementPattern)" ReplacementStrings="$(ReplacementString)" /> - + - + - + Microsoft.NETCore.App.Host.$(SharedFrameworkRid) $(IntermediateOutputPath)AppHostRestore\ $(SdkOutputDirectory)AppHostTemplate - + - + @@ -406,7 +393,7 @@ BuildInParallel="False" Projects="@(AppHostTemplateDownloadPackageProject)"> - + AppHost$(ExeExtension) @@ -427,9 +414,9 @@ - + - + - + - + - + From 2beb6e6c15e451318d9dbb0ad23025e97617ef8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2019 01:12:57 +0000 Subject: [PATCH 50/52] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#5847) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3 --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 14 ++++--- eng/common/dotnet-install.ps1 | 6 ++- eng/common/dotnet-install.sh | 13 ++++++- .../channels/generic-internal-channel.yml | 4 ++ .../templates/post-build/post-build.yml | 6 +++ eng/common/tools.ps1 | 39 ++++++++++++++++--- eng/common/tools.sh | 26 ++++++++++++- global.json | 2 +- 9 files changed, 94 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6374d761..446bf9893 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,9 +94,9 @@ - + https://github.com/dotnet/arcade - 194fdce1e0692b4f43afacb1d386fbfe664d95cf + 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index f7867a56b..a8b5280d9 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $doc.Save($filename) \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b830..ec3e739fe 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958..d259a274c 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 68fdec029..ad9375f5e 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -26,6 +26,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 9921743bc..b121d77e0 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -49,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea940..92a053bd1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea..94965a8fd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index e4e2d0366..0ecdbe2b3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } } From 40a92b5d678a1fe30aa7130dd0738d81b6f471f1 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Dec 2019 08:11:28 -0800 Subject: [PATCH 51/52] Fixup version patch --- src/redist/targets/Versions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index a46acac70..bc996a2f1 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -1,9 +1,9 @@ - + 3 1 1 - 02 + 01 servicing