2 files changed, 30 insertions, 25 deletions

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index ca8797a9..d12d0da6 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -5,10 +5,20 @@
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
     <Description>Core Native</Description>
     <DebugType>embedded</DebugType>
-    <!-- <BeforePack>SetNuspecProperties</BeforePack> -->
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\wixnative\wixnative.vcxproj">
+      <PrivateAssets>All</PrivateAssets>
+      <Properties>Platform=Win32</Properties>
+    </ProjectReference>
+    <ProjectReference Include="..\wixnative\wixnative.vcxproj">
+      <PrivateAssets>All</PrivateAssets>
+      <Properties>Platform=x64</Properties>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="All" />
   </ItemGroup>
 
@@ -20,16 +30,16 @@
   <PropertyGroup>
     <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
     <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath>
+    <MergeModDirectory>$(MSBuildThisFileDirectory)..\wixnative\</MergeModDirectory>
   </PropertyGroup>
 
   <Target Name="BuildWixNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' ">
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
-    </MSBuild>
-    <MSBuild Projects="..\wixnative\wixnative.vcxproj" Properties="Platform=x64" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" />
-    </MSBuild>
-      
+    <ItemGroup>
+      <_NativeProjectOutput Include="$(MergeModDirectory)x64\mergemod.dll" />
+      <_NativeProjectOutput Include="$(OutputPath)..\x64\wixnative.exe" />
+      <_NativeProjectOutput Include="$(OutputPath)..\x64\wixnative.pdb" />
+    </ItemGroup>
+
     <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" />
 
     <ItemGroup>
@@ -60,8 +70,8 @@
 
   <Target Name="SetNuspecProperties" AfterTargets="CoreBuild">
     <PropertyGroup>
-      <NuspecBasePath>$(OutputPath)</NuspecBasePath>
-      <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
+      <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
+      <NuspecProperties>Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);MergeModDir=$(MergeModDirectory)</NuspecProperties>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 1ff5538b..e862b1ba 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -5,30 +5,25 @@
     <version>$version$</version>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
-    <!-- <license type="expression">MS-RL</license> -->
-    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
+    <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
-
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <dependency id="runtime.win.WixToolset.Core.Native" version="$version$" />
-<!--
-      <dependency id="runtime.win-x86.WixToolset.Core.Native" version="$version$" />
-      <dependency id="runtime.win-x64.WixToolset.Core.Native" version="$version$" />
--->
+      <group targetFramework=".NETStandard2.0" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="$id$.dll" target="lib\netstandard2.0" />
+    <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
 
-    <!--
-    <file src="..\Win32\wixnative.x86.exe" target="lib\netstandard2.0" />
-    <file src="..\Win32\wixnative.x86.pdb" target="lib\netstandard2.0" />
-    <file src="..\x64\wixnative.amd64.exe" target="lib\netstandard2.0" />
-    <file src="..\x64\wixnative.amd64.pdb" target="lib\netstandard2.0" />
-     -->
+    <file src="$mergemoddir$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="$mergemoddir$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>