diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-08-10 23:30:15 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-08-10 23:30:15 -0700 |
| commit | bf2a6a42ec4fb3296a291e996903def23d9d5b31 (patch) | |
| tree | fd74787ec77072facdee4f31ef0f14b871ff47db | |
| parent | 2db44de83b23f8363490e3a94e2d3a31b96fcd0e (diff) | |
| download | wix-bf2a6a42ec4fb3296a291e996903def23d9d5b31.tar.gz wix-bf2a6a42ec4fb3296a291e996903def23d9d5b31.tar.bz2 wix-bf2a6a42ec4fb3296a291e996903def23d9d5b31.zip | |
Update test references and simplify BuildWixNative file gathering
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 29 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj | 6 |
2 files changed, 15 insertions, 20 deletions
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 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
| 2 | 2 | ||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <TargetFramework>netstandard2.0</TargetFramework> | 4 | <TargetFramework>netstandard2.0</TargetFramework> |
| @@ -9,32 +9,27 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 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" /> | 13 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | 15 | ||
| 16 | <Target Name="BuildWixNative" | 16 | <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems"> |
| 17 | BeforeTargets="GetCopyToOutputDirectoryItems"> | 17 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup"> |
| 18 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" /> | 18 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> |
| 19 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" /> | 19 | </MSBuild> |
| 20 | <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | ||
| 21 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | ||
| 22 | </MSBuild> | ||
| 20 | 23 | ||
| 21 | <ItemGroup> | 24 | <ItemGroup> |
| 22 | <NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb"> | 25 | <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')"> |
| 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)')"> | ||
| 30 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | 26 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
| 31 | <TargetPath>%(TargetRelativeFolder)%(Filename)%(Extension)</TargetPath> | 27 | <TargetPath>%(Filename)%(Extension)</TargetPath> |
| 32 | </AllItemsFullPathWithTargetPath> | 28 | </AllItemsFullPathWithTargetPath> |
| 33 | </ItemGroup> | 29 | </ItemGroup> |
| 34 | </Target> | 30 | </Target> |
| 35 | 31 | ||
| 36 | <Target Name="SetNuspecProperties" | 32 | <Target Name="SetNuspecProperties" AfterTargets="CoreBuild"> |
| 37 | AfterTargets="Build"> | ||
| 38 | <PropertyGroup> | 33 | <PropertyGroup> |
| 39 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | 34 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> |
| 40 | <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties> | 35 | <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 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0-preview-20180610-02" /> | 20 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> |
| 21 | <PackageReference Include="xunit" Version="2.3.1" /> | 21 | <PackageReference Include="xunit" Version="2.4.0" /> |
| 22 | <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | 22 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |