1 files changed, 10 insertions, 15 deletions

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>