diff --git a/Build.proj b/Build.proj index c41df0925..929b39f17 100644 --- a/Build.proj +++ b/Build.proj @@ -116,7 +116,7 @@ - diff --git a/IronPython.sln b/IronPython.sln index f7d5719c9..6a760c366 100644 --- a/IronPython.sln +++ b/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 diff --git a/make.ps1 b/make.ps1 index 0733bdc67..5044de40c 100755 --- a/make.ps1 +++ b/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 diff --git a/src/core/IronPython.Modules/IronPython.Modules.csproj b/src/core/IronPython.Modules/IronPython.Modules.csproj index b551be3f7..1f6f3c1a8 100644 --- a/src/core/IronPython.Modules/IronPython.Modules.csproj +++ b/src/core/IronPython.Modules/IronPython.Modules.csproj @@ -26,7 +26,7 @@ - + false Analyzer diff --git a/src/core/IronPython.StdLib/StdLib.pyproj b/src/core/IronPython.StdLib/IronPython.StdLib.pyproj similarity index 100% rename from src/core/IronPython.StdLib/StdLib.pyproj rename to src/core/IronPython.StdLib/IronPython.StdLib.pyproj diff --git a/src/core/IronPython/IronPython.csproj b/src/core/IronPython/IronPython.csproj index c5db5c198..8f0689fa8 100644 --- a/src/core/IronPython/IronPython.csproj +++ b/src/core/IronPython/IronPython.csproj @@ -58,7 +58,7 @@ - + false Analyzer diff --git a/src/executables/IronPython.Compiler/AssemblyResolver.cs b/src/executables/IronPython.Compiler/AssemblyResolver.cs index 57f388c8f..00d53eb66 100644 --- a/src/executables/IronPython.Compiler/AssemblyResolver.cs +++ b/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 _libpaths = new List(); diff --git a/src/executables/IronPython.Compiler/Config.cs b/src/executables/IronPython.Compiler/Config.cs index 72e0d6747..59600f799 100644 --- a/src/executables/IronPython.Compiler/Config.cs +++ b/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() { diff --git a/src/executables/IronPython.Compiler/ConsoleOps.cs b/src/executables/IronPython.Compiler/ConsoleOps.cs index 93f1b7cf9..eea8940e4 100644 --- a/src/executables/IronPython.Compiler/ConsoleOps.cs +++ b/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) { diff --git a/src/executables/IronPython.Compiler/IronPythonCompiler.csproj b/src/executables/IronPython.Compiler/IronPython.Compiler.csproj similarity index 88% rename from src/executables/IronPython.Compiler/IronPythonCompiler.csproj rename to src/executables/IronPython.Compiler/IronPython.Compiler.csproj index a08d98243..1452938e1 100644 --- a/src/executables/IronPython.Compiler/IronPythonCompiler.csproj +++ b/src/executables/IronPython.Compiler/IronPython.Compiler.csproj @@ -3,9 +3,9 @@ net462 Exe - IronPythonCompiler + IronPython.Compiler ipyc - IronPythonCompiler.Program + IronPython.Compiler.Program true diff --git a/src/executables/IronPython.Compiler/Program.cs b/src/executables/IronPython.Compiler/Program.cs index 115b8f502..2caf6684e 100644 --- a/src/executables/IronPython.Compiler/Program.cs +++ b/src/executables/IronPython.Compiler/Program.cs @@ -19,7 +19,7 @@ using Type = IKVM.Reflection.Type; -namespace IronPythonCompiler { +namespace IronPython.Compiler { public class Program { diff --git a/src/executables/IronPython.Console/IronPythonConsole.csproj b/src/executables/IronPython.Console/IronPython.Console.csproj similarity index 96% rename from src/executables/IronPython.Console/IronPythonConsole.csproj rename to src/executables/IronPython.Console/IronPython.Console.csproj index 10a5dcc52..3c75121b2 100644 --- a/src/executables/IronPython.Console/IronPythonConsole.csproj +++ b/src/executables/IronPython.Console/IronPython.Console.csproj @@ -3,7 +3,7 @@ net462;net6.0;net8.0 Exe - IronPythonConsole + IronPython.Console ipy ipy.ico true diff --git a/src/executables/IronPython.Console32/IronPythonConsole32.csproj b/src/executables/IronPython.Console32/IronPython.Console32.csproj similarity index 94% rename from src/executables/IronPython.Console32/IronPythonConsole32.csproj rename to src/executables/IronPython.Console32/IronPython.Console32.csproj index 34c727c57..c8b938c10 100644 --- a/src/executables/IronPython.Console32/IronPythonConsole32.csproj +++ b/src/executables/IronPython.Console32/IronPython.Console32.csproj @@ -4,7 +4,7 @@ net462 x86 Exe - IronPythonConsole + IronPython.Console32 ipy32 ..\IronPython.Console\ipy.ico true diff --git a/src/executables/IronPython.Window/IronPythonWindow.csproj b/src/executables/IronPython.Window/IronPython.Window.csproj similarity index 92% rename from src/executables/IronPython.Window/IronPythonWindow.csproj rename to src/executables/IronPython.Window/IronPython.Window.csproj index 0e7966081..7b6e12f5a 100644 --- a/src/executables/IronPython.Window/IronPythonWindow.csproj +++ b/src/executables/IronPython.Window/IronPython.Window.csproj @@ -3,7 +3,7 @@ net462 WinExe - IronPythonWindow + IronPython.Window ipyw ipyw.ico true diff --git a/src/executables/IronPython.Window32/IronPythonWindow32.csproj b/src/executables/IronPython.Window32/IronPython.Window32.csproj similarity index 94% rename from src/executables/IronPython.Window32/IronPythonWindow32.csproj rename to src/executables/IronPython.Window32/IronPython.Window32.csproj index aba42d512..d79c8588e 100644 --- a/src/executables/IronPython.Window32/IronPythonWindow32.csproj +++ b/src/executables/IronPython.Window32/IronPython.Window32.csproj @@ -4,7 +4,7 @@ net462 x86 WinExe - IronPythonWindow + IronPython.Window32 ipyw32 ..\IronPython.Window\ipyw.ico true diff --git a/src/roslyn/IronPython.Analyzer/IronPythonAnalyzer.csproj b/src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj similarity index 100% rename from src/roslyn/IronPython.Analyzer/IronPythonAnalyzer.csproj rename to src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj diff --git a/src/roslyn/IronPython.Analyzer/IronPythonAnalyzerAnalyzer.cs b/src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs similarity index 98% rename from src/roslyn/IronPython.Analyzer/IronPythonAnalyzerAnalyzer.cs rename to src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs index d392b4230..bdbc354a9 100644 --- a/src/roslyn/IronPython.Analyzer/IronPythonAnalyzerAnalyzer.cs +++ b/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 diff --git a/tests/IronPython.Tests/IronPythonTest.csproj b/tests/IronPython.Tests/IronPython.Tests.csproj similarity index 97% rename from tests/IronPython.Tests/IronPythonTest.csproj rename to tests/IronPython.Tests/IronPython.Tests.csproj index b13c32c65..6ff811e82 100644 --- a/tests/IronPython.Tests/IronPythonTest.csproj +++ b/tests/IronPython.Tests/IronPython.Tests.csproj @@ -2,6 +2,7 @@ net462;net6.0;net8.0 + IronPythonTest true diff --git a/tests/IronPython.Tests/Util/TestManifest.cs b/tests/IronPython.Tests/Util/TestManifest.cs index af01c800e..890ece9e8 100644 --- a/tests/IronPython.Tests/Util/TestManifest.cs +++ b/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); }