From a4af71bceb33df85dd4fa12e4f82540eeda2a4c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6llner?= <christian.koellner.80@gmail.com>
Date: Wed, 11 Sep 2019 22:43:39 +0200
Subject: [PATCH] Build configuration fixes

---
 CapnpC.CSharp.Generator.Tests/capnpc-csharp.tests.csproj    | 4 ----
 .../Capnpc.Csharp.MsBuild.Generation.csproj                 | 2 +-
 .../Capnpc.Csharp.MsBuild.Generation.nuspec                 | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 CapnpC.CSharp.Generator.Tests/capnpc-csharp.tests.csproj

diff --git a/CapnpC.CSharp.Generator.Tests/capnpc-csharp.tests.csproj b/CapnpC.CSharp.Generator.Tests/capnpc-csharp.tests.csproj
deleted file mode 100644
index 88a5509..0000000
--- a/CapnpC.CSharp.Generator.Tests/capnpc-csharp.tests.csproj
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.csproj b/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.csproj
index bbb9e95..6c20fd2 100644
--- a/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.csproj
+++ b/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.csproj
@@ -14,7 +14,7 @@
     <Version>1.0.0</Version>
 
     <NuspecFile>$(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec</NuspecFile>
-    <NuspecProperties>version=$(Version)</NuspecProperties>
+    <NuspecProperties>version=$(Version);configuration=$(Configuration)</NuspecProperties>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
diff --git a/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.nuspec b/Capnpc.Csharp.MsBuild.Generation/Capnpc.Csharp.MsBuild.Generation.nuspec
index d5073c9..e048bb9 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\Release\net471\*.dll" target="tasks\net471" />
-    <file src="bin\Release\netcoreapp2.1\*.dll" target="tasks\netcoreapp2.1" />
-    <file src="bin\Release\netcoreapp2.1\*.deps.json" target="tasks\netcoreapp2.1" />
+    <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="..\Licenses\**\*" target="licenses" />
     <file src="..\LICENSE" target="LICENSE" />