From 284bcacb8aba7b24c1cafa960c70e67990b99729 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Apr 2022 20:31:26 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20220328.5 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/source-build.yml | 4 ++-- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905170bbb..1ef6d6a36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b1a71dbe8..8937945e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22161.1 + 6.0.0-beta.22178.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f..abb1b2bcd 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 3778b80ba..b5bee2e33 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" } } From faff72a1b7d227c97981228ad65eb1c0311df66d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 19:53:04 -0700 Subject: [PATCH 2/7] Restore the changes for the files in the eng/folder --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef6d6a36..905170bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,19 +201,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8937945e6..b1a71dbe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22161.1 From 7f8493cb0ad74361f3be4bf058ab6326a6befcfa Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Apr 2022 19:54:04 -0700 Subject: [PATCH 3/7] Restore the changes for the global.json file --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b5bee2e33..3778b80ba 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1" } } From 91745daffd1931bb3fb57474e3d031aa20b43d02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 09:52:51 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/sdk build 20220407.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.300-preview.22205.30 -> To Version 6.0.300-preview.22207.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.2.0-3.22205.5 -> To Version 4.2.0-3.22206.5 (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 2654f15e7..6ab1f843b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 897d00731c4f89d2adbf174a32fe658ae415fe36 - + https://github.com/dotnet/sdk - 79124b91b7abd4f5ce51c488ed65cf0fd61848cb + 2d63b9580af02442d348a30e5bdead467ff4f0ae - + https://github.com/dotnet/sdk - 79124b91b7abd4f5ce51c488ed65cf0fd61848cb + 2d63b9580af02442d348a30e5bdead467ff4f0ae @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 0167599e0e1634ea3ed8d0e41390a3c0d9b3e4e9 + 52c2528edc70439991e0aaedd97b1e0e6f69a6c7 diff --git a/eng/Versions.props b/eng/Versions.props index 7f3fb2b1c..94d347af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.300-preview.22205.30 - 6.0.300-preview.22205.30 + 6.0.300-preview.22207.3 + 6.0.300-preview.22207.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 476e38ade4274bf143df49334f7c0e0c5417bdca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 14:34:21 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ab1f843b..329c39e6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - dfdfa4ee297fe8daa90cd623c5b612abf3f60873 + faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b From bf3a0af993d9a5e5e3f025ecd3b0529b1bd492e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:21:19 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 329c39e6f..01194a8d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/source-build-reference-packages - faf0b236201ff5d2ed8b9bc18b13cbc7cebdcd9b + 7cdb7a26c89847fcd5dc72ef5eba659030f57666 From 4a7532f9b8aaa775454a9026e728305a26cc240c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 15:54:38 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/arcade build 20220406.7 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ab1f843b..01b4d9768 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 - + https://github.com/dotnet/arcade - f8c0d51185208227e582f76ac3c5003db237b689 + 254113fd7c3ee04f832c165d6aec1a6077de0d63 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 94d347af6..d16f6af8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22178.5 + 6.0.0-beta.22206.7 diff --git a/global.json b/global.json index b5bee2e33..b50ccb2be 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7" } }