From 72d9d53dc85e5c5ab66c5e3abb5f4b108e6197c3 Mon Sep 17 00:00:00 2001
From: James Seden Smith <sedders123@users.noreply.github.com>
Date: Mon, 24 Sep 2018 16:55:37 +0100
Subject: [PATCH 1/5] Switch project import for ncrunch

Changed to Python 37
---
 src/runtime/Python.Runtime.15.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
index cfde0a127..671290046 100644
--- a/src/runtime/Python.Runtime.15.csproj
+++ b/src/runtime/Python.Runtime.15.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
@@ -35,7 +35,7 @@
     <Python2Version>$(PYTHONNET_PY2_VERSION)</Python2Version>
     <Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version>
     <Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version>
-    <Python3Version Condition="'$(Python3Version)'==''">PYTHON36</Python3Version>
+    <Python3Version Condition="'$(Python3Version)'==''">PYTHON37</Python3Version>
     <PythonWinDefineConstants>$(PYTHONNET_WIN_DEFINE_CONSTANTS)</PythonWinDefineConstants>
     <PythonWinDefineConstants Condition="'$(PythonWinDefineConstants)'==''">UCS2</PythonWinDefineConstants>
     <PythonMonoDefineConstants>$(PYTHONNET_MONO_DEFINE_CONSTANTS)</PythonMonoDefineConstants>

From 8f6299fcb98912ff808cde66a4c62e4f91d63dcb Mon Sep 17 00:00:00 2001
From: James Seden Smith <sedders123@users.noreply.github.com>
Date: Mon, 24 Sep 2018 16:57:23 +0100
Subject: [PATCH 2/5] Python37 changes

---
 src/runtime/interop36.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runtime/interop36.cs b/src/runtime/interop36.cs
index c46bcc2f5..dde97bf3a 100644
--- a/src/runtime/interop36.cs
+++ b/src/runtime/interop36.cs
@@ -2,7 +2,7 @@
 // DO NOT MODIFIY BY HAND.
 
 
-#if PYTHON36
+#if PYTHON36 || PYTHON37
 using System;
 using System.Collections;
 using System.Collections.Specialized;

From 2311005c29e43a9a09acfc99570b62bd389d42d1 Mon Sep 17 00:00:00 2001
From: James Seden Smith <james@river.red>
Date: Tue, 25 Sep 2018 15:32:42 +0100
Subject: [PATCH 3/5] Added Ncrunch files

---
 src/runtime/Python.Runtime.15.net40.v3.ncrunchproject        | 5 +++++
 .../Python.Runtime.15.netstandard2.0.v3.ncrunchproject       | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 src/runtime/Python.Runtime.15.net40.v3.ncrunchproject
 create mode 100644 src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject

diff --git a/src/runtime/Python.Runtime.15.net40.v3.ncrunchproject b/src/runtime/Python.Runtime.15.net40.v3.ncrunchproject
new file mode 100644
index 000000000..319cd523c
--- /dev/null
+++ b/src/runtime/Python.Runtime.15.net40.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject b/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject
new file mode 100644
index 000000000..674a948d9
--- /dev/null
+++ b/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <UseBuildConfiguration>DebugWinPY3</UseBuildConfiguration>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file

From 2375e981962c5db212e7870f31c79f942f96851c Mon Sep 17 00:00:00 2001
From: Kieren Johnstone <kierenj@gmail.com>
Date: Thu, 27 Sep 2018 09:20:02 +0100
Subject: [PATCH 4/5] ignored tests, removed 4.5 targetting pack

---
 src/runtime/Python.Runtime.15.csproj                          | 4 ----
 .../Python.Runtime.15.netstandard2.0.v3.ncrunchproject        | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
index 671290046..e20c6502e 100644
--- a/src/runtime/Python.Runtime.15.csproj
+++ b/src/runtime/Python.Runtime.15.csproj
@@ -118,10 +118,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net40'">
-    <PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
-  </ItemGroup>
-
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
diff --git a/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject b/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject
index 674a948d9..a4de8f987 100644
--- a/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject
+++ b/src/runtime/Python.Runtime.15.netstandard2.0.v3.ncrunchproject
@@ -1,5 +1,8 @@
 <ProjectConfiguration>
   <Settings>
+    <IgnoredTests>
+      <AllTestsSelector />
+    </IgnoredTests>
     <UseBuildConfiguration>DebugWinPY3</UseBuildConfiguration>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file

From f9d8a402d5ac038e89fa80d718b1ac08032994fd Mon Sep 17 00:00:00 2001
From: James Seden Smith <sedders123@users.noreply.github.com>
Date: Mon, 8 Oct 2018 10:27:47 +0100
Subject: [PATCH 5/5] Remove duplicate .NET includes

---
 src/runtime/Python.Runtime.15.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
index e20c6502e..a18640a54 100644
--- a/src/runtime/Python.Runtime.15.csproj
+++ b/src/runtime/Python.Runtime.15.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <Platforms>AnyCPU</Platforms>
@@ -61,6 +60,9 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug'">
+    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants>
   </PropertyGroup>
@@ -118,8 +120,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
   <PropertyGroup>
     <TargetAssembly>$(TargetPath)</TargetAssembly>
     <TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>