From 138b2d2f1090344fa219e0c53381568369d6ef16 Mon Sep 17 00:00:00 2001
From: Rolf Madsen <rolf_madsen@keysight.com>
Date: Wed, 5 Apr 2017 11:15:41 +0200
Subject: [PATCH 1/7] added unit test to demonstrate that CTRL+C does not work

---
 src/embed_tests/Python.EmbeddingTest.csproj |   1 +
 src/embed_tests/TestConsoleInterrupt.cs     | Bin 0 -> 8038 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 src/embed_tests/TestConsoleInterrupt.cs

diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
index 6aa48becc..da32f7f3d 100644
--- a/src/embed_tests/Python.EmbeddingTest.csproj
+++ b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -80,6 +80,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestConsoleInterrupt.cs" />
     <Compile Include="dynamic.cs" />
     <Compile Include="pyimport.cs" />
     <Compile Include="pyinitialize.cs" />
diff --git a/src/embed_tests/TestConsoleInterrupt.cs b/src/embed_tests/TestConsoleInterrupt.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d391388546b304c53388996c993541c24a50b4dc
GIT binary patch
literal 8038
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
YeC29ks*_ofd2aDtQ<W^?7=QEoFF*gB)&Kwi

literal 0
HcmV?d00001


From e911f8066d26169243b683d1c40ddb85fc7e51f4 Mon Sep 17 00:00:00 2001
From: Rolf Madsen <rolf_madsen@keysight.com>
Date: Wed, 5 Apr 2017 14:24:06 +0200
Subject: [PATCH 2/7] 64 bit support.

---
 src/embed_tests/TestConsoleInterrupt.cs | Bin 8038 -> 8406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/embed_tests/TestConsoleInterrupt.cs b/src/embed_tests/TestConsoleInterrupt.cs
