From bf2a6a42ec4fb3296a291e996903def23d9d5b31 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 10 Aug 2018 23:30:15 -0700
Subject: Update test references and simplify BuildWixNative file gathering

---
 .../WixToolset.Core.Native.csproj                  | 29 +++++++++-------------
 .../WixToolsetTest.Core.Native.csproj              |  6 ++---
 2 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index a95f8852..b02c00ad 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -9,32 +9,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
   </ItemGroup>
 
-  <Target Name="BuildWixNative"
-          BeforeTargets="GetCopyToOutputDirectoryItems">
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" />
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" />
+  <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems">
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
+      <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
+    </MSBuild>
+    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
+      <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
+    </MSBuild>
 
     <ItemGroup>
-      <NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb">
-        <TargetRelativeFolder>.\</TargetRelativeFolder>
-      </NativeProjectOutput>
-      <NativeProjectOutput Include="$(OutputPath)..\x64\*.exe;$(OutputPath)..\x64\*.pdb">
-        <TargetRelativeFolder>.\</TargetRelativeFolder>
-      </NativeProjectOutput>
-
-      <AllItemsFullPathWithTargetPath Include="@(NativeProjectOutput->'%(FullPath)')">
+      <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <TargetPath>%(TargetRelativeFolder)%(Filename)%(Extension)</TargetPath>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
       </AllItemsFullPathWithTargetPath>
     </ItemGroup>
   </Target>
 
-  <Target Name="SetNuspecProperties"
-          AfterTargets="Build">
+  <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
     <PropertyGroup>
       <NuspecBasePath>$(OutputPath)</NuspecBasePath>
       <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
diff --git a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
index d6cdead2..4e02073e 100644
--- a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+++ b/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0-preview-20180610-02" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb