Update test references and simplify BuildWixNative file gathering
Rob Mensching committed
Aug 10, 2018 at 23:30 UTC
bf2a6a42ec4fb3296a291e996903def23d9d5b31
2 files changed
+15
-20
src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+12
-17
@@ -1,4 +1,4 @@
1
-<Project Sdk="Microsoft.NET.Sdk">
1
+<Project Sdk="Microsoft.NET.Sdk">
2
3
<PropertyGroup>
4
<TargetFramework>netstandard2.0</TargetFramework>
@@ -9,32 +9,27 @@
9
</PropertyGroup>
10
11
<ItemGroup>
12
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
12
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
13
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
14
</ItemGroup>
15
16
- <Target Name="BuildWixNative"
17
- BeforeTargets="GetCopyToOutputDirectoryItems">
18
- <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" />
19
- <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" />
16
+ <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems">
17
+ <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
18
+ <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
19
+ </MSBuild>
20
+ <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
21
+ <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
22
+ </MSBuild>
23
24
<ItemGroup>
22
- <NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb">
23
- <TargetRelativeFolder>.\</TargetRelativeFolder>
24
- </NativeProjectOutput>
25
- <NativeProjectOutput Include="$(OutputPath)..\x64\*.exe;$(OutputPath)..\x64\*.pdb">
26
- <TargetRelativeFolder>.\</TargetRelativeFolder>
27
- </NativeProjectOutput>
28
-
29
- <AllItemsFullPathWithTargetPath Include="@(NativeProjectOutput->'%(FullPath)')">
25
+ <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')">
26
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31
- <TargetPath>%(TargetRelativeFolder)%(Filename)%(Extension)</TargetPath>
27
+ <TargetPath>%(Filename)%(Extension)</TargetPath>
28
</AllItemsFullPathWithTargetPath>
29
</ItemGroup>
30
</Target>
31
36
- <Target Name="SetNuspecProperties"
37
- AfterTargets="Build">
32
+ <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
33
<PropertyGroup>
34
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
35
<NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+3
-3
@@ -17,8 +17,8 @@
17
</ItemGroup>
18
19
<ItemGroup>
20
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0-preview-20180610-02" />
21
- <PackageReference Include="xunit" Version="2.3.1" />
22
- <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
20
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
21
+ <PackageReference Include="xunit" Version="2.4.0" />
22
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
23
</ItemGroup>
24
</Project>