From 83cea742b56c12f49139ca9102d73a1d0c510b71 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Tue, 2 Feb 2021 09:54:21 -0800 Subject: [PATCH 01/11] Update 5.0.3xx branding' --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0850f2f08..7e2b8fd12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 5 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview From ad9a5adad690ff371b527f4724cd01441f4d127b Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 10 Feb 2021 08:02:29 -0800 Subject: [PATCH 02/11] Fixup feeds (#9671) Co-authored-by: Matt Mitchell --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 80a8ed6b9..b8f756ebb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + From ed4165ce904f13512ba06184bdfc5a485d1be305 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Tue, 16 Feb 2021 09:22:56 -0800 Subject: [PATCH 03/11] Duplicate productVersion.txt with repo-specific name (#9666) (#9708) In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links. --- eng/Publishing.props | 3 +++ src/redist/targets/GenerateBundledVersions.targets | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index e34b66cc2..4ef1c204b 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -76,6 +76,8 @@ + @@ -86,6 +88,7 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 18fc1ea27..31e587227 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -8,6 +8,12 @@ Lines="$(PackageVersion)" Overwrite="true" Encoding="ASCII" /> + + Date: Wed, 17 Feb 2021 14:33:25 -0800 Subject: [PATCH 04/11] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index f41f4965e..e89f3da42 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.13 - 10.0.18362.13 - 10.0.19041.13 + 10.0.17763.14 + 10.0.18362.14 + 10.0.19041.14 From 8001605e64e1ab73fa436e0df5e0c5c365d63250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:12:29 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/sdk build 20210224.25 (#9792) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.9.0-preview-21078-04 to 16.10.0-preview-21124-17 (parent: Microsoft.NET.Sdk) --- 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 efb87e1d0..12a734d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - f9d6307ccd2c2249524bb2b2ace9167dc1a635fc + ca0d0297110716fe1558dc087756eccd293b9696 - + https://github.com/dotnet/sdk - f9d6307ccd2c2249524bb2b2ace9167dc1a635fc + ca0d0297110716fe1558dc087756eccd293b9696 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 3f54551d64817ec41c571b60cd512bd4e5902431 - + https://github.com/dotnet/msbuild - 968042dd0751542e52f8bae910f834d6e6379227 + 30bbc5a5d8e21034676182480407c32079af28b5 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 7e2b8fd12..30380c6cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21079.24 - 5.0.200-preview.21079.24 + 5.0.300-preview.21124.25 + 5.0.300-preview.21124.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f35c8212c7ca89edbbdedb5a7e17a5037eda92d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Feb 2021 10:16:26 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/sdk build 20210226.2 (#9805) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21124-17 to 16.10.0-preview-21124-19 (parent: Microsoft.NET.Sdk) --- 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 12a734d24..547de50c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - ca0d0297110716fe1558dc087756eccd293b9696 + 4d8d629875e8f9d5cbead7b44277c1e8f7046fcf - + https://github.com/dotnet/sdk - ca0d0297110716fe1558dc087756eccd293b9696 + 4d8d629875e8f9d5cbead7b44277c1e8f7046fcf @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 3f54551d64817ec41c571b60cd512bd4e5902431 - + https://github.com/dotnet/msbuild - 30bbc5a5d8e21034676182480407c32079af28b5 + 4e4d2fd3f7f9e4a08d3d395692ea3d178bde2c98 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 30380c6cc..b19ad478b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21124.25 - 5.0.300-preview.21124.25 + 5.0.300-preview.21126.2 + 5.0.300-preview.21126.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63458a6d012463ca6ef570335dbfdebf38900ac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Feb 2021 16:09:50 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/sdk build 20210226.8 (#9812) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21124-19 to 16.10.0-preview-21126-01 (parent: Microsoft.NET.Sdk) --- 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 547de50c8..6f1346488 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 4d8d629875e8f9d5cbead7b44277c1e8f7046fcf + 5f89922fcc2c22c4997de42b0d38fa878fe6e2e2 - + https://github.com/dotnet/sdk - 4d8d629875e8f9d5cbead7b44277c1e8f7046fcf + 5f89922fcc2c22c4997de42b0d38fa878fe6e2e2 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 3f54551d64817ec41c571b60cd512bd4e5902431 - + https://github.com/dotnet/msbuild - 4e4d2fd3f7f9e4a08d3d395692ea3d178bde2c98 + 6819f7ab06c3f43e83ff4059d417395e0af06c01 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index b19ad478b..0de42b535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21126.2 - 5.0.300-preview.21126.2 + 5.0.300-preview.21126.8 + 5.0.300-preview.21126.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4574441ea34b4463863c637f86bc2dcacc08342b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 21:29:59 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/sdk build 20210302.6 (#9857) [release/5.0.3xx] Update dependencies from dotnet/sdk --- 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 6f1346488..cde139a18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 5f89922fcc2c22c4997de42b0d38fa878fe6e2e2 + 022a4a8aaf2415b73c7eb7a10121ef61bbc8757e - + https://github.com/dotnet/sdk - 5f89922fcc2c22c4997de42b0d38fa878fe6e2e2 + 022a4a8aaf2415b73c7eb7a10121ef61bbc8757e diff --git a/eng/Versions.props b/eng/Versions.props index 0de42b535..377a398a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21126.8 - 5.0.300-preview.21126.8 + 5.0.300-preview.21152.6 + 5.0.300-preview.21152.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7360beb6b4eb0ed0e520f1ef6e2c4c278f90fe53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Mar 2021 23:53:12 +0000 Subject: [PATCH 09/11] Update dependencies from https://github.com/dotnet/arcade build 20210309.2 (#9898) [release/5.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++-- eng/Versions.props | 2 +- eng/common/internal-feed-operations.ps1 | 2 - eng/common/internal-feed-operations.sh | 2 - eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/sdl/init-sdl.ps1 | 13 +------ eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- .../templates/post-build/post-build.yml | 37 +++++++++++++++++-- global.json | 2 +- 10 files changed, 44 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cde139a18..b57cc9118 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 377a398a9..3f50373a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21063.3 + 5.0.0-beta.21159.2 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index b8f6529fd..418c09930 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -63,8 +63,6 @@ function SetupCredProvider { } if (($endpoints | Measure-Object).Count -gt 0) { - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress # Create the environment variables the AzDo way diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9ed225e7e..343054b3a 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -62,8 +62,6 @@ function SetupCredProvider { endpoints+=']' if [ ${#endpoints} -gt 2 ]; then - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 650b13b08..a40ee827a 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -54,7 +54,7 @@ try { --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` - --source-branch master ` + --source-branch main ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index a68bf0b88..bb6a42971 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip" Add-Type -AssemblyName System.IO.Compression.FileSystem $gdnFolder = (Join-Path $WorkingDirectory '.gdn') -try { - # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead - Write-Host 'Downloading gdn folder from internal config repostiory...' - Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile - if (Test-Path $gdnFolder) { - # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) - Remove-Item -Force -Recurse $gdnFolder - } - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) - Write-Host $gdnFolder - ExitWithExitCode 0 -} catch [System.Net.WebException] { } # Catch and ignore webexception + try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository Write-Host 'Initializing Guardian...' diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 968b39bef..3bd8b29eb 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index c64c4f568..53c100222 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -83,7 +83,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 + -GuardianPackageName Microsoft.Guardian.Cli.0.53.3 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 761fb1a29..1b0af40d5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -65,7 +65,9 @@ parameters: VS167ChannelId: 1011 VS168ChannelId: 1154 VSMasterChannelId: 1012 - + VS169ChannelId: 1473 + VS1610ChannelId: 1692 + stages: - ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -94,8 +96,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - job: displayName: NuGet Validation dependsOn: setupMaestroVars @@ -608,3 +609,33 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/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: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_9_Publishing' + channelName: 'VS 16.9' + channelId: ${{ parameters.VS169ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/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: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_10_Publishing' + channelName: 'VS 16.10' + channelId: ${{ parameters.VS1610ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/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 1a93f9a81..69256da0f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" } } From ac83349c860db9d427ad1179f815c352f646518d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 11:22:53 +0000 Subject: [PATCH 10/11] [release/5.0.3xx] Update dependencies from dotnet/sdk (#9890) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.200-preview.21062.2 to 5.0.300-preview.21159.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b57cc9118..780d59b2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 7a9de3bd9680522874b2081280df3f971673cd87 + c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - 022a4a8aaf2415b73c7eb7a10121ef61bbc8757e + e5edab6f6c519bbb2a16eef49d27ec36f50de57a - + https://github.com/dotnet/sdk - 022a4a8aaf2415b73c7eb7a10121ef61bbc8757e + e5edab6f6c519bbb2a16eef49d27ec36f50de57a diff --git a/eng/Versions.props b/eng/Versions.props index 3f50373a4..f0c1b4c67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.200-preview.21062.2 + 5.0.300-preview.21159.1 @@ -55,8 +55,8 @@ - 5.0.300-preview.21152.6 - 5.0.300-preview.21152.6 + 5.0.300-preview.21159.10 + 5.0.300-preview.21159.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a46d964705252fb5245e5502f3fe1738a92dd40c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 19:30:04 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/arcade build 20210309.7 (#9913) [release/5.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 780d59b2d..adad29668 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f0c1b4c67..80c602c07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.2 + 5.0.0-beta.21159.7 diff --git a/global.json b/global.json index 69256da0f..5760c69fc 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" } }