Skip to content

Commit 717b16c

Browse files
LamparterLamparter
committed
Fix NuGet inconsistencies and modernize structure
1 parent fb3c09f commit 717b16c

794 files changed

Lines changed: 25 additions & 29 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎IronPython.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ VisualStudioVersion = 17.9.34714.143
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython", "Src\IronPython\IronPython.csproj", "{95289EA9-5778-489D-AB48-F81F2CE2DA32}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "Src\IronPython.Modules\IronPython.Modules.csproj", "{155CE436-1669-4A48-8095-410F2430237F}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "Src\Modules\IronPython.Modules.csproj", "{155CE436-1669-4A48-8095-410F2430237F}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "Src\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "Src\Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console", "Src\IronPythonConsole\IronPython.Console.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console", "Src\Console\IronPython.Console.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Tests", "Src\IronPythonTest\IronPython.Tests.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Tests", "Src\Tests\IronPython.Tests.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console.Host", "Src\IronPythonWindow\IronPython.Console.Host.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console.Host", "Src\Console.Host\IronPython.Console.Host.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A14D070-628F-44EF-92DD-47C8BE5C33CD}"
1919
ProjectSection(SolutionItems) = preProject
@@ -29,8 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2929
README.md = README.md
3030
EndProjectSection
3131
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.SQLite", "Src\IronPython.SQLite\IronPython.SQLite.csproj", "{4A617A40-2BA7-4713-AAFE-F90C4325C581}"
33-
EndProject
3432
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB-40C6-41A6-83DA-3203A4DCEC19}"
3533
ProjectSection(SolutionItems) = preProject
3634
Build\After.targets = Build\After.targets
@@ -47,7 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
4745
Build\Tasks.Targets = Build\Tasks.Targets
4846
EndProjectSection
4947
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.CompilerServices", "Src\IronPythonCompiler\IronPython.CompilerServices.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.CompilerServices", "Src\CompilerServices\IronPython.CompilerServices.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
5149
EndProject
5250
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{AC38EFB1-820D-4E90-BF40-BEF3AC825542}"
5351
EndProject
@@ -69,7 +67,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917
6967
Package\nuget\IronPython.StdLib.nuspec = Package\nuget\IronPython.StdLib.nuspec
7068
EndProjectSection
7169
EndProject
72-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32", "Src\IronPythonConsole32\IronPython.Console32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
70+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32", "Src\Console32\IronPython.Console32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
7371
EndProject
7472
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
7573
ProjectSection(SolutionItems) = preProject
@@ -102,10 +100,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0
102100
Package\msi\Version.wxi = Package\msi\Version.wxi
103101
EndProjectSection
104102
EndProject
105-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32.Host", "Src\IronPythonWindow32\IronPython.Console32.Host.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
103+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32.Host", "Src\Console32.Host\IronPython.Console32.Host.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
106104
EndProject
107105
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.DiagnosticAnalyzer", "DiagnosticAnalyzer\IronPython.DiagnosticAnalyzer.csproj", "{2DFE89D7-0C39-44E9-94CD-496CC985DFC3}"
108106
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.SQLite", "Src\SQLite\IronPython.SQLite.csproj", "{2F1071BF-891C-42A3-8A82-6B8A168BDE64}"
108+
EndProject
109109
Global
110110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
111111
Debug|Any CPU = Debug|Any CPU
@@ -136,10 +136,6 @@ Global
136136
{81DA19C7-4FEC-47E7-981B-D9310D549F95}.Debug|Any CPU.Build.0 = Debug|Any CPU
137137
{81DA19C7-4FEC-47E7-981B-D9310D549F95}.Release|Any CPU.ActiveCfg = Release|Any CPU
138138
{81DA19C7-4FEC-47E7-981B-D9310D549F95}.Release|Any CPU.Build.0 = Release|Any CPU
139-
{4A617A40-2BA7-4713-AAFE-F90C4325C581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
140-
{4A617A40-2BA7-4713-AAFE-F90C4325C581}.Debug|Any CPU.Build.0 = Debug|Any CPU
141-
{4A617A40-2BA7-4713-AAFE-F90C4325C581}.Release|Any CPU.ActiveCfg = Release|Any CPU
142-
{4A617A40-2BA7-4713-AAFE-F90C4325C581}.Release|Any CPU.Build.0 = Release|Any CPU
143139
{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
144140
{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
145141
{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -172,6 +168,10 @@ Global
172168
{2DFE89D7-0C39-44E9-94CD-496CC985DFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
173169
{2DFE89D7-0C39-44E9-94CD-496CC985DFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
174170
{2DFE89D7-0C39-44E9-94CD-496CC985DFC3}.Release|Any CPU.Build.0 = Release|Any CPU
171+
{2F1071BF-891C-42A3-8A82-6B8A168BDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172+
{2F1071BF-891C-42A3-8A82-6B8A168BDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
173+
{2F1071BF-891C-42A3-8A82-6B8A168BDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
174+
{2F1071BF-891C-42A3-8A82-6B8A168BDE64}.Release|Any CPU.Build.0 = Release|Any CPU
175175
EndGlobalSection
176176
GlobalSection(SolutionProperties) = preSolution
177177
HideSolutionNode = FALSE

‎NuGet.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<config>
4-
<add key="globalPackagesFolder" value="./packages" />
5-
</config>
63
<packageSources>
7-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
8-
<add key="nunit.myget.org" value="https://www.myget.org/F/nunit/api/v3/index.json" />
4+
<add key="MyGet Gallery" value="https://www.myget.org/F/nunit/api/v3/index.json" />
95
</packageSources>
106
</configuration>

Tests/IndicesTest.py renamed to PythonTests/IndicesTest.py

File renamed without changes.

Tests/Inputs/RemoteConsole.py renamed to PythonTests/Inputs/RemoteConsole.py

File renamed without changes.

Tests/Inputs/UseCLI.py renamed to PythonTests/Inputs/UseCLI.py

File renamed without changes.

Tests/Inputs/exit.py renamed to PythonTests/Inputs/exit.py

File renamed without changes.

Tests/Inputs/exitFuncRaises.py renamed to PythonTests/Inputs/exitFuncRaises.py

File renamed without changes.

Tests/Inputs/exitFuncRuns.py renamed to PythonTests/Inputs/exitFuncRuns.py

File renamed without changes.

Tests/Inputs/raise.py renamed to PythonTests/Inputs/raise.py

File renamed without changes.

Tests/Inputs/simpleCommand.py renamed to PythonTests/Inputs/simpleCommand.py

File renamed without changes.

0 commit comments

Comments
 (0)