From b9815e4d300e3993e9d3e325599c6995fc44d748 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 4 Feb 2017 12:03:37 -0700 Subject: [PATCH 1/4] Cleanup runtime config --- Python.Runtime.dll.config | 30 ++++++++++++++---------------- src/clrmodule/packages.config | 1 - 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Python.Runtime.dll.config b/Python.Runtime.dll.config index 228c1417a..8591f58fe 100644 --- a/Python.Runtime.dll.config +++ b/Python.Runtime.dll.config @@ -1,22 +1,20 @@ - - + - - - + + + + - - - + + + + + diff --git a/src/clrmodule/packages.config b/src/clrmodule/packages.config index 01dd53f14..2a95dc54d 100644 --- a/src/clrmodule/packages.config +++ b/src/clrmodule/packages.config @@ -1,5 +1,4 @@ - From 5844beeb2967a289983bad3de8e7288ae9587883 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 4 Feb 2017 12:10:27 -0700 Subject: [PATCH 2/4] Remove extra properties/Organize properties --- src/clrmodule/clrmodule.csproj | 30 ++++---------- src/console/Console.csproj | 37 ++++------------- src/console/app.config | 7 ---- src/embed_tests/Python.EmbeddingTest.csproj | 30 +++----------- src/runtime/Python.Runtime.csproj | 46 ++++----------------- src/testing/Python.Test.csproj | 29 +++---------- 6 files changed, 35 insertions(+), 144 deletions(-) delete mode 100644 src/console/app.config diff --git a/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj index c3d6ec7dc..aca9e46cf 100644 --- a/src/clrmodule/clrmodule.csproj +++ b/src/clrmodule/clrmodule.csproj @@ -1,23 +1,24 @@ - + Debug - x86 - 8.0.30703 - 2.0 + AnyCPU {86E834DE-1139-4511-96CC-69636A56E7AC} Library - clrmodule clrmodule + clrmodule + bin\clrmodule.xml + bin\ v4.0 - 512 + + 1591 ..\..\ $(SolutionDir) + true true - bin\ TRACE;DEBUG;PYTHON2 full x86 @@ -25,14 +26,12 @@ true - bin\ TRACE;DEBUG;PYTHON2 full x64 prompt - bin\ PYTHON2 true pdbonly @@ -40,7 +39,6 @@ prompt - bin\ PYTHON2 true pdbonly @@ -49,7 +47,6 @@ true - bin\ TRACE;DEBUG;PYTHON2 full x86 @@ -57,14 +54,12 @@ true - bin\ TRACE;DEBUG;PYTHON2 full x64 prompt - bin\ PYTHON2 true pdbonly @@ -72,7 +67,6 @@ prompt - bin\ PYTHON2 true pdbonly @@ -81,7 +75,6 @@ true - bin\ TRACE;DEBUG;PYTHON3 full x86 @@ -89,14 +82,12 @@ true - bin\ TRACE;DEBUG;PYTHON3 full x64 prompt - bin\ PYTHON3 true pdbonly @@ -104,7 +95,6 @@ prompt - bin\ PYTHON3 true pdbonly @@ -113,7 +103,6 @@ true - bin\ TRACE;DEBUG;PYTHON3 full x86 @@ -121,14 +110,12 @@ true - bin\ TRACE;DEBUG;PYTHON3 full x64 prompt - bin\ PYTHON3 true pdbonly @@ -136,7 +123,6 @@ prompt - bin\ PYTHON3 true pdbonly diff --git a/src/console/Console.csproj b/src/console/Console.csproj index ed591af21..fa6878246 100644 --- a/src/console/Console.csproj +++ b/src/console/Console.csproj @@ -5,19 +5,20 @@ AnyCPU {E29DCF0A-5114-4A98-B1DD-71264B6EA349} Exe - false nPython Python.Runtime - OnBuildSuccess - python-clear.ico - 10.0.0 - 2.0 + bin\nPython.xml + bin\ + v4.0 + + 1591 ..\..\ $(SolutionDir) + + python-clear.ico true - bin\ DEBUG;TRACE full x86 @@ -25,14 +26,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -41,7 +40,6 @@ prompt - bin\ true @@ -51,7 +49,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -59,14 +56,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -75,7 +70,6 @@ prompt - bin\ true @@ -85,7 +79,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -93,14 +86,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -109,7 +100,6 @@ prompt - bin\ true @@ -119,7 +109,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -127,14 +116,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -143,7 +130,6 @@ prompt - bin\ true @@ -156,9 +142,6 @@ - - 3.5 - @@ -170,9 +153,6 @@ Python.Runtime.dll - - - {097b4ac0-74e9-4c58-bcf8-c69746ec8271} @@ -180,9 +160,6 @@ - - - diff --git a/src/console/app.config b/src/console/app.config deleted file mode 100644 index e7368c65b..000000000 --- a/src/console/app.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj index c9586cf4a..a274177f8 100644 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -5,17 +5,20 @@ AnyCPU {4165C59D-2822-499F-A6DB-EACA4C331EB5} Library - false Python.EmbeddingTest Python.EmbeddingTest - OnBuildSuccess + bin\Python.EmbeddingTest.xml + bin\ + v4.0 + + 1591 ..\..\ $(SolutionDir) + true true - bin\ DEBUG;TRACE full x86 @@ -23,14 +26,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -39,7 +40,6 @@ prompt - bin\ true @@ -49,7 +49,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -57,14 +56,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -73,7 +70,6 @@ prompt - bin\ true @@ -83,7 +79,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -91,14 +86,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -107,7 +100,6 @@ prompt - bin\ true @@ -117,7 +109,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -125,14 +116,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -141,7 +130,6 @@ prompt - bin\ true @@ -154,9 +142,6 @@ ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - - 3.5 - @@ -179,9 +164,6 @@ - - - $(TargetPath) $(TargetDir)$(TargetName).pdb diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj index f630ab25d..9afa57f41 100644 --- a/src/runtime/Python.Runtime.csproj +++ b/src/runtime/Python.Runtime.csproj @@ -2,147 +2,122 @@ Debug - x86 + AnyCPU {097B4AC0-74E9-4C58-BCF8-C69746EC8271} Library - false Python.Runtime Python.Runtime + bin\Python.Runtime.xml + bin\ + v4.0 + + 1591 ..\..\ $(SolutionDir) + + true + true - bin\ PYTHON2;PYTHON27;UCS4 - true true pdbonly x86 - bin\ PYTHON2;PYTHON27;UCS4 - true true pdbonly x64 - bin\ PYTHON2;PYTHON27;UCS2 - true true pdbonly x86 - bin\ PYTHON2;PYTHON27;UCS2 - true true pdbonly x64 true - bin\ TRACE;DEBUG;PYTHON2;PYTHON27;UCS4 - true false full x86 true - bin\ TRACE;DEBUG;PYTHON2;PYTHON27;UCS4 - true false full x64 true - bin\ TRACE;DEBUG;PYTHON2;PYTHON27;UCS2 - true false full x86 true - bin\ TRACE;DEBUG;PYTHON2;PYTHON27;UCS2 - true false full x64 - bin\ PYTHON3;PYTHON36;UCS4 - true true pdbonly x86 - bin\ PYTHON3;PYTHON36;UCS4 - true true pdbonly x64 - bin\ PYTHON3;PYTHON36;UCS2 - true true pdbonly x86 - bin\ PYTHON3;PYTHON36;UCS2 - true true pdbonly x64 true - bin\ TRACE;DEBUG;PYTHON3;PYTHON36;UCS4 - true false full x86 true - bin\ TRACE;DEBUG;PYTHON3;PYTHON36;UCS4 - true false full x64 true - bin\ TRACE;DEBUG;PYTHON3;PYTHON36;UCS2 - true false full x86 true - bin\ TRACE;DEBUG;PYTHON3;PYTHON36;UCS2 - true false full x64 @@ -249,9 +224,6 @@ - - - $(TargetPath) $(TargetDir)$(TargetName).pdb diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj index 3201cd635..1aa04ab30 100644 --- a/src/testing/Python.Test.csproj +++ b/src/testing/Python.Test.csproj @@ -5,18 +5,20 @@ AnyCPU {6F401A34-273B-450F-9A4C-13550BE0767B} Library - false Python.Test Python.Test - OnBuildSuccess + bin\Python.Test.xml + bin\ v4.0 + 1591 ..\..\ $(SolutionDir) + + true true - bin\ DEBUG;TRACE full x86 @@ -24,14 +26,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -40,7 +40,6 @@ prompt - bin\ true @@ -50,7 +49,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -58,14 +56,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -74,7 +70,6 @@ prompt - bin\ true @@ -84,7 +79,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -92,14 +86,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -108,7 +100,6 @@ prompt - bin\ true @@ -118,7 +109,6 @@ true - bin\ DEBUG;TRACE full x86 @@ -126,14 +116,12 @@ true - bin\ DEBUG;TRACE full x64 prompt - bin\ true @@ -142,7 +130,6 @@ prompt - bin\ true @@ -175,9 +162,6 @@ - - 3.5 - @@ -186,9 +170,6 @@ - - - $(SolutionDir) $(TargetPath) From 15cd373341c4ae849602df57293b8d07f34c9908 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 4 Feb 2017 13:40:20 -0700 Subject: [PATCH 3/4] Refactor property conditions --- src/clrmodule/clrmodule.csproj | 90 ++++--------------- src/console/Console.csproj | 98 ++++----------------- src/embed_tests/Python.EmbeddingTest.csproj | 98 ++++----------------- src/runtime/Python.Runtime.csproj | 76 +++------------- src/testing/Python.Test.csproj | 98 ++++----------------- 5 files changed, 75 insertions(+), 385 deletions(-) diff --git a/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj index aca9e46cf..9a9cf22f5 100644 --- a/src/clrmodule/clrmodule.csproj +++ b/src/clrmodule/clrmodule.csproj @@ -17,116 +17,58 @@ true - - true - TRACE;DEBUG;PYTHON2 - full + x86 - prompt - - true - TRACE;DEBUG;PYTHON2 - full + x64 - prompt - - PYTHON2 - true - pdbonly - x86 + + true + PYTHON2;TRACE;DEBUG + full prompt - + PYTHON2 true pdbonly - x64 prompt - + true - TRACE;DEBUG;PYTHON2 + PYTHON2;TRACE;DEBUG full - x86 prompt - - true - TRACE;DEBUG;PYTHON2 - full - x64 - prompt - - + PYTHON2 true pdbonly - x86 - prompt - - - PYTHON2 - true - pdbonly - x64 prompt - + true - TRACE;DEBUG;PYTHON3 + PYTHON3;TRACE;DEBUG full - x86 prompt - - true - TRACE;DEBUG;PYTHON3 - full - x64 - prompt - - + PYTHON3 true pdbonly - x86 - prompt - - - PYTHON3 - true - pdbonly - x64 prompt - + true - TRACE;DEBUG;PYTHON3 + PYTHON3;TRACE;DEBUG full - x86 prompt - - true - TRACE;DEBUG;PYTHON3 - full - x64 - prompt - - + PYTHON3 true pdbonly - x86 - prompt - - - PYTHON3 - true - pdbonly - x64 prompt diff --git a/src/console/Console.csproj b/src/console/Console.csproj index fa6878246..16e541c5c 100644 --- a/src/console/Console.csproj +++ b/src/console/Console.csproj @@ -17,124 +17,58 @@ python-clear.ico - - true - DEBUG;TRACE - full + x86 - prompt - + + x64 + + true DEBUG;TRACE full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj index a274177f8..7b3f80989 100644 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -17,124 +17,58 @@ true - - true - DEBUG;TRACE - full + x86 - prompt - + + x64 + + true DEBUG;TRACE full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj index 9afa57f41..65a1ef527 100644 --- a/src/runtime/Python.Runtime.csproj +++ b/src/runtime/Python.Runtime.csproj @@ -18,109 +18,55 @@ true true - - PYTHON2;PYTHON27;UCS4 - true - pdbonly + x86 - - PYTHON2;PYTHON27;UCS4 - true - pdbonly + x64 - - PYTHON2;PYTHON27;UCS2 + + PYTHON2;PYTHON27;UCS4 true pdbonly - x86 - + PYTHON2;PYTHON27;UCS2 true pdbonly - x64 - + true TRACE;DEBUG;PYTHON2;PYTHON27;UCS4 false full - x86 - - true - TRACE;DEBUG;PYTHON2;PYTHON27;UCS4 - false - full - x64 - - - true - TRACE;DEBUG;PYTHON2;PYTHON27;UCS2 - false - full - x86 - - + true TRACE;DEBUG;PYTHON2;PYTHON27;UCS2 false full - x64 - - - PYTHON3;PYTHON36;UCS4 - true - pdbonly - x86 - + PYTHON3;PYTHON36;UCS4 true pdbonly - x64 - + PYTHON3;PYTHON36;UCS2 true pdbonly - x86 - - PYTHON3;PYTHON36;UCS2 - true - pdbonly - x64 - - + true TRACE;DEBUG;PYTHON3;PYTHON36;UCS4 false full - x86 - - true - TRACE;DEBUG;PYTHON3;PYTHON36;UCS4 - false - full - x64 - - - true - TRACE;DEBUG;PYTHON3;PYTHON36;UCS2 - false - full - x86 - - + true TRACE;DEBUG;PYTHON3;PYTHON36;UCS2 false full - x64 diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj index 1aa04ab30..0a5f94e8c 100644 --- a/src/testing/Python.Test.csproj +++ b/src/testing/Python.Test.csproj @@ -17,124 +17,58 @@ true - - true - DEBUG;TRACE - full + x86 - prompt - + + x64 + + true DEBUG;TRACE full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt - + true DEBUG;TRACE full - x86 - prompt - - - true - DEBUG;TRACE - full - x64 prompt - - - + + true pdbonly - x86 - prompt - - - - - true - pdbonly - x64 prompt From 24c61e6c9d96b154d1c3e45388ea0fd66b557e28 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 4 Feb 2017 14:09:18 -0700 Subject: [PATCH 4/4] Order Runtime.csproj configuration To make it easier to verify everything is setup correctly Simplified the Mono.Unix include condition --- src/clrmodule/clrmodule.csproj | 9 +---- src/console/Console.csproj | 9 +---- src/embed_tests/Python.EmbeddingTest.csproj | 9 +---- src/runtime/Python.Runtime.csproj | 44 ++++++++------------- src/testing/Python.Test.csproj | 9 +---- 5 files changed, 20 insertions(+), 60 deletions(-) diff --git a/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj index 9a9cf22f5..435630d0e 100644 --- a/src/clrmodule/clrmodule.csproj +++ b/src/clrmodule/clrmodule.csproj @@ -16,6 +16,7 @@ $(SolutionDir) true + prompt x86 @@ -27,49 +28,41 @@ true PYTHON2;TRACE;DEBUG full - prompt PYTHON2 true pdbonly - prompt true PYTHON2;TRACE;DEBUG full - prompt PYTHON2 true pdbonly - prompt true PYTHON3;TRACE;DEBUG full - prompt PYTHON3 true pdbonly - prompt true PYTHON3;TRACE;DEBUG full - prompt PYTHON3 true pdbonly - prompt diff --git a/src/console/Console.csproj b/src/console/Console.csproj index 16e541c5c..cdee6893b 100644 --- a/src/console/Console.csproj +++ b/src/console/Console.csproj @@ -16,6 +16,7 @@ $(SolutionDir) python-clear.ico + prompt x86 @@ -27,49 +28,41 @@ true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt $(PythonManifest) diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj index 7b3f80989..743c9dabe 100644 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -16,6 +16,7 @@ $(SolutionDir) true + prompt x86 @@ -27,49 +28,41 @@ true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj index 65a1ef527..977721708 100644 --- a/src/runtime/Python.Runtime.csproj +++ b/src/runtime/Python.Runtime.csproj @@ -29,25 +29,25 @@ true pdbonly - - PYTHON2;PYTHON27;UCS2 + + PYTHON3;PYTHON36;UCS4 true pdbonly true - TRACE;DEBUG;PYTHON2;PYTHON27;UCS4 + PYTHON2;PYTHON27;UCS4;TRACE;DEBUG false full - + true - TRACE;DEBUG;PYTHON2;PYTHON27;UCS2 + PYTHON3;PYTHON36;UCS4;TRACE;DEBUG false full - - PYTHON3;PYTHON36;UCS4 + + PYTHON2;PYTHON27;UCS2 true pdbonly @@ -56,36 +56,24 @@ true pdbonly - + true - TRACE;DEBUG;PYTHON3;PYTHON36;UCS4 + PYTHON2;PYTHON27;UCS2;TRACE;DEBUG false full true - TRACE;DEBUG;PYTHON3;PYTHON36;UCS2 + PYTHON3;PYTHON36;UCS2;TRACE;DEBUG false full - - - - - False - ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll - - - - - - - False - ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll - - - - + + + False + ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll + + diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj index 0a5f94e8c..5faca36b2 100644 --- a/src/testing/Python.Test.csproj +++ b/src/testing/Python.Test.csproj @@ -16,6 +16,7 @@ $(SolutionDir) true + prompt x86 @@ -27,49 +28,41 @@ true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt true DEBUG;TRACE full - prompt true pdbonly - prompt pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy