dropped net40 target from modern projects

lostmsu · lostmsu · commit 909ed1f7a53e · 2021-01-28T10:42:51.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,8 @@ when .NET expects an integer [#1342][i1342]
 ### Removed
 
 -   implicit assembly loading (you have to explicitly `clr.AddReference` before doing import)
+-   support for .NET Framework 4.0-4.6; Mono before 5.4. Python.NET now requires .NET Standard 2.0
+(see [the matrix](https://docs.microsoft.com/en-us/dotnet/standard/net-standard#net-implementation-support))
 
 ## [2.5.0][] - 2020-06-14
 
diff --git a/src/console/pythonconsole.cs b/src/console/pythonconsole.cs
@@ -26,7 +26,7 @@ private PythonConsole()
         [STAThread]
         public static int Main(string[] args)
         {
-            // Only net40 is capable to safely inject python.runtime.dll into resources.
+            // Only .NET Framework is capable to safely inject python.runtime.dll into resources.
 #if NET40
             // reference the static assemblyLoader to stop it being optimized away
             AssemblyLoader a = assemblyLoader;
diff --git a/src/tests/tests.pyproj b/src/tests/tests.pyproj
@@ -14,14 +14,8 @@
     <InterpreterId />
     <InterpreterVersion />
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'DebugMono'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'DebugWin'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseMono'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseWin'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'DebugMonoPY3'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'DebugWinPY3'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseMonoPY3'" />
-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseWinPY3'" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
   <PropertyGroup>
     <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
     <PtvsTargetsFile>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ private PythonConsole()`
`26`	`26`	`[STAThread]`
`27`	`27`	`public static int Main(string[] args)`
`28`	`28`	`{`
`29`		`- // Only net40 is capable to safely inject python.runtime.dll into resources.`
	`29`	`+ // Only .NET Framework is capable to safely inject python.runtime.dll into resources.`
`30`	`30`	`#if NET40`
`31`	`31`	`// reference the static assemblyLoader to stop it being optimized away`
`32`	`32`	`AssemblyLoader a = assemblyLoader;`