From 1d7e6c74c7c5cdce2532932cf58d22c924d5b2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:02:29 -0600 Subject: [PATCH 1/2] Revert "[release/6.0][workloads] Use Wix version from arcade Sdk" --- eng/Versions.props | 1 + src/workloads/workloads.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e852cccec193f3..e8b0850dee7f79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,6 +182,7 @@ $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda + 1.0.0-v3.14.0.5722 6.0.0-preview.5.21275.7 diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index 20ff5c7d077f94..9b31d5cfeea941 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -41,7 +41,7 @@ - + From 96b418f83153e993e4915892282170d6baaf4856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:08:24 -0600 Subject: [PATCH 2/2] Set WixPackageVersion to 3.14.0-8606.20240208.1 directly --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e8b0850dee7f79..a710defe37cc90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda - 1.0.0-v3.14.0.5722 + 3.14.0-8606.20240208.1 6.0.0-preview.5.21275.7