Skip to content

Commit 2aca667

Browse files
slozierslozier
authored
Rename projects (#1882)
* Rename projects * Rename namespaces * Fix tests
1 parent 22d006e commit 2aca667

File tree

19 files changed

+43
-39
lines changed

19 files changed

+43
-39
lines changed

‎Build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</Target>
117117

118118
<Target Name="_CopyStdLib" DependsOnTargets="_MakeStageDir">
119-
<MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\StdLib.pyproj"
119+
<MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\IronPython.StdLib.pyproj"
120120
Properties="OutputPath=$(StageDir);StdLibDirName=$(StdLibDirName)"
121121
Targets="Stage" />
122122
</Target>

‎IronPython.sln

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "src\c
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "src\extensions\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole", "src\executables\IronPython.Console\IronPythonConsole.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console", "src\executables\IronPython.Console\IronPython.Console.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonTest", "tests\IronPython.Tests\IronPythonTest.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Tests", "tests\IronPython.Tests\IronPython.Tests.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow", "src\executables\IronPython.Window\IronPythonWindow.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window", "src\executables\IronPython.Window\IronPython.Window.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
@@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
4646
eng\Tasks.Targets = eng\Tasks.Targets
4747
EndProjectSection
4848
EndProject
49-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonCompiler", "src\executables\IronPython.Compiler\IronPythonCompiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Compiler", "src\executables\IronPython.Compiler\IronPython.Compiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
5050
EndProject
5151
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{AC38EFB1-820D-4E90-BF40-BEF3AC825542}"
5252
EndProject
@@ -68,9 +68,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917
6868
eng\package\nuget\IronPython.StdLib.nuspec = eng\package\nuget\IronPython.StdLib.nuspec
6969
EndProjectSection
7070
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole32", "src\executables\IronPython.Console32\IronPythonConsole32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32", "src\executables\IronPython.Console32\IronPython.Console32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "src\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
73+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Analyzer", "src\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
7474
EndProject
7575
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
7676
ProjectSection(SolutionItems) = preProject
@@ -103,7 +103,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0
103103
eng\package\msi\Version.wxi = eng\package\msi\Version.wxi
104104
EndProjectSection
105105
EndProject
106-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "src\executables\IronPython.Window32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
106+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\executables\IronPython.Window32\IronPython.Window32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
107107
EndProject
108108
Global
109109
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎make.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function Test([String] $target, [String] $configuration, [String[]] $frameworks,
182182
$runSettings = GenerateRunSettings $framework $platform $configuration $runIgnored
183183

184184
function createTask($filtername, $filter) {
185-
[Object[]] $args = @("$_BASEDIR/tests/IronPython.Tests/IronPythonTest.csproj", '-f', "$framework", '-o', "$_BASEDIR/bin/$configuration/$framework", '-c', "$configuration", '--no-build', '-v', 'n', '-l', "trx;LogFileName=$filtername-$framework-$configuration-result.trx", '-s', "$runSettings", "--filter=$filter");
185+
[Object[]] $args = @("$_BASEDIR/tests/IronPython.Tests/IronPython.Tests.csproj", '-f', "$framework", '-o', "$_BASEDIR/bin/$configuration/$framework", '-c', "$configuration", '--no-build', '-v', 'n', '-l', "trx;LogFileName=$filtername-$framework-$configuration-result.trx", '-s', "$runSettings", "--filter=$filter");
186186
Write-Host "Enqueue [$framework $filtername]:"
187187
Write-Host "dotnet test $args"
188188
Write-Host

‎src/core/IronPython.Modules/IronPython.Modules.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
29-
<ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
29+
<ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj">
3030
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3131
<OutputItemType>Analyzer</OutputItemType>
3232
</ProjectReference>

‎src/core/IronPython.StdLib/StdLib.pyproj renamed to ‎src/core/IronPython.StdLib/IronPython.StdLib.pyproj

File renamed without changes.

‎src/core/IronPython/IronPython.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</ItemGroup>
5959

6060
<ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
61-
<ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
61+
<ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj">
6262
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6363
<OutputItemType>Analyzer</OutputItemType>
6464
</ProjectReference>

‎src/executables/IronPython.Compiler/AssemblyResolver.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
using System;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
26
using System.Collections.Generic;
37
using System.IO;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
78

89
using IKVM.Reflection;
910

10-
namespace IronPythonCompiler {
11+
namespace IronPython.Compiler {
1112
internal class AssemblyResolver {
1213
private Universe _universe;
1314
private readonly List<string> _libpaths = new List<string>();

‎src/executables/IronPython.Compiler/Config.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
using System;
2-
using System.IO;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
36
using System.Collections.Generic;
4-
using System.Linq;
7+
using System.IO;
58
using System.Text;
6-
using System.Text.RegularExpressions;
7-
using IKVM.Reflection;
9+
810
using IKVM.Reflection.Emit;
9-
using System.Resources;
10-
using System.Reflection;
11+
1112
using Microsoft.Scripting.Runtime;
1213

13-
namespace IronPythonCompiler {
14+
namespace IronPython.Compiler {
1415
public class Config {
1516

1617
public Config() {

‎src/executables/IronPython.Compiler/ConsoleOps.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information.
54

6-
namespace IronPythonCompiler {
5+
using System;
6+
7+
namespace IronPython.Compiler {
78
public static class ConsoleOps {
89

910
public static void Error(string format, params object[] args) {

‎src/executables/IronPython.Compiler/IronPythonCompiler.csproj renamed to ‎src/executables/IronPython.Compiler/IronPython.Compiler.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<TargetFrameworks>net462</TargetFrameworks>
55
<OutputType>Exe</OutputType>
6-
<RootNamespace>IronPythonCompiler</RootNamespace>
6+
<RootNamespace>IronPython.Compiler</RootNamespace>
77
<AssemblyName>ipyc</AssemblyName>
8-
<StartupObject>IronPythonCompiler.Program</StartupObject>
8+
<StartupObject>IronPython.Compiler.Program</StartupObject>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
</PropertyGroup>
1111

‎src/executables/IronPython.Compiler/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using Type = IKVM.Reflection.Type;
2121

22-
namespace IronPythonCompiler {
22+
namespace IronPython.Compiler {
2323

2424
public class Program {
2525

‎src/executables/IronPython.Console/IronPythonConsole.csproj renamed to ‎src/executables/IronPython.Console/IronPython.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
6-
<RootNamespace>IronPythonConsole</RootNamespace>
6+
<RootNamespace>IronPython.Console</RootNamespace>
77
<AssemblyName>ipy</AssemblyName>
88
<ApplicationIcon>ipy.ico</ApplicationIcon>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/executables/IronPython.Console32/IronPythonConsole32.csproj renamed to ‎src/executables/IronPython.Console32/IronPython.Console32.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net462</TargetFrameworks>
55
<PlatformTarget>x86</PlatformTarget>
66
<OutputType>Exe</OutputType>
7-
<RootNamespace>IronPythonConsole</RootNamespace>
7+
<RootNamespace>IronPython.Console32</RootNamespace>
88
<AssemblyName>ipy32</AssemblyName>
99
<ApplicationIcon>..\IronPython.Console\ipy.ico</ApplicationIcon>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/executables/IronPython.Window/IronPythonWindow.csproj renamed to ‎src/executables/IronPython.Window/IronPython.Window.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>net462</TargetFrameworks>
55
<OutputType>WinExe</OutputType>
6-
<RootNamespace>IronPythonWindow</RootNamespace>
6+
<RootNamespace>IronPython.Window</RootNamespace>
77
<AssemblyName>ipyw</AssemblyName>
88
<ApplicationIcon>ipyw.ico</ApplicationIcon>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/executables/IronPython.Window32/IronPythonWindow32.csproj renamed to ‎src/executables/IronPython.Window32/IronPython.Window32.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net462</TargetFrameworks>
55
<PlatformTarget>x86</PlatformTarget>
66
<OutputType>WinExe</OutputType>
7-
<RootNamespace>IronPythonWindow</RootNamespace>
7+
<RootNamespace>IronPython.Window32</RootNamespace>
88
<AssemblyName>ipyw32</AssemblyName>
99
<ApplicationIcon>..\IronPython.Window\ipyw.ico</ApplicationIcon>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/roslyn/IronPython.Analyzer/IronPythonAnalyzer.csproj renamed to ‎src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj

File renamed without changes.

‎src/roslyn/IronPython.Analyzer/IronPythonAnalyzerAnalyzer.cs renamed to ‎src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
using Microsoft.CodeAnalysis.Diagnostics;
1414
using Microsoft.CodeAnalysis.Operations;
1515

16-
namespace IronPythonAnalyzer {
16+
namespace IronPython.Analyzer {
1717
[DiagnosticAnalyzer(LanguageNames.CSharp)]
18-
public class IronPythonAnalyzerAnalyzer : DiagnosticAnalyzer {
18+
public class IronPythonDiagnosticAnalyzer : DiagnosticAnalyzer {
1919
public const string DiagnosticId = "IronPythonAnalyzer";
2020

2121
#pragma warning disable RS2008 // Enable analyzer release tracking

‎tests/IronPython.Tests/IronPythonTest.csproj renamed to ‎tests/IronPython.Tests/IronPython.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
5+
<AssemblyName>IronPythonTest</AssemblyName>
56
<PreventStaging>true</PreventStaging>
67
</PropertyGroup>
78

‎tests/IronPython.Tests/Util/TestManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class TestManifest {
1313
private IniParser manifest;
1414

1515
public TestManifest(Type parent) {
16-
var file = parent.Assembly.GetManifestResourceStream($"IronPythonTest.Cases.{parent.Name}Manifest.ini");
16+
var file = parent.Assembly.GetManifestResourceStream($"IronPython.Tests.Cases.{parent.Name}Manifest.ini");
1717
this.manifest = new IniParser(file);
1818
}
1919

0 commit comments

Comments
 (0)