From 055887842a12dd2a6303af0acf615ef173473ca9 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 Feb 2024 09:43:24 -0800 Subject: [PATCH 1/2] Update to latest WiX version (#18606) --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98b098d16..6acb430d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 483730f3a..3300b2e28 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,6 @@ - $(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 d3036c5d9900ad034d17531a5fa61a4678894c5b Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 14 Feb 2024 02:11:47 +0100 Subject: [PATCH 2/2] .NET Source-Build 6.0.127 February 2024 Updates (#18652) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6acb430d0..42863af1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.126 + 6.0.127 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d503a61b9..a478949a8 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126" + "dotnet": "6.0.127" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",