From 67fd8666c0d4f5ae2f8be94cffabb2746bfc9129 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 22:38:04 +0000
Subject: [PATCH 1/3] Dependency coherency updates (#12253)
[release/6.0.1xx] Update dependencies to ensure coherency
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bca46e7a2..b517171b1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,7 +19,7 @@
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
From 46fa4c306e37f233c3244bf84897856980e64f98 Mon Sep 17 00:00:00 2001
From: Jacques Eloff
Date: Tue, 5 Oct 2021 15:50:59 -0700
Subject: [PATCH 2/3] Update WiX to 3.14.0.5722 (#12252)
---
eng/Versions.props | 2 +-
src/redist/targets/GenerateMSIs.targets | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index da5f0d109..66a4c5de0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -105,7 +105,7 @@
$(MicrosoftNETCoreAppRuntimePackageVersion)
- 1.0.0-v3.14.0.4118
+ 1.0.0-v3.14.0.5722
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 7ea8792fb..e0e948128 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -13,7 +13,7 @@
- 1.0.0-v3.14.0.4118
+ $(WixPackageVersion)
https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip
$(ArtifactsDir)Tools/WixTools/$(WixVersion)
$(WixRoot)/WixTools.$(WixVersion).zip
From 343ff37cc5458bd84528ea0e4563fbb248106a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Patalas?=
Date: Wed, 6 Oct 2021 15:09:23 +0200
Subject: [PATCH 3/3] [release/6.0.1xx] Migrate to 1ES hosted pools (#12054)