Merge branch 'main' into 3.6

Author: slozier

.editorconfig

@@ -37,8 +37,8 @@ dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities = *
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
 # enforce some code styles
-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
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public, private, protected, internal, file, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, required, volatile, async:warning
 
 # CA2241: Provide correct arguments to formatting methods
 dotnet_code_quality.CA2241.try_determine_additional_string_formatting_methods_automatically = true

.github/workflows/main.yml

@@ -2,6 +2,10 @@ name: CI
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "Src/DLR"]
+[submodule "DLR"]
 	path = src/dlr
 	url = https://github.com/IronLanguages/dlr
 	branch = main

Directory.Build.props

@@ -52,6 +52,10 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <PropertyGroup>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
@@ -108,7 +112,6 @@
   <Import Project="$(BuildSysDir)\$(TargetFramework).props" Condition="'$(TargetFramework)' != ''" />
 
   <PropertyGroup>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1573;1591</NoWarn>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

IronPython.slnx

@@ -1,11 +1,11 @@
 <Solution>
   <Folder Name="/DLR/">
-    <Project Path="src/dlr/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
-    <Project Path="src/dlr/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
-    <Project Path="src/dlr/Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
+    <Project Path="src/dlr/src/core/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
+    <Project Path="src/dlr/src/core/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
+    <Project Path="src/dlr/src/core/Microsoft.Scripting/Microsoft.Scripting.csproj" />
   </Folder>
   <Folder Name="/DLR/Tests/">
-    <Project Path="src/dlr/Tests/ClrAssembly/ClrAssembly.csproj" />
+    <Project Path="src/dlr/tests/ClrAssembly/ClrAssembly.csproj" />
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />

eng/scripts/generate.py

@@ -16,7 +16,7 @@ def get_root_dir():
 
 source_directories = [
     os.path.join(root_dir, "src"),
-    os.path.join(root_dir, "src", "dlr", "Src"),
+    os.path.join(root_dir, "src", "dlr", "src"),
 ]
 
 exclude_directories = [

eng/scripts/generate_comdispatch.py

@@ -55,7 +55,7 @@ def write_accessor(self, cw, transparent):
 
         # Getter
         if not transparent and self.critical: gen_exposed_code_security(cw)
-        cw.enter_block("get")
+        cw.enter_block("readonly get")
         cw.write("Debug.Assert(VariantType == VarEnum.VT_%s);" % self.variantType)
         if self.getStatements == None:
             cw.write("return _typeUnion._unionTypes.%s;" % self.managedFieldName)

eng/scripts/generate_exception_factory.py

@@ -172,7 +172,7 @@ def gen_expr_factory_com(cw):
     gen_expr_factory(cw, generate.root_dir + "\\..\\..\\ndp\\fx\\src\\Dynamic\\System\\Dynamic\\System.Dynamic.txt")
 
 def gen_expr_factory_scripting(cw):
-    gen_expr_factory(cw, generate.root_dir + "\\src\\dlr\\Src\\Microsoft.Dynamic\\Microsoft.Scripting.txt")
+    gen_expr_factory(cw, generate.root_dir + "\\src\\dlr\\src\\Microsoft.Dynamic\\Microsoft.Scripting.txt")
 
 def main():
     return generate.generate(

src/core/IronPython/IronPython.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
+    <ProjectReference Include="..\..\dlr\src\core\Microsoft.Dynamic\Microsoft.Dynamic.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/core/IronPython/Lib/iptest/ipunittest.py

@@ -234,8 +234,8 @@ def generate_suite(tests, failing_tests, skip_tests=[]):
 #     if not rowan_root:
 #         rowan_root = sys.prefix
 #         if is_cli:
-#             if System.IO.Directory.Exists(path_combine(rowan_root, '../../Src')):
-#                 basePyDir = '../../Src'
+#             if System.IO.Directory.Exists(path_combine(rowan_root, '../../src')):
+#                 basePyDir = '../../src'
 
 #     # get some directories and files
 #     ip_root             = path_combine(rowan_root, basePyDir)