index d391388546b304c53388996c993541c24a50b4dc..356350a708511f14d7121a6fda8f9ea06fd1fbb4 100644
GIT binary patch
delta 136
zcmaE6cg=A_3YT^!LmGnug9d{qLmop3LjVvLG3YS_Gh{MUF{A=zY=KaL!Gb}Pfp@YZ
zyEJn(kS^p?p8SAIZgLZs4W}7{34;=YHCR@b5v+zYl_7_r7^oYY4i~T*{mB8`YMcLY
HWrzR(t&|<9

delta 24
gcmccS_{?rY3fJTdTv3w+csM4Pa9V86<H-;K0Dhtf$p8QV


From f7c61ea39ee95e79c846bd3c405399ac728ec50b Mon Sep 17 00:00:00 2001
From: Rolf Madsen <rolf_madsen@keysight.com>
Date: Thu, 6 Apr 2017 13:48:27 +0200
Subject: [PATCH 3/7] Fixed unittest to better test for success. Fixed kill
 support.

---
 src/embed_tests/TestConsoleInterrupt.cs | Bin 8406 -> 8872 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/embed_tests/TestConsoleInterrupt.cs b/src/embed_tests/TestConsoleInterrupt.cs
index 356350a708511f14d7121a6fda8f9ea06fd1fbb4..0b96e9c76bf1650a0bf8467f7dd4ca2ea2bb88eb 100644
GIT binary patch
delta 835
zcmbVLyGjF55S>7DLs-#7gA!uASwRvE>j#LSXbM3vXvD@QChLPd$xB5<u(z7VQadXV
z@&mRuVr8R^jra>%dFCcT6RqU3_c@O<XU;w?Tqkb*hA&0?R3L{+RHqtQWN{=o!AZm9
zdDGKO8t-nlj9{igX{wN-EX-w{!<T|v6;6wAE@E})5VMVQ9X1u5<+k^=<F%wCIh27-
z3D!sK8y@95bBc?m#mUeJzl6M_;$5I^*cK5l+Rh*6b8~{NV3;4h;pUt9+2_jftN+85
zYd#OxJv`(#`E0y#s^}OvH-OTib=t$6$4CID<duS*b}c)oFR$(5xLLz}tI`&}by%i>
zAgfu((yI0?>$$~64HeXNv=fS9co9YMy)nR-zBq@*{9Nu|X<meHT!9XiLS2W-GGC1c
zrvFZ0YdC2nPl1eth7r|WQhlD&1%Q_FDu`y&GWMx9lqmL+K^oF(P+HSi1&tPMqLh8S
z3$eR63+P#Zp21L*gkK5w6<8H;mPjIi8g_~fwC5gnmj72En_mYf{|&2Gjxi*e(`x(f
z&`+S{9-yMRELFF<QG%0hl`BX}+Ap<;1ga2+`~i75D}->Up*dCHz|nR!EguoJ%@Jdk
HAC%_{%f6|-

delta 243
zcmZ4Cdd+cz5IegILq0<uL+WOEc6rvxRtgf6xa21P;8B_!#49sdNJs|A-MotT7b~Op
z<fXzt8ND~p7b)eK+`z^s?#bZKpvU0Gkjaq4kP2iu0}U!*sGNM0*Pl^mvN*4zs5?-+
z1g^r5A(0`MAr&Ye$f?7i0F)_WD4l#!T5_@iE5~F37M{rpvSrMg44RVzh3qFkkPzCO
zAoq*WS)W0l!I7aD2vdO?N`MwQ0_ju+SB64{QlODJ3>pk33?Kswfa3WK$v`=fYCWKe
T3ZUak7@Q|R<Wrs8prio+;5Iu5


From 745daafe7160cec987f26f0cfb87d64ea0bb4540 Mon Sep 17 00:00:00 2001
From: Rolf Madsen <rolf_madsen@keysight.com>
Date: Thu, 6 Apr 2017 13:57:06 +0200
Subject: [PATCH 4/7] Added appveyor testresult artifacts

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index ce345cbf8..b960c6ace 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -75,6 +75,9 @@ on_finish:
 
 artifacts:
   - path: dist\*
+  - path: TestResult.xml
+    name: TestResult
+    type: xml
 
 notifications:
   - provider: Slack

From 1e1598d3e5c46dd0c83ecc2bdf6272c6f12e0d89 Mon Sep 17 00:00:00 2001
From: Benedikt Reinartz <filmor@gmail.com>
Date: Mon, 29 Oct 2018 13:56:43 +0100
Subject: [PATCH 5/7] Fix errors and remove warnings

---
 src/embed_tests/TestConsoleInterrupt.cs | Bin 8872 -> 4334 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/embed_tests/TestConsoleInterrupt.cs b/src/embed_tests/TestConsoleInterrupt.cs
index 0b96e9c76bf1650a0bf8467f7dd4ca2ea2bb88eb..ebc85dd9d72d8fd22e2647eb73f6ec0463223c2f 100644
GIT binary patch
literal 4334
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
Hv+4W`^Tq6-

literal 8872
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


From 2162917d73b7c1d66d56ca69638cffbaafd917ec Mon Sep 17 00:00:00 2001
From: Benedikt Reinartz <filmor@gmail.com>
Date: Tue, 13 Nov 2018 13:21:37 +0100
Subject: [PATCH 6/7] Revert changes to solution file

---
 pythonnet.sln | 71 ++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/pythonnet.sln b/pythonnet.sln
index d446d81d3..c5afd66c3 100644
--- a/pythonnet.sln
+++ b/pythonnet.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2046
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}"
 EndProject
@@ -32,38 +32,38 @@ Global
 		ReleaseWinPY3|x86 = ReleaseWinPY3|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.ActiveCfg = DebugMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.Build.0 = DebugMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.ActiveCfg = DebugMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.Build.0 = DebugMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x64.ActiveCfg = DebugMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x64.Build.0 = DebugMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x86.ActiveCfg = DebugMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x86.Build.0 = DebugMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.Build.0 = DebugWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.Build.0 = DebugWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x64.ActiveCfg = DebugWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x64.Build.0 = DebugWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x86.ActiveCfg = DebugWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x86.Build.0 = DebugWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.ActiveCfg = ReleaseMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.Build.0 = ReleaseMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.ActiveCfg = ReleaseMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.Build.0 = ReleaseMono|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x64.ActiveCfg = ReleaseMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x64.Build.0 = ReleaseMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x86.ActiveCfg = ReleaseMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x86.Build.0 = ReleaseMonoPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x64.ActiveCfg = ReleaseWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x64.Build.0 = ReleaseWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x86.ActiveCfg = ReleaseWinPY3|Any CPU
-		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x86.Build.0 = ReleaseWinPY3|Any CPU
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.ActiveCfg = DebugMono|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.Build.0 = DebugMono|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.ActiveCfg = DebugMono|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.Build.0 = DebugMono|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x64.ActiveCfg = DebugMonoPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x64.Build.0 = DebugMonoPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x86.ActiveCfg = DebugMonoPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMonoPY3|x86.Build.0 = DebugMonoPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.ActiveCfg = DebugWin|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.Build.0 = DebugWin|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.ActiveCfg = DebugWin|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.Build.0 = DebugWin|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x64.ActiveCfg = DebugWinPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x64.Build.0 = DebugWinPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x86.ActiveCfg = DebugWinPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWinPY3|x86.Build.0 = DebugWinPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.Build.0 = ReleaseMono|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.Build.0 = ReleaseMono|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x64.ActiveCfg = ReleaseMonoPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x64.Build.0 = ReleaseMonoPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x86.ActiveCfg = ReleaseMonoPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMonoPY3|x86.Build.0 = ReleaseMonoPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x64.ActiveCfg = ReleaseWinPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x64.Build.0 = ReleaseWinPY3|x64
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x86.ActiveCfg = ReleaseWinPY3|x86
+		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWinPY3|x86.Build.0 = ReleaseWinPY3|x86
 		{6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.ActiveCfg = DebugMono|x64
 		{6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.Build.0 = DebugMono|x64
 		{6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x86.ActiveCfg = DebugMono|x86
@@ -188,9 +188,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {10AE1870-1175-445A-B23A-C83497EAAE4B}
-	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = src\console\Console.csproj
 		Policies = $0

From 3d6024d05dcbf52e717c0c39f3cca79bac09ca45 Mon Sep 17 00:00:00 2001
From: Benedikt Reinartz <filmor@gmail.com>
Date: Wed, 14 Nov 2018 11:38:27 +0100
Subject: [PATCH 7/7] Add missing System.CodeDom dependency for .NET core

---
 src/embed_tests/Python.EmbeddingTest.15.csproj | 6 +++++-
 src/embed_tests/TestConsoleInterrupt.cs        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/embed_tests/Python.EmbeddingTest.15.csproj b/src/embed_tests/Python.EmbeddingTest.15.csproj
index a741a589e..b212cf461 100644
--- a/src/embed_tests/Python.EmbeddingTest.15.csproj
+++ b/src/embed_tests/Python.EmbeddingTest.15.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
@@ -82,8 +82,12 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <PackageReference Include="NUnitLite" Version="3.7.2" />
   </ItemGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="System.CodeDom">
+      <Version>4.5.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
diff --git a/src/embed_tests/TestConsoleInterrupt.cs b/src/embed_tests/TestConsoleInterrupt.cs
index ebc85dd9d..a6e8b4d58 100644
--- a/src/embed_tests/TestConsoleInterrupt.cs
+++ b/src/embed_tests/TestConsoleInterrupt.cs
@@ -14,7 +14,7 @@ namespace Python.EmbeddingTest
     /// </summary>
     public class TestConsoleInterrupt
     {
-        static string program = @"
+        static readonly string program = @"
         using System;
         using Python.Runtime;
         using System.Text;