From b01c90111f48d235bca5714b42b6b5fbe16c733c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6llner?= <christian.koellner.80@gmail.com>
Date: Wed, 2 Oct 2019 15:53:47 +0200
Subject: [PATCH] Add MsBuildGenerationTest to CI

---
 .gitignore                                         | 2 +-
 MsBuildGenerationTest/MsBuildGenerationTest.csproj | 6 ++++--
 MsBuildGenerationTest/MsBuildGenerationTest.sln    | 5 ++++-
 appveyor.yml                                       | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f734c3..64fa334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -334,5 +334,5 @@ ASALocalRun/
 .vscode/launch.json
 
 # Capnp code behind
-.capnp.cs
+*.capnp.cs
 /globalPackages
diff --git a/MsBuildGenerationTest/MsBuildGenerationTest.csproj b/MsBuildGenerationTest/MsBuildGenerationTest.csproj
index 58cf166..93163eb 100644
--- a/MsBuildGenerationTest/MsBuildGenerationTest.csproj
+++ b/MsBuildGenerationTest/MsBuildGenerationTest.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
+    <Version>1.0-local</Version>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Capnp.Net.Runtime" Version="1.0-local*" />
-    <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.0-local*" />
+    <PackageReference Include="Capnp.Net.Runtime" Version="$(Version)*" />
+    <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="$(Version)*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MsBuildGenerationTest/MsBuildGenerationTest.sln b/MsBuildGenerationTest/MsBuildGenerationTest.sln
index bd2ebd1..0545a55 100644
--- a/MsBuildGenerationTest/MsBuildGenerationTest.sln
+++ b/MsBuildGenerationTest/MsBuildGenerationTest.sln
@@ -3,14 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsBuildGenerationTest", "MsBuildGenerationTest.csproj", "{D2CFBABF-7028-4761-9B24-6054008F41A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsBuildGenerationTest", "MsBuildGenerationTest.csproj", "{D2CFBABF-7028-4761-9B24-6054008F41A0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		AppVeyor|Any CPU = AppVeyor|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D2CFBABF-7028-4761-9B24-6054008F41A0}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
+		{D2CFBABF-7028-4761-9B24-6054008F41A0}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
 		{D2CFBABF-7028-4761-9B24-6054008F41A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2CFBABF-7028-4761-9B24-6054008F41A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2CFBABF-7028-4761-9B24-6054008F41A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/appveyor.yml b/appveyor.yml
index 82c87b2..d32786c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -74,6 +74,8 @@ test_script:
   - cmd: notinstalled-test
   - cmd: cd %APPVEYOR_BUILD_FOLDER%
   - cmd: vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.MsBuild.Generation.Tests\bin\Release\netcoreapp2.2\CapnpC.CSharp.MsBuild.Generation.Tests.dll
+  - cmd: dotnet restore ./MsBuildGenerationTest/MsBuildGenerationTest.csproj --verbosity m  
+  - cmd: msbuild ./MsBuildGenerationTest/MsBuildGenerationTest.sln /p:Configuration="Debug"
   - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Debug\netcoreapp2.2\Capnp.Net.Runtime.Tests.Std20.dll
   - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Release\netcoreapp2.2\Capnp.Net.Runtime.Tests.Std20.dll
   - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Debug\netcoreapp2.2\Capnp.Net.Runtime.Tests.Core21.dll