From e3a96ef1c7318eb79d67ca7386aa8cbc460ee094 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 19:33:05 +0000 Subject: [PATCH] [release/6.0.1xx] Update dependencies from dotnet/arcade (#12349) [release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Resolve conflicts in source-build patches - Resolve conflicts in source-build patches --- eng/Version.Details.xml | 16 +- eng/Versions.props | 2 +- global.json | 4 +- ...loads-WiX-dependency-in-source-build.patch | 124 -------------- .../0001-Update-TFMs-to-net6.0.patch | 156 ------------------ ...-dotnet-arcade-issues-7778-Ignore-cu.patch | 26 --- 6 files changed, 11 insertions(+), 317 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch delete mode 100644 src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c669799f..d7cef7244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,28 +197,28 @@ - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 - + https://github.com/dotnet/arcade - e58cb829bf6d9c340b4a0c100956e2995d792aa2 + 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0 https://github.com/dotnet/source-build-reference-packages 83a56ff632506f3d41fae37165136c8c59e697a9 - + https://github.com/dotnet/sourcelink - 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 + 8031e5220baf2acad991e661d8308b783d2acf3e diff --git a/eng/Versions.props b/eng/Versions.props index b3038b5df..bf2fb55ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.21507.1 + 6.0.0-beta.21513.3 diff --git a/global.json b/global.json index 57ecd2983..d6b36eb70 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.21507.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21507.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21513.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21513.3" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch deleted file mode 100644 index 188312413..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 8 Oct 2021 16:15:42 -0700 -Subject: [PATCH] Disable Workloads WiX dependency in source-build - -This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 - -The patch is temporary, pending upstream fix and dependency flow. ---- - .../src/{FileRow.cs => FileRow.wix.cs} | 0 - ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 - .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 - ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 - ...erateVisualStudioMsiPackageProject.wix.cs} | 0 - ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 - ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 - ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- - ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 - .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 - ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 - 11 files changed, 20 insertions(+), 3 deletions(-) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index 19cf67b5..2d02b7f4 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -11,6 +11,16 @@ - $(NoWarn);NU5127 - false - Microsoft.DotNet.Build.Tasks.Workloads -+ -+ -+ true - - - -@@ -19,13 +29,16 @@ - - - -- - -- -+ - - - -- -+ -+ -+ -+ -+ - - - -@@ -48,6 +61,10 @@ - - - -+ -+ -+ -+ - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch deleted file mode 100644 index 9cc7b6bf9..000000000 --- a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch +++ /dev/null @@ -1,156 +0,0 @@ -From aba2e21af6d299f0e5c04c7848e4971e0da0e5b5 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 20 Jul 2021 21:01:43 +0000 -Subject: [PATCH] Update TFMs to net6.0 - -When building from source, only the current TFM is built. Update -TargetFrameworks to only have net6.0. ---- - eng/Versions.props | 1 + - src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj | 1 + - .../Microsoft.SourceLink.AzureDevOpsServer.Git.csproj | 1 + - .../Microsoft.SourceLink.AzureRepos.Git.csproj | 1 + - .../Microsoft.SourceLink.Bitbucket.Git.csproj | 1 + - src/SourceLink.Common/Microsoft.SourceLink.Common.csproj | 1 + - src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj | 1 + - src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj | 1 + - src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj | 1 + - src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj | 1 + - src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj | 1 + - 11 files changed, 11 insertions(+) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 4ea51a8..eff58cf 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -7,6 +7,7 @@ - true - - true -+ false - true - 2.4.1 - 16.7.0 -diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -index 3fa8c71..da0277b 100644 ---- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -+++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -index ceec252..84e89bd 100644 ---- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -+++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -index bdb048e..b01b429 100644 ---- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -+++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -index bf27b3f..11ac33d 100644 ---- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -+++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -index 09ac8ec..534b316 100644 ---- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -+++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -index 626b9cc..0c025ca 100644 ---- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -+++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -index 4a1d0af..ada8986 100644 ---- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -+++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -index 19f92a8..b9ec7b4 100644 ---- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -index fa9e33e..acca3af 100644 ---- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -+++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj -@@ -3,6 +3,7 @@ - - - net472;net6.0 -+ net6.0 - true - - -diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -index 5d17262..3dd091a 100644 ---- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -+++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj -@@ -3,6 +3,7 @@ - - - net6.0;netstandard2.0 -+ net6.0 - false - none - false --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch b/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch deleted file mode 100644 index 8dffe11a5..000000000 --- a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001 -From: Matt Galbraith -Date: Mon, 23 Aug 2021 08:52:35 -0700 -Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl - failures for no-network build scenario - ---- - eng/common/tools.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 3c5f3a12..41e32310 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -402,7 +402,7 @@ function StopProcesses { - 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: ' -+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi - } - --- -2.30.2 -