From 7f1f56e98cacc82aedb5f66b7e79336179dc0cb9 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:20:40 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#5821) - 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 714dbd126..d83bfc195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,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 d68bbee67..ca9fbac4b 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" } } From d28a00f0ba2fe62391bcdd961ff3120a31677dda 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:32:56 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/aspnet/AspNetCore build 20191125.14 (#5786) - VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19575.14 - dotnet-user-secrets - 3.1.0-rtm.19575.14 - dotnet-watch - 3.1.0-rtm.19575.14 - Microsoft.AspNetCore.App.Ref - 3.1.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0 - dotnet-dev-certs - 3.1.0-rtm.19575.14 --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd15a818e..9de7a9daa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d83bfc195..3d5d7df03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,27 +41,27 @@ https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/aspnet/AspNetCore - c31f51e5c778dc817862d0c932e7cfe9223d4899 + 7db696998c6ae4852fbf01827efdb10634e22668 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index df8272acf..b5f339450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,10 +38,10 @@ 3.1.0 3.1.0 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 - 3.1.0-rtm.19573.3 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 + 3.1.0-rtm.19575.14 From cef20df33ac7fadc9094a17c7dbd21650560ad7d 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:44:37 +0000 Subject: [PATCH 3/9] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5794) * Update dependencies from https://github.com/dotnet/core-setup build 20191126.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.7 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.7 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.7 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.7 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.7 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.7 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.7 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19576.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20191126.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.9 - Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.9 - Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.9 - Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.9 - Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.9 - Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.9 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.19576.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19576.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d5d7df03..15128c081 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - 07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c + f3f2dd583fffa254015fc21ff0e45784b333256d @@ -84,13 +84,13 @@ cc6bdda9777fff833fe170e3006470e9409521cf - + https://github.com/dotnet/winforms - 24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe + 2204c3f17bea70ee01be3b450f6b84158a80c154 - + https://github.com/dotnet/wpf - e85bb34bcb91bf7b8859d6fd84fd440508498aea + c8a08a25cbde21c5d45048a8719b1c64216402f7 diff --git a/eng/Versions.props b/eng/Versions.props index b5f339450..b9602839d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-rtm.19568.1 + 4.8.1-servicing.19576.3 - 3.1.0-rtm.19572.4 + 3.1.0-rtm.19576.3 @@ -61,13 +61,13 @@ - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 - 3.1.1-servicing.19576.4 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 2.1.0 From 25e68747957958e42d61e8ca9c5292c14f50a3e7 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:48:26 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/test-templates build 20191120.1 (#5816) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.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 15128c081..2a42afe46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,9 @@ https://github.com/aspnet/AspNetCore 7db696998c6ae4852fbf01827efdb10634e22668 - + https://github.com/dotnet/test-templates - 6ae8a6e7dd862c9447771c108d43fb9028f22c22 + 5117d3d9d7dfd3583f0c42a639efaf092f957b7b https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b9602839d..009750b25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.19511.1 + 1.0.2-beta4.19570.1 From 2b01f1ce0186b43bc3da55a57623aa4d2b88be2d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 5 Dec 2019 13:49:07 -0800 Subject: [PATCH 5/9] Update to 3.1.100 rtm sdk (#5828) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ca9fbac4b..f16ee850c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.100-preview1-014459" + "dotnet": "3.1.100" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" From 0c0a0376634c110b07b1318f7bdb7cb2d1f6f79b 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:19 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/arcade build 20191205.2 (#5833) - 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 2a42afe46..5af07963a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 8e47254f93b276c974968aff83222f89ec3931ed + 194fdce1e0692b4f43afacb1d386fbfe664d95cf diff --git a/global.json b/global.json index f16ee850c..fb762da6e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19603.16" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" } } From a3c1db033e1e99718e3ea54c7a952052a2ebcdf1 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 6 Dec 2019 14:56:33 -0800 Subject: [PATCH 7/9] Pin dependency on Core-Setup ref packs to 3.1.0 (#5814) * Pin dependency on Core-Setup ref packs to 3.1.0 * Fixup core-setup feeds * Move pinned deps later in file * Update GenerateLayout to account for pinned packs --- NuGet.config | 1 + eng/Version.Details.xml | 18 ++++++++++-------- eng/Versions.props | 4 ++-- src/redist/targets/GenerateLayout.targets | 6 +++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9de7a9daa..f46283b09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5af07963a..b321b92ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,10 @@ - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d - https://github.com/dotnet/core-setup f3f2dd583fffa254015fc21ff0e45784b333256d - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d - https://github.com/dotnet/core-setup f3f2dd583fffa254015fc21ff0e45784b333256d @@ -35,6 +27,16 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + + + https://github.com/dotnet/core-setup + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 diff --git a/eng/Versions.props b/eng/Versions.props index 009750b25..cd7f9eed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,10 +64,10 @@ 3.1.1-servicing.19576.9 3.1.1-servicing.19576.9 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.0 3.1.1-servicing.19576.9 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.0 2.1.0 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 7cf525f5f..ec327aedd 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -15,9 +15,9 @@ $(MicrosoftNETCoreAppInternalPackageVersion) - $(CoreSetupBlobVersion) - $(AspNetCoreBlobVersion) - $(CoreSetupBlobVersion) + 3.1.0 + 3.1.0 + 3.1.0 3.0.0 From 1434995df1d681ae48152c8d8c370c33d364f46a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sat, 7 Dec 2019 07:43:56 -0800 Subject: [PATCH 8/9] Remove incorrect stage dependencies (#5793) (#5842) 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 2a47781bc..40b3568a5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -277,13 +277,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 16041a08d3a8a62edf86d6916741324e07566a7a 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:17:21 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#5846) - 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 b321b92ae..47ff385a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,9 +102,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 fb762da6e..84f775a7a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19605.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" } }