diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2762d0ee9c..dd5e32f2b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,289 +45,289 @@ https://github.com/dotnet/efcore 69ce8af8c2b7ac90fc54798ea206d3770fb8db43 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/arcade - fd104228e5b97494a4ab0896a979b69928257ef9 + 91470b0b14ba016c1fb78211b12775287c17b34e - + https://github.com/dotnet/arcade - fd104228e5b97494a4ab0896a979b69928257ef9 + 91470b0b14ba016c1fb78211b12775287c17b34e - + https://github.com/dotnet/arcade - fd104228e5b97494a4ab0896a979b69928257ef9 + 91470b0b14ba016c1fb78211b12775287c17b34e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index dd2e93f989..283ba54c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,74 +64,74 @@ 3.8.0-2.20403.2 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20460.7 3.2.0 @@ -144,7 +144,7 @@ 5.0.0-rc.2.20459.6 5.0.0-rc.2.20459.6 - 5.0.0-beta.20452.19 + 5.0.0-beta.20459.8 + diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 95b113b33b..650b13b089 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation, [Parameter(Mandatory=$false)][string] $EnableSigningValidation, [Parameter(Mandatory=$false)][string] $EnableNugetValidation, - [Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums, + [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters ) @@ -16,7 +16,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel - . $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1" + $darc = Get-Darc "1.1.0-beta.20418.1" $optionalParams = [System.Collections.ArrayList]::new() @@ -29,7 +29,7 @@ try { $optionalParams.Add("--no-wait") | Out-Null } - if ("true" -eq $PublishInstallersAndChecksums) { + if ("false" -ne $PublishInstallersAndChecksums) { $optionalParams.Add("--publish-installers-and-checksums") | Out-Null } @@ -50,12 +50,11 @@ try { } } - & darc add-build-to-channel ` + & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` --source-branch master ` - --publish-installers-and-checksums ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` 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 59eb93a407..7ae5255921 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -4,7 +4,7 @@ parameters: artifactsPublishingAdditionalParameters: '' dependsOn: - Validate - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true symbolPublishingAdditionalParameters: '' stageName: '' channelName: '' @@ -158,7 +158,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release - /p:PublishInstallersAndChecksums=true + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey) /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 7e80a621a3..6cf39dbb29 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -4,7 +4,7 @@ parameters: artifactsPublishingAdditionalParameters: '' dependsOn: - Validate - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true symbolPublishingAdditionalParameters: '' stageName: '' channelName: '' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 630a99d4dd..df06f5371e 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -19,7 +19,7 @@ parameters: enableSigningValidation: true enableSymbolValidation: false enableNugetValidation: true - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true SDLValidationParameters: enable: false continueOnError: false diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index daca90c0b6..37a3a3d680 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -718,6 +718,16 @@ function IsWindowsPlatform() { return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT } +function Get-Darc($version) { + $darcPath = "$TempDir\darc\$(New-Guid)" + if ($version -ne $null) { + & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host + } else { + & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath | Out-Host + } + return "$darcPath\darc.exe" +} + . $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..') diff --git a/global.json b/global.json index ca240fa07a..97c6ea58f3 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20452.19", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20452.19" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20459.8" } }