From c56d85f7de09f796b000ef5a0c2f82e14296995e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 06:48:30 +0000 Subject: [PATCH 01/20] Update dependencies from https://github.com/dotnet/sdk build 20211206.13 (#12753) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21572.8 to 12.0.1-beta.21606.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21572.8 to 6.0.2-beta.21606.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9934f87a1..a72311e30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d - + https://github.com/dotnet/sdk - 5381a5ba97dbea698e271e0cc4852a094a78672d + b943ebcc5c7a8c693688b1234f7f7f089210c91d @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e - + https://github.com/dotnet/fsharp - 44e285721013feeedfa140298ea9f172a0c6fd70 + 770a64e596a066ea068ac1e00f2824a06ba9ba8e diff --git a/eng/Versions.props b/eng/Versions.props index 1f41437c6..ea5a46cc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.10 - 6.0.200-preview.21606.10 + 6.0.200-preview.21606.13 + 6.0.200-preview.21606.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 567091840a4a5b74473debcc7d5d14a33d1edc20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:35:36 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/sdk build 20211207.2 (#12755) [release/6.0.2xx] 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 a72311e30..fce0214d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 - + https://github.com/dotnet/sdk - b943ebcc5c7a8c693688b1234f7f7f089210c91d + 213c586f6f93d8698db1ac43abde854991e95d28 diff --git a/eng/Versions.props b/eng/Versions.props index ea5a46cc6..c2c8dd95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21606.13 - 6.0.200-preview.21606.13 + 6.0.200-preview.21607.2 + 6.0.200-preview.21607.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26f2b4eb6c2cd3a3c229dbd7589ff6fc924cd681 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:06:45 +0000 Subject: [PATCH 03/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12756) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 fce0214d0..5d68bea6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - fc184172bf8144f7c91a7bc0226b7d90c5821576 + 897a9709eb370a92bce2391d77b03d06149cbb6c From 6d5146068a318a55828d41413d68d19b48e42eb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:03:27 +0000 Subject: [PATCH 04/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12767) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 5d68bea6c..61235a858 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 897a9709eb370a92bce2391d77b03d06149cbb6c + 8e0f29bef4764af0fecece781ba606e4c61b352f From b0cb972aeb4c539edf2ddcbb5b3fe0f1ef0133b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:24:22 +0000 Subject: [PATCH 05/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12769) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 61235a858..c0f487fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 8e0f29bef4764af0fecece781ba606e4c61b352f + 67a6ec56185bfec2a52e211b25335849bdb630af From 38a612150c53bbadffce67143067cabeab6e2f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:00:56 +0000 Subject: [PATCH 06/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12772) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 c0f487fc3..49d9fe91d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - 67a6ec56185bfec2a52e211b25335849bdb630af + d18b3749457151f76d5f9fc4a1318d9be3bbfbff From d3ff42d64f3f8199c283c68ae5fbbf62296b0f3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 07:17:36 -0800 Subject: [PATCH 07/20] [release/6.0.2xx] Update dependencies from dotnet/sdk (#12757) * Update dependencies from https://github.com/dotnet/sdk build 20211207.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.3 Dependency coherency updates Microsoft.Build From Version 17.1.0-preview-21579-05 -> To Version 17.1.0-preview-21607-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.5 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.32 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.32 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211207.34 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.34 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211208.7 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20211209.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211209.16 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.16 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.2 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20211210.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.3 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk * Disable tarball build in PR validation * Update dependencies from https://github.com/dotnet/sdk build 20211210.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 8 ++-- .../job/source-build-run-tarball-build.yml | 10 +++-- .../0001-Fix-MicrosoftExtensionsVersion.patch | 2 +- ...2-Update-system-command-line-version.patch | 4 +- ...y-on-MS.VS.Setup.Configuration.Inter.patch | 4 +- ...PublicApiAnalyzers-in-sourcebuild-71.patch | 26 ------------ 7 files changed, 35 insertions(+), 59 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49d9fe91d..ecd08b399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating - 3cdf2180028076da6f06f4da4b8767e33da92157 + 7c35333b66a97deaa23c519889de11069cf22504 https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 - + https://github.com/dotnet/sdk - 213c586f6f93d8698db1ac43abde854991e95d28 + ded89e318e54c0eb08ffa58db96482c1db6bff87 @@ -121,18 +121,18 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/dotnet/fsharp - 770a64e596a066ea068ac1e00f2824a06ba9ba8e + 81a4ff1db24cf67d52a543da99b7abf7e73276f6 - + https://github.com/microsoft/vstest - 7f3499467c833d54d1e100d33d2ee54455112bd2 + 61da6f27702b8330c99da8fa9f5c82722971cd73 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 1073bc6ce7a0eb08968656e10042970d2f7b3b1d + 818313426323d979747781a17c78860c833776da - + https://github.com/dotnet/msbuild - 23940013c60c33c183e52547ce6ca535b6689d4c + 96a618ca59610908eddc92bfd0198746c34f0ed5 - + https://github.com/nuget/nuget.client - c14b85a00c03933c708c7d38fefeda9898a21488 + 9187a50daec29061772a2057490697c6c0e4c354 diff --git a/eng/Versions.props b/eng/Versions.props index c2c8dd95d..28a619f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21572.3 + 6.0.200-alpha.1.21609.2 @@ -56,8 +56,8 @@ - 6.0.200-preview.21607.2 - 6.0.200-preview.21607.2 + 6.0.200-preview.21610.4 + 6.0.200-preview.21610.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211130-04 + 17.2.0-preview-20211209-03 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 70d81e3d6..11259ab58 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -37,10 +37,12 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - Fedora33-Offline: - _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} - _RunOnline: false + # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Fedora33-Offline: + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 workspace: clean: all diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..7d5d03116 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch index 4d5554a71..68917950e 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -19,7 +19,7 @@ index 48b181b..68c0b43 100644 +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 + c7d6f9fab845ffd943216da465022744e7d35f22 - + @@ -41,7 +41,7 @@ index 2758207..6a02917 100644 +++ b/eng/Versions.props @@ -18,8 +18,8 @@ - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 - 2.0.0-beta1.21473.1 - 0.3.0-alpha.21473.1 diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 1c6710555..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -23,11 +23,11 @@ index a1f21de26..ff74d6e7f 100644 @@ -22,9 +22,6 @@ - + - - - - + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch deleted file mode 100644 index a0133a35f..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rainer Sigwald -Date: Fri, 3 Dec 2021 14:24:03 -0600 -Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118) - -This package is only super relevant at PR-build time so it should -be fine to drop it from source-build scenarios. Fixes #7115. - -Patch created from https://github.com/dotnet/msbuild/pull/7118 ---- - src/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets -index 2a840bfd7..bff6cc905 100644 ---- a/src/Directory.Build.targets -+++ b/src/Directory.Build.targets -@@ -85,7 +85,7 @@ - - - -- -+ - - - From 948cabe984382b53e75e58c0c249345ba9694cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:59:46 +0000 Subject: [PATCH 08/20] Update dependencies from https://github.com/dotnet/sdk build 20211210.7 (#12788) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21608.2 to 12.0.1-beta.21610.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21608.2 to 6.0.2-beta.21610.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecd08b399..8565b8b75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed - + https://github.com/dotnet/sdk - ded89e318e54c0eb08ffa58db96482c1db6bff87 + 4dfc89293465357eaf757e5e4cd461680a3ceaed @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf 3f75a67c752a116de292affae29a22bbb5b71b18 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/dotnet/fsharp - 81a4ff1db24cf67d52a543da99b7abf7e73276f6 + c12acdbfa5f76f811888d824bce5a87f7f68fdb8 diff --git a/eng/Versions.props b/eng/Versions.props index 28a619f3b..436e8cfa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.4 - 6.0.200-preview.21610.4 + 6.0.200-preview.21610.7 + 6.0.200-preview.21610.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70187fdee018dd4a04d6ff644d2ec1f81f6da7b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:06:34 +0000 Subject: [PATCH 09/20] Update dependencies from https://github.com/dotnet/sdk build 20211210.9 (#12792) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211209-03 to 17.2.0-preview-20211210-01 (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 8565b8b75..68a7a36fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f - + https://github.com/dotnet/sdk - 4dfc89293465357eaf757e5e4cd461680a3ceaed + d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f @@ -130,9 +130,9 @@ c12acdbfa5f76f811888d824bce5a87f7f68fdb8 - + https://github.com/microsoft/vstest - 61da6f27702b8330c99da8fa9f5c82722971cd73 + a809880e02d8a9986e3ba1daeeeb5078fbb96be5 diff --git a/eng/Versions.props b/eng/Versions.props index 436e8cfa6..cac842119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.7 - 6.0.200-preview.21610.7 + 6.0.200-preview.21610.9 + 6.0.200-preview.21610.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211209-03 + 17.2.0-preview-20211210-01 From 19990a7cb8d1d8ef6d0b46cfed9fbea9adca2a96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 22:50:18 +0000 Subject: [PATCH 10/20] Update dependencies from https://github.com/dotnet/sdk build 20211210.11 (#12797) [release/6.0.2xx] 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 68a7a36fa..cbdda471f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d - + https://github.com/dotnet/sdk - d268cbed4a4eb3ab84a76bd796ac2a5bd59e451f + eecd0b51081c8e43197b8f0cc592ad5e1674b26d diff --git a/eng/Versions.props b/eng/Versions.props index cac842119..366068870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.9 - 6.0.200-preview.21610.9 + 6.0.200-preview.21610.11 + 6.0.200-preview.21610.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9471f49b4a5ae5cc214317eb76abef3c1fdaf98c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Dec 2021 00:11:30 +0000 Subject: [PATCH 11/20] Update dependencies from https://github.com/dotnet/sdk build 20211210.13 (#12799) [release/6.0.2xx] 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 cbdda471f..749cd1c63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a - + https://github.com/dotnet/sdk - eecd0b51081c8e43197b8f0cc592ad5e1674b26d + 420dc32f3477673ebf192050e0944d423e58b92a diff --git a/eng/Versions.props b/eng/Versions.props index 366068870..68bf285d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.11 - 6.0.200-preview.21610.11 + 6.0.200-preview.21610.13 + 6.0.200-preview.21610.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74d83b52e6f44094a92c91f036fa481d5b14d932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 05:02:12 +0000 Subject: [PATCH 12/20] Update dependencies from https://github.com/dotnet/sdk build 20211212.4 (#12803) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (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 749cd1c63..667a5aac0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,11 +90,11 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 - + https://github.com/dotnet/templating 7c35333b66a97deaa23c519889de11069cf22504 @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 7d941613047c847c87dc8d243a54fd1a45a47de7 - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb - + https://github.com/dotnet/sdk - 420dc32f3477673ebf192050e0944d423e58b92a + 4a935da067ee66f3d9bf5bdcda8dd3952e342ebb diff --git a/eng/Versions.props b/eng/Versions.props index 68bf285d1..18a9b2510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.200-alpha.1.21609.2 + 6.0.200-alpha.1.21609.4 @@ -56,8 +56,8 @@ - 6.0.200-preview.21610.13 - 6.0.200-preview.21610.13 + 6.0.200-preview.21612.4 + 6.0.200-preview.21612.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8c9c22117ca2db1d42f0d2c367450c818202a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:20:28 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12811) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 667a5aac0..a87dbe481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade ad9890056979bc704773746d927dfdfa5bec7227 - + https://github.com/dotnet/source-build-reference-packages - d18b3749457151f76d5f9fc4a1318d9be3bbfbff + e025965a8e463030d890739043b6e64b41a5de84 From 2e29acc142418464086b64f81bf61cf745fc93a8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Dec 2021 10:10:05 -0800 Subject: [PATCH 14/20] Fix the logic that generates the fallback text file --- src/redist/targets/GenerateLayout.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3917efa60..a26cad868 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -463,9 +463,13 @@ + - + + + + From f2abec4abdbed5758a01797dee75ad4306eaa32c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 19:34:03 +0000 Subject: [PATCH 15/20] Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12834) [release/6.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++-- eng/Versions.props | 2 +- eng/common/build.sh | 3 - eng/common/sdk-task.ps1 | 3 - eng/common/templates/job/onelocbuild.yml | 3 + eng/common/tools.ps1 | 78 +++++++++++------------- eng/common/tools.sh | 69 +++++++++++---------- global.json | 4 +- 8 files changed, 81 insertions(+), 93 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87dbe481..11e95235a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/arcade - ad9890056979bc704773746d927dfdfa5bec7227 + 7421b55f46aff8373764016d942b23cbf87c75cb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 18a9b2510..6658d273c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21562.1 + 6.0.0-beta.21609.4 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c68..a16e18b17 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -188,9 +188,6 @@ function InitializeCustomToolset { function Build { - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5..b1bca63ab 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2b55a567f..069098b0a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages @@ -64,6 +65,8 @@ jobs: ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 444842899..f1e1cb539 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -301,31 +298,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } - } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed + } else { + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break + } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -882,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef7..e555c3426 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them - local runtimeSourceFeedKey='' + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) + + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) + fi + fi + + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break 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 - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code - fi - } + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -399,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index e6d26905e..86e408bbe 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.21562.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21562.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21609.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21609.4" } } From 0ce201ed68d1fa0b397531084d12ccf6bc82b91f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:04:25 +0000 Subject: [PATCH 16/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12841) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 11e95235a..e96c241f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - e025965a8e463030d890739043b6e64b41a5de84 + 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe From 6dc017e0d982deaed7fa4bdf3ba749eaa3aa207a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 14 Dec 2021 14:32:13 -0800 Subject: [PATCH 17/20] Update asp.net template versions (#12765) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6658d273c..4f5399580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.12 + 5.0.13 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.21 + 3.1.22 3.2.1 4.8.0-rc2.19462.10 From 360e2cff8664aff90e6f070b6a456d1898421887 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 23:51:54 +0000 Subject: [PATCH 18/20] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12844) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- 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 e96c241f3..44ae65f6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7421b55f46aff8373764016d942b23cbf87c75cb - + https://github.com/dotnet/source-build-reference-packages - 9c7c56c0107adf3b5daecdd6ebb9fa6b043008fe + 371b3c7cb21a14ca703a6c6b966c4ce83d6902a2 From 3841d37fd7a815749c1b40e77c1c46dac56d2419 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 15 Dec 2021 22:41:31 -0800 Subject: [PATCH 19/20] Removed the annotation --- .../eng/common/templates/job/source-build-run-tarball-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 78be18466..a5487fd5e 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -39,7 +39,6 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: Fedora33-Offline: _BuildArch: x64 From 3623697db02f34023fd41e1b06dde2f9049138f1 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 16 Dec 2021 18:50:12 -0800 Subject: [PATCH 20/20] Remove changes to file source-build-run-tarball-build.yml --- .../templates/job/source-build-run-tarball-build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index a5487fd5e..afe11415a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -39,11 +39,10 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _RunOnline: true - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Fedora33-Offline: - _BuildArch: x64 - _Container: ${{ parameters.fedora33Container }} - _RunOnline: false + Fedora33-Offline: + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false timeoutInMinutes: 240 workspace: clean: all