From 48d3b8d6b344a7abfd1db1d2fa3328d154c51846 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 9 Aug 2017 12:34:08 -0500
Subject: [PATCH] [windows] general fixes for building on Windows

- .gitignore the .vs/ directory for VS 2017
- One project was using a different version of NUnit than the rest,
caused NUnit runner to crash on Windows
- One project was missing `TargetFrameworkVersion`, which causes a build
failure on Windows
---
 .gitignore                                                      | 1 +
 .../Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj   | 2 +-
 .../Test/packages.config                                        | 2 +-
 .../Xamarin.Android.Tools.AnnotationSupport.csproj              | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a407aea60..7f14aa779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ TestResult.xml
 TestResult-*.xml
 xa-gendarme.html
 packages
+.vs/
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
index b8ad38001..4d585ce8e 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
@@ -32,7 +32,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config b/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config
index c714ef3a2..ad37a5282 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj b/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj
index aff6ec547..a19579a65 100644
--- a/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj
+++ b/src/Xamarin.Android.Tools.AnnotationSupport/Xamarin.Android.Tools.AnnotationSupport.csproj
@@ -9,6 +9,7 @@
     <AssemblyName>Xamarin.Android.Tools.AnnotationSupport</AssemblyName>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>