Rename projects

Build.proj

@@ -116,7 +116,7 @@
   </Target>
 
   <Target Name="_CopyStdLib" DependsOnTargets="_MakeStageDir">
-    <MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\StdLib.pyproj"
+    <MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\IronPython.StdLib.pyproj"
              Properties="OutputPath=$(StageDir);StdLibDirName=$(StdLibDirName)"
              Targets="Stage" />
   </Target>

IronPython.sln

@@ -9,11 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "src\c
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "src\extensions\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole", "src\executables\IronPython.Console\IronPythonConsole.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console", "src\executables\IronPython.Console\IronPython.Console.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonTest", "tests\IronPython.Tests\IronPythonTest.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Tests", "tests\IronPython.Tests\IronPython.Tests.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow", "src\executables\IronPython.Window\IronPythonWindow.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window", "src\executables\IronPython.Window\IronPython.Window.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A14D070-628F-44EF-92DD-47C8BE5C33CD}"
 	ProjectSection(SolutionItems) = preProject
@@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
 		eng\Tasks.Targets = eng\Tasks.Targets
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonCompiler", "src\executables\IronPython.Compiler\IronPythonCompiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Compiler", "src\executables\IronPython.Compiler\IronPython.Compiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{AC38EFB1-820D-4E90-BF40-BEF3AC825542}"
 EndProject
@@ -68,9 +68,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917
 		eng\package\nuget\IronPython.StdLib.nuspec = eng\package\nuget\IronPython.StdLib.nuspec
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonConsole32", "src\executables\IronPython.Console32\IronPythonConsole32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32", "src\executables\IronPython.Console32\IronPython.Console32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonAnalyzer", "src\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Analyzer", "src\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
 	ProjectSection(SolutionItems) = preProject
@@ -103,7 +103,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0
 		eng\package\msi\Version.wxi = eng\package\msi\Version.wxi
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "src\executables\IronPython.Window32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\executables\IronPython.Window32\IronPython.Window32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

make.ps1

@@ -182,7 +182,7 @@ function Test([String] $target, [String] $configuration, [String[]] $frameworks,
         $runSettings = GenerateRunSettings $framework $platform $configuration $runIgnored
 
         function createTask($filtername, $filter) {
-            [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");
+            [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");
             Write-Host "Enqueue [$framework $filtername]:"
             Write-Host "dotnet test $args"
             Write-Host

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

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
-    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
+    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>

src/core/IronPython/IronPython.csproj

@@ -58,7 +58,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">
-    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPythonAnalyzer.csproj">
+    <ProjectReference Include="..\..\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>

src/executables/IronPython.Compiler/AssemblyResolver.cs

@@ -1,13 +1,14 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using IKVM.Reflection;
 
-namespace IronPythonCompiler {
+namespace IronPython.Compiler {
     internal class AssemblyResolver {
         private Universe _universe;
         private readonly List<string> _libpaths = new List<string>();

src/executables/IronPython.Compiler/Config.cs

@@ -1,16 +1,17 @@
-using System;
-using System.IO;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
-using IKVM.Reflection;
+
 using IKVM.Reflection.Emit;
-using System.Resources;
-using System.Reflection;
+
 using Microsoft.Scripting.Runtime;
 
-namespace IronPythonCompiler {
+namespace IronPython.Compiler {
     public class Config {
 
         public Config() {

src/executables/IronPython.Compiler/ConsoleOps.cs

@@ -1,9 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
-namespace IronPythonCompiler {
+using System;
+
+namespace IronPython.Compiler {
     public static class ConsoleOps {
 
         public static void Error(string format, params object[] args) {

src/executables/IronPython.Compiler/IronPythonCompiler.csproj → src/executables/IronPython.Compiler/IronPython.Compiler.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFrameworks>net462</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <RootNamespace>IronPythonCompiler</RootNamespace>
+    <RootNamespace>IronPython.Compiler</RootNamespace>
     <AssemblyName>ipyc</AssemblyName>
-    <StartupObject>IronPythonCompiler.Program</StartupObject>
+    <StartupObject>IronPython.Compiler.Program</StartupObject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

src/executables/IronPython.Compiler/Program.cs

@@ -19,7 +19,7 @@
 
 using Type = IKVM.Reflection.Type;
 
-namespace IronPythonCompiler {
+namespace IronPython.Compiler {
 
     public class Program {
 

src/executables/IronPython.Console/IronPythonConsole.csproj → src/executables/IronPython.Console/IronPython.Console.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <RootNamespace>IronPythonConsole</RootNamespace>
+    <RootNamespace>IronPython.Console</RootNamespace>
     <AssemblyName>ipy</AssemblyName>
     <ApplicationIcon>ipy.ico</ApplicationIcon>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/executables/IronPython.Console32/IronPythonConsole32.csproj → src/executables/IronPython.Console32/IronPython.Console32.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net462</TargetFrameworks>
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
-    <RootNamespace>IronPythonConsole</RootNamespace>
+    <RootNamespace>IronPython.Console32</RootNamespace>
     <AssemblyName>ipy32</AssemblyName>
     <ApplicationIcon>..\IronPython.Console\ipy.ico</ApplicationIcon>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/executables/IronPython.Window/IronPythonWindow.csproj → src/executables/IronPython.Window/IronPython.Window.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net462</TargetFrameworks>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>IronPythonWindow</RootNamespace>
+    <RootNamespace>IronPython.Window</RootNamespace>
     <AssemblyName>ipyw</AssemblyName>
     <ApplicationIcon>ipyw.ico</ApplicationIcon>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/executables/IronPython.Window32/IronPythonWindow32.csproj → src/executables/IronPython.Window32/IronPython.Window32.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net462</TargetFrameworks>
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>IronPythonWindow</RootNamespace>
+    <RootNamespace>IronPython.Window32</RootNamespace>
     <AssemblyName>ipyw32</AssemblyName>
     <ApplicationIcon>..\IronPython.Window\ipyw.ico</ApplicationIcon>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/roslyn/IronPython.Analyzer/IronPythonAnalyzerAnalyzer.cs → src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs

@@ -13,9 +13,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace IronPythonAnalyzer {
+namespace IronPython.Analyzer {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class IronPythonAnalyzerAnalyzer : DiagnosticAnalyzer {
+    public class IronPythonDiagnosticAnalyzer : DiagnosticAnalyzer {
         public const string DiagnosticId = "IronPythonAnalyzer";
 
 #pragma warning disable RS2008 // Enable analyzer release tracking

tests/IronPython.Tests/IronPythonTest.csproj → tests/IronPython.Tests/IronPython.Tests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <AssemblyName>IronPythonTest</AssemblyName>
     <PreventStaging>true</PreventStaging>
   </PropertyGroup>
 

tests/IronPython.Tests/Util/TestManifest.cs

@@ -13,7 +13,7 @@ public class TestManifest {
         private IniParser manifest;
 
         public TestManifest(Type parent) {
-            var file = parent.Assembly.GetManifestResourceStream($"IronPythonTest.Cases.{parent.Name}Manifest.ini");
+            var file = parent.Assembly.GetManifestResourceStream($"IronPython.Tests.Cases.{parent.Name}Manifest.ini");
             this.manifest = new IniParser(file);
         }