Merge branch 'main' into wasi_timer

Author: pavelsavara

CONTRIBUTING.md

@@ -200,7 +200,7 @@ Ports have a weaker contribution bar, at least initially. A functionally correct
 
 #### Copying Files from Other Projects
 
-The .NET runtime uses some files from other projects, typically where a binary distribution does not exist or would be inconvenient.
+The .NET runtime uses some files from other projects, per [copyright](./docs/project/copyright.md) rules.
 
 The following rules must be followed for PRs that include files from another project:
 

docs/project/copyright.md

@@ -16,6 +16,8 @@ We use the following approach for code contributions:
 - We will typically reject the use of product code licensed with [Creative Commons](https://creativecommons.org/) or [public domain licenses](https://en.wikipedia.org/wiki/Public-domain-equivalent_license) given their lack of universal acceptance.
 - The [.NET Foundation Contribution License Agreement (CLA)](https://cla.dotnetfoundation.org) is used to license contributions from contributors.
 
+More mechanical guidance is provided in [CONTRIBUTING.md](../../CONTRIBUTING.md#copying-files-from-other-projects).
+
 References:
 
 - https://opensource.org/faq#cc-zero

eng/Version.Details.xml

@@ -368,13 +368,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1633d219fd06f82c45ef6eb226305839e5003960</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24378.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24402.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9</Sha>
+      <Sha>b70b32099c2365092974f6786636e25ae507c8fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24378.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24402.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9</Sha>
+      <Sha>b70b32099c2365092974f6786636e25ae507c8fa</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-2.24379.16">

eng/Versions.props

@@ -34,8 +34,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- dotnet/roslyn-analyzers dependencies -->
-    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24378.1</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24378.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24402.1</MicrosoftCodeAnalysisAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24402.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!-- dotnet/roslyn dependencies -->
     <!--
       These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.

eng/pipelines/coreclr/templates/build-perf-bdn-app.yml

@@ -17,7 +17,7 @@ parameters:
   archiveType: ''
   tarCompression: ''
   framework: 'net9.0' # Framework version to get versions for and build for
-  perfRepo: 'main' # Perf repo to pull for the PerfLabExporter
+  perfBranch: 'main' # Performance branch to use for cloning
 
 
 steps:
@@ -57,20 +57,6 @@ steps:
       overwriteExistingFiles: true
       cleanDestinationFolder: false
 
-  - script: |
-      echo '{ }' > ./global.json
-      curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/${{parameters.framework}}/NuGet.config'
-      curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
-      curl -Lo maui-supported-sdk-version.json 'https://maui.blob.core.windows.net/metadata/sdks/${{parameters.framework}}.json'
-      version=$(sed -nr 's/\s*"version": "(.*)"/\1/p' ./maui-supported-sdk-version.json)
-      chmod -R a+rx .
-      ./dotnet-install.sh --version $version --install-dir .
-      ./dotnet --info
-      ./dotnet workload install maui --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/${{parameters.framework}}.json --configfile NuGet.config
-      ./dotnet workload install android --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/${{parameters.framework}}.json --configfile NuGet.config
-    displayName: Install MAUI workload
-    workingDirectory: $(Build.SourcesDirectory)
-
   - script: $(Build.SourcesDirectory)/eng/testing/performance/create-provisioning-profile.sh
     displayName: Create iOS code signing and provisioning profile
 
@@ -84,10 +70,33 @@ steps:
   - script: |
       set -x
       pwd
-      git clone https://github.com/dotnet/performance.git --depth 1 -b ${{parameters.perfRepo}} --single-branch
+      git clone https://github.com/dotnet/performance.git --depth 1 -b ${{parameters.perfBranch}} --single-branch
     displayName:  Clone performance
     workingDirectory: $(Build.SourcesDirectory)
 
+  - script: |
+      pwd
+      echo '$(Build.SourcesDirectory)/rollback.json'
+      export PYTHONPATH=$PYTHONPATH:$(Build.SourcesDirectory)/performance/scripts:$(Build.SourcesDirectory)/performance/src/scenarios
+      python -c "import mauisharedpython; roll_dict = mauisharedpython.generate_maui_rollback_dict(); mauisharedpython.dump_dict_to_json_file(roll_dict, '$(Build.SourcesDirectory)/rollback.json')"
+    displayName: Generate rollback.json
+    workingDirectory: $(Build.SourcesDirectory)/performance/src/scenarios/shared
+
+  - script: |
+      echo '{ }' > ./global.json
+      curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/${{parameters.framework}}/NuGet.config'
+      curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
+      curl -Lo performance-version-details.xml 'https://raw.githubusercontent.com/dotnet/performance/${{parameters.perfBranch}}/eng/Version.Details.xml'
+      version=$(sed -nr 's/[[:space:]]*<Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="(.*)"[[:space:]].*/\1/p' ./performance-version-details.xml)
+      echo dotnet-version: $version
+      chmod -R a+rx .
+      ./dotnet-install.sh --version $version --install-dir .
+      ./dotnet --info
+      ./dotnet workload install maui --from-rollback-file rollback.json --configfile NuGet.config
+      ./dotnet workload install android --from-rollback-file rollback.json --configfile NuGet.config
+    displayName: Install MAUI workload
+    workingDirectory: $(Build.SourcesDirectory)
+
   - pwsh: |
       $BenchmarkDotNetVersionCapture = Get-Content .\performance\eng\Versions.props | Select-String -Pattern '<BenchmarkDotNetVersion>(.+?)</BenchmarkDotNetVersion>'
       if ($BenchmarkDotNetVersionCapture.Length -eq 0) {

src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -231,6 +231,7 @@
     <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\ThrowHelper.cs" />
     <Compile Include="$(BclSourcesRoot)\System\TypedReference.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\TypeLoadException.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\ValueType.cs" />

src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs

@@ -291,10 +291,7 @@ public static int GetGeneration(WeakReference wo)
             object? obj = GCHandle.InternalGet(wo.WeakHandle);
             KeepAlive(wo);
 
-            if (obj is null)
-            {
-                throw new ArgumentNullException(nameof(wo));
-            }
+            ArgumentNullException.ThrowIfNull(obj, nameof(wo));
 
             return GetGeneration(obj);
         }

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs

@@ -276,8 +276,8 @@ private void AddOneArgTypeHelper(Type clsArgument, Type[]? requiredCustomModifie
             {
                 for (int i = 0; i < optionalCustomModifiers.Length; i++)
                 {
-                    Type t = optionalCustomModifiers[i] ??
-                        throw new ArgumentNullException(nameof(optionalCustomModifiers));
+                    Type t = optionalCustomModifiers[i];
+                    ArgumentNullException.ThrowIfNull(t, nameof(optionalCustomModifiers));
 
                     if (t.HasElementType)
                         throw new ArgumentException(SR.Argument_ArraysInvalid, nameof(optionalCustomModifiers));

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs

@@ -1879,7 +1879,7 @@ private static object CreateCustomAttributeInstance(RuntimeModule module, Runtim
         {
             if (module is null)
             {
-                throw new ArgumentNullException(SR.Arg_InvalidHandle);
+                throw new ArgumentNullException(null, SR.Arg_InvalidHandle);
             }
 
             object? result = null;
@@ -1909,7 +1909,7 @@ private static void GetPropertyOrFieldData(
         {
             if (module is null)
             {
-                throw new ArgumentNullException(SR.Arg_InvalidHandle);
+                throw new ArgumentNullException(null, SR.Arg_InvalidHandle);
             }
 
             string? nameLocal = null;

src/coreclr/System.Private.CoreLib/src/System/ThrowHelper.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System
+{
+    internal static unsafe partial class ThrowHelper
+    {
+        [DoesNotReturn]
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "ExceptionNative_ThrowAmbiguousResolutionException")]
+        private static partial void ThrowAmbiguousResolutionException(MethodTable* targetType, MethodTable* interfaceType, void* methodDesc);
+
+        [DoesNotReturn]
+        internal static void ThrowAmbiguousResolutionException(
+            void* method,           // MethodDesc*
+            void* interfaceType,    // MethodTable*
+            void* targetType)       // MethodTable*
+        {
+            ThrowAmbiguousResolutionException((MethodTable*)targetType, (MethodTable*)interfaceType, method);
+        }
+
+        [DoesNotReturn]
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "ExceptionNative_ThrowEntryPointNotFoundException")]
+        private static partial void ThrowEntryPointNotFoundException(MethodTable* targetType, MethodTable* interfaceType, void* methodDesc);
+
+        [DoesNotReturn]
+        internal static void ThrowEntryPointNotFoundException(
+            void* method,           // MethodDesc*
+            void* interfaceType,    // MethodTable*
+            void* targetType)       // MethodTable*
+        {
+            ThrowEntryPointNotFoundException((MethodTable*)targetType, (MethodTable*)interfaceType, method);
+        }
+    }
+}