@joebigelow / wix / commits / 00eb63b1

Set RuntimeIdentifier to win-x86 in most projects now that the WixToolset.Core.Native package isn't providing wixnative.*.exe anymore.

Set RuntimeIdentifier to win-x86 in most projects now that the WixToolset.Core.Native package isn't providing wixnative.*.exe anymore.

Sean Hall committed May 9, 2020 at 21:00 UTC 00eb63b1a04fd455699b3d0ae5039c4092cf3aa7
7 files changed +8 -2
src/ThmViewerPackage/ThmViewerPackage.wixproj
+1 -1
@@ -23,7 +23,7 @@
23 </ProjectReference>
24 </ItemGroup>
25
26 - <Import Project="$(OutputPath)\net461\wix.targets" />
26 + <Import Project="$(OutputPath)\net461\win-x86\wix.targets" />
27
28 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
29 <PropertyGroup>
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+1
@@ -8,6 +8,7 @@
8 <Title>WiX Toolset MSBuild Tasks</Title>
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
12 </PropertyGroup>
13
14 <PropertyGroup>
src/dotnet-wix/dotnet-wix.csproj
+1
@@ -9,6 +9,7 @@
9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
10 <NuspecBasePath>$(OutputPath)publish\dotnet-wix\</NuspecBasePath>
11 <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
12 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
13 </PropertyGroup>
14
15 <ItemGroup>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1
@@ -6,6 +6,7 @@
6 <TargetFramework>net461</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
10 </PropertyGroup>
11
12 <ItemGroup>
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+2 -1
@@ -3,9 +3,10 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp2.1</TargetFramework>
6 + <TargetFramework>net461</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
10 </PropertyGroup>
11
12 <PropertyGroup>
src/wix/wix.csproj
+1
@@ -10,6 +10,7 @@
10 <DebugType>embedded</DebugType>
11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 <!-- <PackAsTool>true</PackAsTool> -->
13 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
14 </PropertyGroup>
15
16 <PropertyGroup>
src/wixcop/WixCop.csproj
+1
@@ -10,6 +10,7 @@
10 <DebugType>embedded</DebugType>
11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 <!-- <PackAsTool>true</PackAsTool> -->
13 + <RuntimeIdentifier>win-x86</RuntimeIdentifier>
14 </PropertyGroup>
15
16 <PropertyGroup>