Merge branch 'main' into 3.6

Author: slozier

.editorconfig

@@ -40,6 +40,9 @@ dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
 csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async:error
 
+# CA2241: Provide correct arguments to formatting methods
+dotnet_code_quality.CA2241.try_determine_additional_string_formatting_methods_automatically = true
+
 # IPY01: Parameter which is marked not nullable does not have the NotNullAttribute
 dotnet_diagnostic.IPY01.severity = warning
 
@@ -95,6 +98,7 @@ dotnet_diagnostic.CA2211.severity = none        # CA2211: Non-constant fields sh
 dotnet_diagnostic.CA2219.severity = suggestion  # CA2219: Do not raise exceptions in finally clauses
 dotnet_diagnostic.CA2229.severity = suggestion  # CA2229: Implement serialization constructors
 dotnet_diagnostic.CA2249.severity = suggestion  # CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
+dotnet_diagnostic.CA2263.severity = none        # CA2263: Prefer generic overload when type is known
 dotnet_diagnostic.CA3075.severity = suggestion  # CA3075: Insecure DTD processing in XML
 dotnet_diagnostic.CA5350.severity = suggestion  # CA5350: Do Not Use Weak Cryptographic Algorithms
 dotnet_diagnostic.CA5351.severity = suggestion  # CA5351: Do Not Use Broken Cryptographic Algorithms

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-22.04, macos-latest]
+        os: [windows-latest, ubuntu-22.04, macos-14]
 
     steps:
       # Prerequisites
@@ -21,18 +21,18 @@ jobs:
         submodules: true
 
       # Setup .NET
-    - name: Setup .NET 6.0
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0.x'
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: Setup .NET 9.0
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '9.0.x'
+    - name: Setup .NET 8.0
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
 
       # CI debug information
     - name: Version Information
@@ -60,8 +60,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-22.04, macos-latest]
-        framework: ['net462', 'net6.0', 'net8.0']
+        os: [windows-latest, ubuntu-22.04, macos-14]
+        framework: ['net462', 'net8.0', 'net10.0']
 
     steps:
       # Prerequisites
@@ -70,18 +70,18 @@ jobs:
         submodules: true
 
       # Setup .NET
-    - name: Setup .NET 6.0
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0.x'
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: Setup .NET 9.0
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '9.0.x'
+    - name: Setup .NET 8.0
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
 
       # Build & Test
     - name: Build

.vsts-ci.yml

@@ -7,7 +7,7 @@ jobs:
           imageName: 'ubuntu-22.04'
         mac:
           osName: 'macOS'
-          imageName: 'macOS-latest'
+          imageName: 'macOS-14'
         windows:
           osName: 'Windows'
           imageName: 'windows-latest'
@@ -32,10 +32,10 @@ jobs:
 
       # Setup .NET
       - task: UseDotNet@2
-        displayName: Install .NET 9.0 SDK for build
+        displayName: Install .NET 10.0 SDK for build
         inputs:
           packageType: 'sdk'
-          version: '9.0.x'
+          version: '10.0.x'
 
       # Display version info
       - task: PowerShell@2
@@ -88,38 +88,38 @@ jobs:
           osName: Linux
           imageName: ubuntu-22.04
           framework: net462
-        linux_net6_0:
-          osName: Linux
-          imageName: ubuntu-22.04
-          framework: net6.0
         linux_net8_0:
           osName: Linux
           imageName: ubuntu-22.04
           framework: net8.0
         macos_net462:
           osName: macOS
-          imageName: macOS-latest
+          imageName: macOS-14
           framework: net462
-        macos_net6_0:
-          osName: macOS
-          imageName: macOS-latest
-          framework: net6.0
         macos_net8_0:
           osName: macOS
-          imageName: macOS-latest
+          imageName: macOS-14
           framework: net8.0
         windows_net462:
           osName: Windows
           imageName: windows-latest
           framework: net462
-        windows_net6_0:
-          osName: Windows
-          imageName: windows-latest
-          framework: net6.0
         windows_net8_0:
           osName: Windows
           imageName: windows-latest
           framework: net8.0
+        linux_net10_0:
+          osName: Linux
+          imageName: ubuntu-22.04
+          framework: net10.0
+        macos_net10_0:
+          osName: macOS
+          imageName: macOS-14
+          framework: net10.0
+        windows_net10_0:
+          osName: Windows
+          imageName: windows-latest
+          framework: net10.0
 
     displayName: Test
     timeoutInMinutes: 180
@@ -133,20 +133,20 @@ jobs:
 
       # Setup .NET
       - task: UseDotNet@2
-        displayName: Install .NET 6.0 runtime for testing
+        displayName: Install .NET 10.0 SDK for build
+        inputs:
+          packageType: 'sdk'
+          version: '10.0.x'
+      - task: UseDotNet@2
+        displayName: Install .NET 9.0 runtime for testing
         inputs:
           packageType: 'runtime'
-          version: '6.0.x'
+          version: '9.0.x'
       - task: UseDotNet@2
         displayName: Install .NET 8.0 runtime for testing
         inputs:
           packageType: 'runtime'
           version: '8.0.x'
-      - task: UseDotNet@2
-        displayName: Install .NET 9.0 SDK for build
-        inputs:
-          packageType: 'sdk'
-          version: '9.0.x'
 
       # Build & Test
       - powershell: ./make.ps1

Build.proj

@@ -8,7 +8,7 @@
     <MacOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">true</MacOS>
 
     <RootDir>$(MSBuildThisFileDirectory)</RootDir>
-    <Solution>$(RootDir)IronPython.sln</Solution>
+    <Solution>$(RootDir)IronPython.slnx</Solution>
     <UtilsDir>$(RootDir)eng\utils</UtilsDir>
     <BinDir>$(RootDir)bin</BinDir>
     <BuildSysDir>$(RootDir)eng</BuildSysDir>

Directory.Build.props

@@ -27,6 +27,9 @@
     <FileVersion>$(MajorVersion).$(MinorVersion).$(MicroVersion).$(AssemblyFileRevision)</FileVersion>
     <InformationalVersion>$(MSBuildProjectName) $(MajorVersion).$(MinorVersion).$(MicroVersion) $(ReleaseLevel) $(ReleaseSerial)</InformationalVersion>
 
+    <PythonSymbols>PYTHON_$(MajorVersion)$(MinorVersion)</PythonSymbols>
+    <PythonSymbols Condition="'$(MajorVersion)$(MinorVersion)' >= '36'">$(PythonSymbols);PYTHON_36_OR_GREATER</PythonSymbols>
+
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
 
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
@@ -125,7 +128,7 @@
     <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <DefineConstants>$(Features);$(SignedSym);TRACE</DefineConstants>
+    <DefineConstants>$(PythonSymbols);$(Features);$(SignedSym);TRACE</DefineConstants>
   </PropertyGroup>
 
   <!-- Debug -->
@@ -135,6 +138,6 @@
     <Optimize>false</Optimize>
     <!-- TODO: Python & zlib.net need some work -->
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <DefineConstants>$(Features);$(SignedSym);DEBUG;TRACE</DefineConstants>
+    <DefineConstants>$(PythonSymbols);$(Features);$(SignedSym);DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 </Project>