diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 14:23:51 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 20:36:35 +1000 |
| commit | c50a0e000ab1812ec4781ace349a5d84fa01c8e4 (patch) | |
| tree | 22b8dbdb29113876a4e4d81585db9a796c5e3e37 /src/test | |
| parent | d7bd6328ea9227f76b5337f703de9460a1738302 (diff) | |
| download | wix-c50a0e000ab1812ec4781ace349a5d84fa01c8e4.tar.gz wix-c50a0e000ab1812ec4781ace349a5d84fa01c8e4.tar.bz2 wix-c50a0e000ab1812ec4781ace349a5d84fa01c8e4.zip | |
Merge the native nupkg into the Core.Native nupkg.
There was no benefit in separating the native assets into its own package, the runtime.<rid>.PackageName strategy is for binaries to be copied to the root of project and therefore doesn't support the portable scenario where all available assets are required.
Manually author the repository element in the nupkg for SourceLink.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index 14928112..9c493d84 100644 --- a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj | |||
| @@ -3,8 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp2.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -21,7 +22,7 @@ | |||
| 21 | </ItemGroup> | 22 | </ItemGroup> |
| 22 | 23 | ||
| 23 | <ItemGroup> | 24 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> | 25 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> |
| 25 | <PackageReference Include="xunit" Version="2.4.1" /> | 26 | <PackageReference Include="xunit" Version="2.4.1" /> |
| 26 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 27 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> |
| 27 | </ItemGroup> | 28 | </ItemGroup> |