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.

2 files changed, 0 insertions, 37 deletions

diff --git a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec b/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
deleted file mode 100644
index a775b570..00000000
--- a/src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <!-- <license type="expression">MS-RL</license> -->
-    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
-    <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-
-  <files>
-    <file src="Win32\mergemod.dll" target="runtimes\win-x86\native" />
-    <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
-    <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
-    <file src="x64\mergemod.dll" target="runtimes\win-x64\native" />
-    <file src="x64\wixnative.exe" target="runtimes\win-x64\native" />
-    <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" />
-  </files>
-</package>
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index 5927c14c..e53af651 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -30,7 +30,6 @@
     <TargetName>wixnative</TargetName>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <Description>Native component of WixToolset.Core</Description>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -69,18 +68,6 @@
     <None Include="packages.config" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="$(Platform)\mergemod.dll">
-      <DeploymentContent>true</DeploymentContent>
-      <Link>%(Filename)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
-  </Target>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>