From 00eb63b1a04fd455699b3d0ae5039c4092cf3aa7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 9 May 2020 21:00:07 +1000
Subject: Set RuntimeIdentifier to win-x86 in most projects now that the
WixToolset.Core.Native package isn't providing wixnative.*.exe anymore.
---
src/ThmViewerPackage/ThmViewerPackage.wixproj | 2 +-
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 +
src/dotnet-wix/dotnet-wix.csproj | 1 +
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 1 +
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj | 3 ++-
src/wix/wix.csproj | 1 +
src/wixcop/WixCop.csproj | 1 +
7 files changed, 8 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj
index ec2400bd..a0351aca 100644
--- a/src/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -23,7 +23,7 @@
</ProjectReference>
</ItemGroup>
- <Import Project="$(OutputPath)\net461\wix.targets" />
+ <Import Project="$(OutputPath)\net461\win-x86\wix.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index b86b1f53..cfa0b1d8 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -8,6 +8,7 @@
<Title>WiX Toolset MSBuild Tasks</Title>
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/dotnet-wix/dotnet-wix.csproj b/src/dotnet-wix/dotnet-wix.csproj
index 08fa9530..a9c766a3 100644
--- a/src/dotnet-wix/dotnet-wix.csproj
+++ b/src/dotnet-wix/dotnet-wix.csproj
@@ -9,6 +9,7 @@
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)publish\dotnet-wix\</NuspecBasePath>
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 7573339f..b48f5477 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -6,6 +6,7 @@
<TargetFramework>net461</TargetFramework>
<IsPackable>false</IsPackable>
<DebugType>embedded</DebugType>
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
index c58b6091..787b8ca1 100644
--- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
@@ -3,9 +3,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp2.1</TargetFramework>
+ <TargetFramework>net461</TargetFramework>
<IsPackable>false</IsPackable>
<DebugType>embedded</DebugType>
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 4fd8c8ee..c74cf006 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -10,6 +10,7 @@
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- <PackAsTool>true</PackAsTool> -->
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/wixcop/WixCop.csproj b/src/wixcop/WixCop.csproj
index 0e6be055..7021d9d7 100644
--- a/src/wixcop/WixCop.csproj
+++ b/src/wixcop/WixCop.csproj
@@ -10,6 +10,7 @@
<DebugType>embedded</DebugType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- <PackAsTool>true</PackAsTool> -->
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
--
cgit v1.2.3-55-g6feb