Merge branch 'main' into 3.6

Author: slozier

.editorconfig

@@ -85,7 +85,7 @@ dotnet_diagnostic.CA1837.severity = suggestion  # CA1837: Use 'Environment.Proce
 dotnet_diagnostic.CA1838.severity = suggestion  # CA1838: Avoid 'StringBuilder' parameters for P/Invokes
 dotnet_diagnostic.CA1845.severity = none        # CA1845: Use span-based 'string.Concat'
 dotnet_diagnostic.CA1846.severity = none        # CA1846: Prefer 'AsSpan' over 'Substring'
-dotnet_diagnostic.CA1847.severity = none        # CA1847: Use char literal for a single character lookup
+dotnet_diagnostic.CA1847.severity = suggestion  # CA1847: Use char literal for a single character lookup
 dotnet_diagnostic.CA1852.severity = suggestion  # CA1852: Seal internal types
 dotnet_diagnostic.CA1854.severity = suggestion  # CA1854: Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
 dotnet_diagnostic.CA1859.severity = suggestion  # CA1859: Use concrete types when possible for improved performance
@@ -97,7 +97,6 @@ dotnet_diagnostic.CA2208.severity = suggestion  # CA2208: Instantiate argument e
 dotnet_diagnostic.CA2211.severity = none        # CA2211: Non-constant fields should not be visible
 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

.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
     - uses: actions/upload-artifact@v7
       with:
         name: packages-${{ matrix.os }}
-        path: Package/Release/Packages
+        path: dist/Release/Packages
 
   test:
     runs-on: ${{ matrix.os }}

.gitignore

@@ -6,11 +6,12 @@
 *.suo
 *.csproj.user
 launchSettings.json
+*.lscache
 
 # Build results
 obj/
 bin/
-Package/Release/
+/dist/
 *.binlog
 
 # Python cache files

.vsts-ci.yml

@@ -64,7 +64,7 @@ jobs:
       - task: CopyFiles@2
         displayName: Copy Packages
         inputs:
-          SourceFolder: '$(Build.Repository.LocalPath)/Package/Release/Packages'
+          SourceFolder: '$(Build.Repository.LocalPath)/dist/Release/Packages'
           Contents: |
             **/*.nupkg
             **/*.snupkg

Build.proj

@@ -14,14 +14,14 @@
     <BuildSysDir>$(RootDir)eng</BuildSysDir>
   </PropertyGroup>
 
-  <Import Project="$(BuildSysDir)\Tasks.Targets" />
+  <Import Project="$(BuildSysDir)\Tasks.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\CurrentVersion.props" />
 
   <PropertyGroup>
     <PackageVersion Condition="'$(ReleaseLevel)' == 'final'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</PackageVersion>
     <PackageVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion>
-    <StageDir>$(RootDir)Package\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
-    <PackageDir>$(RootDir)Package\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
+    <StageDir>$(RootDir)dist\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
+    <PackageDir>$(RootDir)dist\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
     <StdLibDirName>lib</StdLibDirName>
   </PropertyGroup>
 

eng/Tasks.Targets eng/Tasks.targetseng/Tasks.Targets renamed to eng/Tasks.targets

@@ -74,20 +74,20 @@
       <Using Namespace="System.Text.RegularExpressions" />
       <Code Type="Fragment" Language="cs">
         <![CDATA[
-        try {
-          System.Text.RegularExpressions.Regex replaceRegex = new System.Text.RegularExpressions.Regex(Expression);
-          foreach(ITaskItem item in Files) {
-            string fileName = item.ItemSpec;
-            Log.LogMessage(string.Format("Updating File \"{0}\".", fileName));
-            string buffer = File.ReadAllText(fileName);
-            buffer = replaceRegex.Replace(buffer, Replacement);
-            File.WriteAllText(fileName, buffer);
-          }
-          Success = true;
-        } catch(Exception ex) {
-          Success = false;
-          Log.LogErrorFromException(ex);
-        }
+            try {
+                System.Text.RegularExpressions.Regex replaceRegex = new System.Text.RegularExpressions.Regex(Expression);
+                foreach (ITaskItem item in Files) {
+                    string fileName = item.ItemSpec;
+                    Log.LogMessage(string.Format("Updating File \"{0}\".", fileName));
+                    string buffer = File.ReadAllText(fileName);
+                    buffer = replaceRegex.Replace(buffer, Replacement);
+                    File.WriteAllText(fileName, buffer);
+                }
+                Success = true;
+            } catch (Exception ex) {
+                Success = false;
+                Log.LogErrorFromException(ex);
+            }
         ]]>
       </Code>
     </Task>

eng/net10.0.props

@@ -23,6 +23,7 @@
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
+    <Features>$(Features);FEATURE_NET_ASYNC</Features>
     <Features>$(Features);FEATURE_OSPLATFORMATTRIBUTE</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>

eng/net8.0.props

@@ -23,6 +23,7 @@
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
+    <Features>$(Features);FEATURE_NET_ASYNC</Features>
     <Features>$(Features);FEATURE_OSPLATFORMATTRIBUTE</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>

eng/net9.0.props

@@ -23,6 +23,7 @@
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
+    <Features>$(Features);FEATURE_NET_ASYNC</Features>
     <Features>$(Features);FEATURE_OSPLATFORMATTRIBUTE</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>

eng/package/choco/IronPython.nuspec

@@ -5,7 +5,7 @@
   <metadata>
     <id>ironpython</id>
     <version>3.4.0</version>
-    <packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/main/Package/choco</packageSourceUrl>
+    <packageSourceUrl>https://github.com/IronLanguages/ironpython3/tree/main/eng/package/choco</packageSourceUrl>
     <title>IronPython</title>
     <authors>IronPython Contributors, Microsoft</authors>
     <copyright>© IronPython Contributors</copyright>