From 57fc25f5bf81dcc5edbf1b1e7c331dde8fe4578f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 24 Jun 2020 16:18:36 +1000
Subject: Merge the native nupkg into the Mba.Core nupkg.

Manually author the repository element in the nupkg for SourceLink.
---
 appveyor.cmd                                       |  1 -
 src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj |  2 +-
 src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | 24 ++++++++++++++-------
 src/mbanative/mbanative.vcxproj                    |  5 -----
 .../runtime.win.WixToolset.Mba.Core.nuspec         | 25 ----------------------
 5 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec

diff --git a/appveyor.cmd b/appveyor.cmd
index 0ccdecc6..34f8beb0 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -22,7 +22,6 @@ dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.M
 msbuild -t:Pack -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b
 msbuild -t:Pack -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b
 msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
-msbuild -t:Pack -p:Configuration=%_C% src\mbanative\mbanative.vcxproj || exit /b
 
 @popd
 @endlocal
\ No newline at end of file
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 6c5f0050..5ffd617a 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -61,7 +61,7 @@
   <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
     <PropertyGroup>
       <NuspecBasePath>$(OutputPath)</NuspecBasePath>
-      <NuspecProperties>Configuration=$(Configuration);Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
+      <NuspecProperties>Id=$(MSBuildThisFileName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties>
     </PropertyGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index 95d229b6..3a9f05df 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -1,25 +1,33 @@
 <?xml version="1.0"?>
-<package >
-  <metadata>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
-    <authors>WiX Toolset Team</authors>
-    <owners>WiX Toolset Team</owners>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
     <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
-
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <group>
-        <dependency id="runtime.win.WixToolset.Mba.Core" version="$version$" />
-      </group>
+      <group targetFramework=".NETFramework2.0" />
+      <group targetFramework=".NETStandard2.0" />
     </dependencies>
   </metadata>
 
   <files>
     <file src="net20\$id$.dll" target="lib\net20" />
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
+
+    <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
+    <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
+    <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
+    <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
+    <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
+    <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
+    <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
+    <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
   </files>
 </package>
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 737075e8..ef1616c3 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -50,7 +50,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>mbanative</TargetName>
     <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
-    <Description>Native component of WixToolset.Mba.Core</Description>
     <EnableSourceLink Condition=" '$(PlatformToolset)'=='v140' ">false</EnableSourceLink>
   </PropertyGroup>
 
@@ -91,10 +90,6 @@
     <ProjectReference Include="..\balutil\balutil.vcxproj" />
   </ItemGroup>
 
-  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack runtime.win.WixToolset.Mba.Core.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Mba.Core;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
-  </Target>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
deleted file mode 100644
index c95531da..00000000
--- a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>WiX Toolset Team</authors>
-    <owners>WiX Toolset Team</owners>
-    <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-
-  <files>
-    <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
-    <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
-    <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
-    <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
-    <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
-    <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
-    <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
-    <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
-  </files>
-</package>
-- 
cgit v1.2.3-55-g6feb