projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a628cce)
Use the dual signed wix version for workload msis (#59501)
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Thu, 23 Sep 2021 18:34:07 +0000 (11:34 -0700)
committerGitHub <noreply@github.com>
Thu, 23 Sep 2021 18:34:07 +0000 (11:34 -0700)
Co-authored-by: Larry Ewing <lewing@microsoft.com>
eng/Versions.props patch | blob | history
src/workloads/workloads.csproj patch | blob | history

diff --git a/eng/Versions.props b/eng/Versions.props
index 55b34e750e955b7231a7a76806fa17f2369b88dd..61ae73ae57b24088b064a1cde6acb1aedbd279bf 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -189,7 +189,7 @@
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
-    <WixPackageVersion>3.14.0-dotnet</WixPackageVersion>
+    <WixPackageVersion>1.0.0-v3.14.0.4118</WixPackageVersion>
     <MonoWorkloadManifestVersion>6.0.0-preview.5.21275.7</MonoWorkloadManifestVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index 92b25bf61fc46b67d868da9a8800ee3f57d0c2e4..a25e1d6b867be2f1ac3703ce102106b3f36acd90 100644 (file)
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -34,14 +34,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <WixToolsetPath>$(PkgWix)\tools</WixToolsetPath>
+    <WixToolsetPath>$(PkgMicrosoft_Signed_Wix)\tools</WixToolsetPath>
     <SwixPluginPath>$(PkgMicroBuild_Plugins_SwixBuild_Dotnet)</SwixPluginPath>
     <SwixBuildTargets>$(SwixPluginPath)\build\MicroBuild.Plugins.SwixBuild.targets</SwixBuildTargets>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" GeneratePathProperty="true" />
-    <PackageReference Include="WiX" Version="$(WixPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Signed.WiX" Version="$(WixPackageVersion)" GeneratePathProperty="true" />
     <PackageReference Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="$(SwixPackageVersion)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" GeneratePathProperty="True" />
   </ItemGroup>
Domain: Dotnet / Core;