From 0497ebb63fe52a853cfaf093458d6be1ef19e331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6llner?= <christian.koellner.80@gmail.com>
Date: Thu, 2 Jan 2020 23:34:19 +0100
Subject: [PATCH] nbgv-related fixes

---
 .../CapnpC.CSharp.MsBuild.Generation.csproj   |  3 +--
 .../CapnpC.CSharp.MsBuild.Generation.nuspec   |  6 ++---
 Directory.Build.targets                       | 23 +++++++++++++++++++
 version.json                                  |  3 ++-
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 Directory.Build.targets

diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj
index 44f3dec..92c5f3c 100644
--- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj
+++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj
@@ -9,9 +9,8 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    
+
     <NuspecFile>$(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec</NuspecFile>
-    <NuspecProperties>version=$(Version);configuration=$(Configuration)</NuspecProperties>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageOutputPath>..\bin\$(Configuration)</PackageOutputPath>
     <Configurations>Debug;Release</Configurations>
diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec
index e048bb9..e3ad91d 100644
--- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec
+++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec
@@ -21,9 +21,9 @@
   <files>
     <file src="build\**\*" target="build" />
     <file src="buildMultiTargeting\**\*" target="buildMultiTargeting" />
-    <file src="bin\$configuration$\net471\*.dll" target="tasks\net471" />
-    <file src="bin\$configuration$\netcoreapp2.1\*.dll" target="tasks\netcoreapp2.1" />
-    <file src="bin\$configuration$\netcoreapp2.1\*.deps.json" target="tasks\netcoreapp2.1" />
+    <file src="bin\$config$\net471\*.dll" target="tasks\net471" />
+    <file src="bin\$config$\netcoreapp2.1\*.dll" target="tasks\netcoreapp2.1" />
+    <file src="bin\$config$\netcoreapp2.1\*.deps.json" target="tasks\netcoreapp2.1" />
     
     <file src="..\Licenses\**\*" target="licenses" />
     <file src="..\LICENSE" target="LICENSE" />
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000..20033a9
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,23 @@
+<Project>
+  <Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
+    <PropertyGroup>
+      <NuspecProperties>$(NuspecProperties);config=$(Configuration)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);version=$(NuGetPackageVersion)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);SolutionDir=$(SolutionDir)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="CleanupNupkgs" BeforeTargets="Build" >
+    <ItemGroup>
+      <Nupkgs2Delete Include="$(PackageOutputAbsolutePath)\*.nupkg"/>
+    </ItemGroup>
+    <Delete Files="@(Nupkgs2Delete)" />
+  </Target>
+
+  <Target Name="CopyNupkgToFolder" AfterTargets="Pack">
+    <ItemGroup>
+      <GeneratedNupkgs Include="$(PackageOutputAbsolutePath)\*.nupkg"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(GeneratedNupkgs)" DestinationFolder="$(SolutionDir)GeneratedNuGetPackages\$(Configuration)" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/version.json b/version.json
index d7759d4..b47b6b2 100644
--- a/version.json
+++ b/version.json
@@ -7,7 +7,8 @@
   ],
   "cloudBuild": {
     "buildNumber": {
-      "enabled": true
+      "enabled": true,
+      "setVersionVariables": true
     }
   }
 }
\ No newline at end of file