Skip to content

Commit dca0737

Browse files
dmitriysedmitriyse
committed
Projects sets and build configurations reorganized. (Configuration section works bad with VS 2015).
1 parent 8a70f09 commit dca0737

9 files changed

Lines changed: 52 additions & 71 deletions

File tree

‎pythonnet.CoreCLR.sln‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,55 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Python.Runtime", "src\Pytho
99
EndProject
1010
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "embed_tests", "src\embed_tests\embed_tests.xproj", "{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}"
1111
EndProject
12-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Python.Runtime.Contracts", "src\Python.Runtime.Contracts\Python.Runtime.Contracts.xproj", "{3A75B887-30F2-4F42-B384-47F8D1E1DB65}"
13-
EndProject
1412
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Python.Net", "src\Python.Net\Python.Net.xproj", "{F4E01C59-8951-451F-86F5-EF61CAAA786F}"
1513
EndProject
14+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Python.Runtime.Interop", "src\Python.Runtime.Interop\Python.Runtime.Interop.xproj", "{7395D369-8AEA-40F2-AD38-138B422FAD3B}"
15+
EndProject
16+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClrCoder", "..\ClrCoder\src\ClrCoder\ClrCoder.xproj", "{128376A9-B458-4CDC-97B8-394BF4C61226}"
17+
EndProject
1618
Global
1719
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1820
Debug|Any CPU = Debug|Any CPU
1921
Py35-UCS2-Win-Debug|Any CPU = Py35-UCS2-Win-Debug|Any CPU
2022
Release|Any CPU = Release|Any CPU
2123
EndGlobalSection
2224
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU
24-
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU
25+
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.Build.0 = Debug|Any CPU
2527
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU
2628
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU
2729
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Release|Any CPU.ActiveCfg = Release|Any CPU
2830
{5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU
30-
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU
31-
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU
32-
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU
31+
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
3335
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
3436
{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU
36-
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU
37+
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
3739
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
3840
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
3941
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
4042
{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{3A75B887-30F2-4F42-B384-47F8D1E1DB65}.Release|Any CPU.Build.0 = Release|Any CPU
4743
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4844
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4945
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
5046
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
5147
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Release|Any CPU.ActiveCfg = Release|Any CPU
5248
{F4E01C59-8951-451F-86F5-EF61CAAA786F}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{7395D369-8AEA-40F2-AD38-138B422FAD3B}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{128376A9-B458-4CDC-97B8-394BF4C61226}.Release|Any CPU.Build.0 = Release|Any CPU
5361
EndGlobalSection
5462
GlobalSection(SolutionProperties) = preSolution
5563
HideSolutionNode = FALSE

‎src/Python.Net/project.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"version": "2.2.0-*",
33

44
"dependencies": {
5-
"NETStandard.Library": "1.6.0",
6-
"Python.Runtime.Contracts": "2.2.0-*"
5+
"NETStandard.Library": "1.6.0"
76
},
87

98
"frameworks": {
@@ -12,10 +11,6 @@
1211
},
1312
"net46": {
1413

15-
}
16-
},
17-
"configurations": {
18-
"Py35-UCS2-Win-Debug": {
1914
}
2015
}
2116
}

‎src/Python.Runtime.Contracts/project.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Python.Runtime.Contracts/Properties/AssemblyInfo.cs renamed to src/Python.Runtime.Interop/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// associated with an assembly.
88
[assembly: AssemblyConfiguration("")]
99
[assembly: AssemblyCompany("")]
10-
[assembly: AssemblyProduct("Python.Contracts")]
10+
[assembly: AssemblyProduct("Python.Runtime.Interop")]
1111
[assembly: AssemblyTrademark("")]
1212

1313
// Setting ComVisible to false makes the types in this assembly not visible
@@ -16,4 +16,4 @@
1616
[assembly: ComVisible(false)]
1717

1818
// The following GUID is for the ID of the typelib if this project is exposed to COM
19-
[assembly: Guid("3a75b887-30f2-4f42-b384-47f8d1e1db65")]
19+
[assembly: Guid("f4e01c59-8951-451f-86f5-ef61caaa786f")]

src/Python.Runtime.Contracts/Python.Runtime.Contracts.xproj renamed to src/Python.Runtime.Interop/Python.Runtime.Interop.xproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
87
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
98
<PropertyGroup Label="Globals">
10-
<ProjectGuid>3a75b887-30f2-4f42-b384-47f8d1e1db65</ProjectGuid>
11-
<RootNamespace>Python.Contracts</RootNamespace>
9+
<ProjectGuid>7395d369-8aea-40f2-ad38-138b422fad3b</ProjectGuid>
10+
<RootNamespace>Python.Runtime.Interop</RootNamespace>
1211
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
1312
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1413
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1514
</PropertyGroup>
16-
1715
<PropertyGroup>
1816
<SchemaVersion>2.0</SchemaVersion>
1917
</PropertyGroup>
2018
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21-
</Project>
19+
</Project>

‎src/Python.Runtime.Interop/project.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"version": "2.2.0-*",
3+
4+
"dependencies": {
5+
"NETStandard.Library": "1.6.0",
6+
"JetBrains.Annotations": "10.1.4",
7+
"Python.Runtime": "2.2.0-*"
8+
},
9+
10+
"frameworks": {
11+
"netstandard1.5": {
12+
"imports": "dnxcore50",
13+
"dependencies": {
14+
"System.Dynamic.Runtime": "4.0.11"
15+
}
16+
},
17+
"net46": {
18+
19+
}
20+
}
21+
}

‎src/Python.Runtime/project.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"version": "2.2.0-*",
33

44
"buildOptions": {
5+
"define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35" ],
56
"compile": {
67
"exclude": [
78
"interop33.cs"
@@ -15,7 +16,6 @@
1516
"dependencies": {
1617
"NETStandard.Library": "1.6.0",
1718
"ReflectionBridge": "0.0.11",
18-
"Python.Runtime.Contracts": "2.2.0-*",
1919
"System.Collections.NonGeneric": "4.0.1",
2020
"System.Data.Common": "4.1.0",
2121
"System.Threading.Thread": "4.0.0",
@@ -34,12 +34,5 @@
3434
},
3535
"net46": {
3636
}
37-
},
38-
"configurations": {
39-
"Py35-UCS2-Win-Debug": {
40-
"buildOptions": {
41-
"define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35" ]
42-
}
43-
}
4437
}
4538
}

‎src/console/project.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,5 @@
2020
},
2121
"net46": {
2222
}
23-
},
24-
"configurations": {
25-
"Py35-UCS2-Win-Debug": {
26-
"buildOptions": {
27-
"define": [ "TRACE", "DEBUG" ]
28-
}
29-
}
3023
}
3124
}

‎src/embed_tests/project.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,5 @@
1919
},
2020
"net46": {
2121
}
22-
},
23-
"configurations": {
24-
"Py35-UCS2-Win-Debug": {
25-
"buildOptions": {
26-
"define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35" ]
27-
}
28-
}
2922
}
3023
}

0 commit comments

Comments
 (0)