From 6222fca7914de6790a96079c75021b8263a87ad0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:50:33 -0700
Subject: [PATCH 01/14] [release/8.0-rc1] [workloads] Put quotes around
 GetFileName call when collecting telemetry (#90606)

* [workloads] Put quotes around GetFileName call when collecting telemetry

There are cases where `%(ReferencePath)` is empty, so prevent exceptions by quoting the value.

Fixes https://github.com/dotnet/runtime/issues/90584

* Feedback

---------

Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
---
 .../WorkloadTelemetry.targets                                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadTelemetry.targets b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadTelemetry.targets
index f9cd6efe170a2..8f78ce16b6258 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadTelemetry.targets
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadTelemetry.targets
@@ -38,8 +38,8 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <_WorkloadUsesOther Condition="'$([System.IO.Path]::GetFileName(%(ReferencePath.Identity)).ToLower())' == 'avalonia.dll'">true</_WorkloadUsesOther>
-      <_WorkloadUsesOther Condition="'$([System.IO.Path]::GetFileName(%(ReferencePath.Identity)).ToLower())' == 'uno.dll'">true</_WorkloadUsesOther>
+      <_WorkloadUsesOther Condition="'$([System.IO.Path]::GetFileName(&quot;%(ReferencePath.Identity)&quot;).ToLowerInvariant())' == 'avalonia.dll'">true</_WorkloadUsesOther>
+      <_WorkloadUsesOther Condition="'$([System.IO.Path]::GetFileName(&quot;%(ReferencePath.Identity)&quot;).ToLowerInvariant())' == 'uno.dll'">true</_WorkloadUsesOther>
       <_WorkloadUsesMobileSDKOnly Condition="'$(RuntimeIdentifier)' != 'browser-wasm' and '$(UseMaui)' != 'true' and '$(_WorkloadUsesOther)' != 'true'">true</_WorkloadUsesMobileSDKOnly>
     </PropertyGroup>
   </Target>

From b1225e7c0902f82362afc9cc21b632462a9339b4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 07:17:22 -0700
Subject: [PATCH 02/14] Update dependencies from
 https://github.com/dotnet/emsdk build 20230815.5 (#90649)

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport
 From Version 8.0.0-rc.1.23411.2 -> To Version 8.0.0-rc.1.23415.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 76bf5019cd8ed..e31341152d13b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -90,9 +90,9 @@
       <Sha>2f4ef297939628143389ddeea569874ded0b1c1b</Sha>
       <SourceBuild RepoName="cecil" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23415.5">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
+      <Sha>66dbaefff04250dc72849f0172e0c53bcfb3ab38</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23381.3">
diff --git a/eng/Versions.props b/eng/Versions.props
index 3cccff5761371..ff21c1ee1f07d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -238,7 +238,7 @@
          Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
                like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
     -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23415.5</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

From d29067bc3bc614ed08a5e6cd94baff0481f435e6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 07:38:41 -0700
Subject: [PATCH 03/14] [release/8.0-rc1] Fix support for non-public default
 constructors using JsonIncludeAttribute (#90615)

* Fix support for non-public constructors using JsonIncludeAttribute

* Address feedback.

---------

Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
---
 .../DefaultJsonTypeInfoResolver.Helpers.cs    | 21 ++++++++++++++-
 .../Serialization/Metadata/MemberAccessor.cs  |  5 ++--
 .../ReflectionEmitCachingMemberAccessor.cs    |  6 ++---
 .../Metadata/ReflectionEmitMemberAccessor.cs  | 15 ++++++-----
 .../Metadata/ReflectionMemberAccessor.cs      | 27 +++++++------------
 .../ConstructorTests.AttributePresence.cs     | 18 +++++++++++++
 .../TestClasses/TestClasses.Constructor.cs    | 27 +++++++++++++++++++
 .../Serialization/ConstructorTests.cs         |  6 +++++
 8 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/DefaultJsonTypeInfoResolver.Helpers.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/DefaultJsonTypeInfoResolver.Helpers.cs
index 7ec9db9adc773..8ee9f3db0283b 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/DefaultJsonTypeInfoResolver.Helpers.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/DefaultJsonTypeInfoResolver.Helpers.cs
@@ -49,7 +49,7 @@ private static JsonTypeInfo CreateTypeInfoCore(Type type, JsonConverter converte
             typeInfo.PopulatePolymorphismMetadata();
             typeInfo.MapInterfaceTypesToCallbacks();
 
-            Func<object>? createObject = MemberAccessor.CreateConstructor(typeInfo.Type);
+            Func<object>? createObject = DetermineCreateObjectDelegate(type, converter);
             typeInfo.SetCreateObjectIfCompatible(createObject);
             typeInfo.CreateObjectForExtensionDataProperty = createObject;
 
@@ -411,5 +411,24 @@ internal static void DeterminePropertyAccessors<T>(JsonPropertyInfo<T> jsonPrope
                     break;
             }
         }
+
+        [RequiresUnreferencedCode(JsonSerializer.SerializationUnreferencedCodeMessage)]
+        [RequiresDynamicCode(JsonSerializer.SerializationRequiresDynamicCodeMessage)]
+        private static Func<object>? DetermineCreateObjectDelegate(Type type, JsonConverter converter)
+        {
+            ConstructorInfo? defaultCtor = null;
+
+            if (converter.ConstructorInfo != null && !converter.ConstructorIsParameterized)
+            {
+                // A parameterless constructor has been resolved by the converter
+                // (e.g. it might be a non-public ctor with JsonConverterAttribute).
+                defaultCtor = converter.ConstructorInfo;
+            }
+
+            // Fall back to resolving any public constructors on the type.
+            defaultCtor ??= type.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null);
+
+            return MemberAccessor.CreateParameterlessConstructor(type, defaultCtor);
+        }
     }
 }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/MemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/MemberAccessor.cs
index 326ab657b8899..ff6c442fa488c 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/MemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/MemberAccessor.cs
@@ -9,8 +9,9 @@ namespace System.Text.Json.Serialization.Metadata
 {
     internal abstract class MemberAccessor
     {
-        public abstract Func<object>? CreateConstructor(
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type classType);
+        public abstract Func<object>? CreateParameterlessConstructor(
+             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type,
+             ConstructorInfo? constructorInfo);
 
         public abstract Func<object[], T> CreateParameterizedConstructor<T>(ConstructorInfo constructor);
 
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitCachingMemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitCachingMemberAccessor.cs
index a243f4be4d86a..e30f87d76da9f 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitCachingMemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitCachingMemberAccessor.cs
@@ -21,12 +21,12 @@ internal sealed partial class ReflectionEmitCachingMemberAccessor : MemberAccess
             => s_cache.GetOrAdd((nameof(CreateAddMethodDelegate), typeof(TCollection), null),
                 static (_) => s_sourceAccessor.CreateAddMethodDelegate<TCollection>());
 
-        public override Func<object>? CreateConstructor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type classType)
-            => s_cache.GetOrAdd((nameof(CreateConstructor), classType, null),
+        public override Func<object>? CreateParameterlessConstructor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type, ConstructorInfo? ctorInfo)
+            => s_cache.GetOrAdd((nameof(CreateParameterlessConstructor), type, ctorInfo),
                 [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2077:UnrecognizedReflectionPattern",
                     Justification = "Cannot apply DynamicallyAccessedMembersAttribute to tuple properties.")]
 #pragma warning disable IL2077 // The suppression doesn't work for the trim analyzer: https://github.com/dotnet/roslyn/issues/59746
-                static (key) => s_sourceAccessor.CreateConstructor(key.declaringType));
+                static (key) => s_sourceAccessor.CreateParameterlessConstructor(key.declaringType, (ConstructorInfo?)key.member));
 #pragma warning restore IL2077
 
         public override Func<object, TProperty> CreateFieldGetter<TProperty>(FieldInfo fieldInfo)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitMemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitMemberAccessor.cs
index 6e05e5c8057ac..4b0b426bdaa9e 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitMemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionEmitMemberAccessor.cs
@@ -13,18 +13,19 @@ namespace System.Text.Json.Serialization.Metadata
     [RequiresDynamicCode(JsonSerializer.SerializationRequiresDynamicCodeMessage)]
     internal sealed class ReflectionEmitMemberAccessor : MemberAccessor
     {
-        public override Func<object>? CreateConstructor(
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type)
+        public override Func<object>? CreateParameterlessConstructor(
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type,
+            ConstructorInfo? constructorInfo)
         {
             Debug.Assert(type != null);
-            ConstructorInfo? realMethod = type.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null);
+            Debug.Assert(constructorInfo is null || constructorInfo.GetParameters().Length == 0);
 
             if (type.IsAbstract)
             {
                 return null;
             }
 
-            if (realMethod == null && !type.IsValueType)
+            if (constructorInfo is null && !type.IsValueType)
             {
                 return null;
             }
@@ -38,8 +39,10 @@ internal sealed class ReflectionEmitMemberAccessor : MemberAccessor
 
             ILGenerator generator = dynamicMethod.GetILGenerator();
 
-            if (realMethod == null)
+            if (constructorInfo is null)
             {
+                Debug.Assert(type.IsValueType);
+
                 LocalBuilder local = generator.DeclareLocal(type);
 
                 generator.Emit(OpCodes.Ldloca_S, local);
@@ -49,7 +52,7 @@ internal sealed class ReflectionEmitMemberAccessor : MemberAccessor
             }
             else
             {
-                generator.Emit(OpCodes.Newobj, realMethod);
+                generator.Emit(OpCodes.Newobj, constructorInfo);
                 if (type.IsValueType)
                 {
                     // Since C# 10 it's now possible to have parameterless constructors in structs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionMemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionMemberAccessor.cs
index 606ad6aba79c2..8627a24f3f492 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionMemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/ReflectionMemberAccessor.cs
@@ -10,35 +10,26 @@ namespace System.Text.Json.Serialization.Metadata
 {
     internal sealed class ReflectionMemberAccessor : MemberAccessor
     {
-        private sealed class ConstructorContext
-        {
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
-            private readonly Type _type;
-
-            public ConstructorContext([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type)
-                => _type = type;
-
-            public object? CreateInstance()
-                => Activator.CreateInstance(_type, nonPublic: false);
-        }
-
-        public override Func<object>? CreateConstructor(
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type)
+        public override Func<object>? CreateParameterlessConstructor(
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type type,
+            ConstructorInfo? ctorInfo)
         {
             Debug.Assert(type != null);
-            ConstructorInfo? realMethod = type.GetConstructor(BindingFlags.Public | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null);
+            Debug.Assert(ctorInfo is null || ctorInfo.GetParameters().Length == 0);
 
             if (type.IsAbstract)
             {
                 return null;
             }
 
-            if (realMethod == null && !type.IsValueType)
+            if (ctorInfo is null)
             {
-                return null;
+                return type.IsValueType
+                    ? () => Activator.CreateInstance(type, nonPublic: false)!
+                    : null;
             }
 
-            return new ConstructorContext(type).CreateInstance!;
+            return () => ctorInfo.Invoke(null);
         }
 
         public override Func<object[], T> CreateParameterizedConstructor<T>(ConstructorInfo constructor)
diff --git a/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.AttributePresence.cs b/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.AttributePresence.cs
index 681d495b8c752..f54692a5c59a4 100644
--- a/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.AttributePresence.cs
+++ b/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.AttributePresence.cs
@@ -39,6 +39,24 @@ public async Task NonPublicCtors_WithJsonConstructorAttribute_WorksAsExpected(Ty
             }
         }
 
+        [Theory]
+        [InlineData(typeof(PrivateParameterlessCtor_WithAttribute), false)]
+        [InlineData(typeof(InternalParameterlessCtor_WithAttribute), true)]
+        [InlineData(typeof(ProtectedParameterlessCtor_WithAttribute), false)]
+        public async Task NonPublicParameterlessCtors_WithJsonConstructorAttribute_WorksAsExpected(Type type, bool isAccessibleBySourceGen)
+        {
+            if (!Serializer.IsSourceGeneratedSerializer || isAccessibleBySourceGen)
+            {
+                object? result = await Serializer.DeserializeWrapper("{}", type);
+                Assert.IsType(type, result);
+            }
+            else
+            {
+                NotSupportedException ex = await Assert.ThrowsAsync<NotSupportedException>(() => Serializer.DeserializeWrapper("{}", type));
+                Assert.Contains("JsonConstructorAttribute", ex.ToString());
+            }
+        }
+
         [Fact]
         public async Task SinglePublicParameterizedCtor_SingleParameterlessCtor_NoAttribute_Supported_UseParameterlessCtor()
         {
diff --git a/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs b/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
index 285c5b7893473..f12cf89e41de5 100644
--- a/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
+++ b/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
@@ -74,6 +74,33 @@ public class ProtectedParameterizedCtor_WithAttribute
         protected ProtectedParameterizedCtor_WithAttribute(int x) => X = x;
     }
 
+    public class PrivateParameterlessCtor_WithAttribute
+    {
+        public int X { get; }
+
+        [JsonConstructor]
+        private PrivateParameterlessCtor_WithAttribute()
+            => X = 42;
+    }
+
+    public class ProtectedParameterlessCtor_WithAttribute
+    {
+        public int X { get; }
+
+        [JsonConstructor]
+        protected ProtectedParameterlessCtor_WithAttribute()
+            => X = 42;
+    }
+
+    public class InternalParameterlessCtor_WithAttribute
+    {
+        public int X { get; }
+
+        [JsonConstructor]
+        internal InternalParameterlessCtor_WithAttribute()
+            => X = 42;
+    }
+
     public class PrivateParameterlessCtor_InternalParameterizedCtor_WithMultipleAttributes
     {
         [JsonConstructor]
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
index b2a5fd465da76..d1769f491104d 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
@@ -41,6 +41,9 @@ protected ConstructorTests_Metadata(JsonSerializerWrapper stringWrapper)
         [JsonSerializable(typeof(PrivateParameterizedCtor_WithAttribute))]
         [JsonSerializable(typeof(InternalParameterizedCtor_WithAttribute))]
         [JsonSerializable(typeof(ProtectedParameterizedCtor_WithAttribute))]
+        [JsonSerializable(typeof(PrivateParameterlessCtor_WithAttribute))]
+        [JsonSerializable(typeof(InternalParameterlessCtor_WithAttribute))]
+        [JsonSerializable(typeof(ProtectedParameterlessCtor_WithAttribute))]
         [JsonSerializable(typeof(SinglePublicParameterizedCtor))]
         [JsonSerializable(typeof(SingleParameterlessCtor_MultiplePublicParameterizedCtor))]
         [JsonSerializable(typeof(SingleParameterlessCtor_MultiplePublicParameterizedCtor_Struct))]
@@ -186,6 +189,9 @@ public ConstructorTests_Default(JsonSerializerWrapper jsonSerializer) : base(jso
         [JsonSerializable(typeof(PrivateParameterizedCtor_WithAttribute))]
         [JsonSerializable(typeof(InternalParameterizedCtor_WithAttribute))]
         [JsonSerializable(typeof(ProtectedParameterizedCtor_WithAttribute))]
+        [JsonSerializable(typeof(PrivateParameterlessCtor_WithAttribute))]
+        [JsonSerializable(typeof(InternalParameterlessCtor_WithAttribute))]
+        [JsonSerializable(typeof(ProtectedParameterlessCtor_WithAttribute))]
         [JsonSerializable(typeof(SinglePublicParameterizedCtor))]
         [JsonSerializable(typeof(SingleParameterlessCtor_MultiplePublicParameterizedCtor))]
         [JsonSerializable(typeof(SingleParameterlessCtor_MultiplePublicParameterizedCtor_Struct))]

From c79f02af08949a0b2d7b61e5fa40323eb31b64c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 08:32:09 -0700
Subject: [PATCH 04/14] [release/8.0-rc1] Annotate System.Linq.Expressions with
 RequiresDynamicCode (#90616)

* Annotate System.Linq.Expressions with RequiresDynamicCode

All this ended up with an RUC on Expression.Compile due to new arrays.
I could potentially silence this warning with a feature flag, but it is a
real risk, and one that users could maybe work around if alterted to the problem.

* Remove suppression that's no longer needed

* Fix tests for new feature switch behavior

* Update src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

* Typo in Throws call

* Fix assert for net framework

* Respond to PR comments

* Add suppression

* Typo

* Update src/libraries/System.Linq.Expressions/src/Resources/Strings.resx

Co-authored-by: Stephen Toub <stoub@microsoft.com>

* PR feedback

---------

Co-authored-by: Andy Gocke <andy@commentout.net>
Co-authored-by: Andy Gocke <angocke@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
---
 .../TestUtilities/System/AssertExtensions.cs  | 21 +++++++
 .../Expressions/ExpressionResolverBuilder.cs  | 11 +++-
 .../ref/System.Linq.Expressions.cs            |  5 ++
 .../src/CompatibilitySuppressions.xml         | 42 +++++++++++++
 .../src/Resources/Strings.resx                |  3 +
 .../src/System.Linq.Expressions.csproj        |  2 +-
 .../src/System/Dynamic/DynamicObject.cs       |  9 ++-
 .../Dynamic/Utils/CachedReflectionInfo.cs     | 32 ----------
 .../System/Dynamic/Utils/DelegateHelpers.cs   |  9 ++-
 .../src/System/Dynamic/Utils/TypeUtils.cs     | 62 +++++++++++++++++++
 .../Linq/Expressions/BinaryExpression.cs      |  8 ++-
 .../Linq/Expressions/Compiler/AssemblyGen.cs  |  1 +
 .../Compiler/CompilerScope.Storage.cs         |  3 +
 .../Expressions/Compiler/CompilerScope.cs     |  3 +
 .../Expressions/Compiler/DelegateHelpers.cs   |  3 +
 .../Compiler/LambdaCompiler.Binary.cs         |  3 +-
 .../Expressions/Compiler/LambdaCompiler.cs    |  2 +
 .../Linq/Expressions/Compiler/StackSpiller.cs |  1 +
 .../Expressions/Compiler/VariableBinder.cs    |  1 +
 .../src/System/Linq/Expressions/Expression.cs |  5 ++
 .../Interpreter/ArrayOperations.cs            |  5 ++
 .../Interpreter/InstructionList.cs            |  9 +--
 .../Expressions/Interpreter/LightCompiler.cs  |  4 ++
 .../Linq/Expressions/LambdaExpression.cs      | 11 ++++
 .../Linq/Expressions/ListInitExpression.cs    |  4 ++
 .../Linq/Expressions/MethodCallExpression.cs  |  4 ++
 .../Linq/Expressions/NewArrayExpression.cs    | 15 +++++
 .../src/System/Linq/Expressions/Strings.cs    |  8 +++
 .../Linq/Expressions/UnaryExpression.cs       |  4 +-
 .../Runtime/CompilerServices/CallSite.cs      | 53 ++++++++++++----
 .../CompilerServices/CallSiteBinder.cs        |  4 +-
 .../Runtime/CompilerServices/CallSiteOps.cs   |  3 +
 .../CallSiteOpsReflectionCache.cs             | 37 +++++++++++
 .../Arithmetic/BinaryMultiplyTests.cs         | 38 +++++++-----
 .../tests/HelperTypes.cs                      |  2 +
 .../Lifted/LiftedAddCheckedNullableTests.cs   | 13 ++--
 .../tests/Lifted/LiftedAddNullableTests.cs    | 13 ++--
 .../Lifted/LiftedBitwiseAndNullableTests.cs   | 13 ++--
 .../LiftedBitwiseExclusiveOrNullableTests.cs  | 13 ++--
 .../Lifted/LiftedBitwiseOrNullableTests.cs    | 13 ++--
 .../tests/Lifted/LiftedDivideNullableTests.cs | 13 ++--
 .../tests/Lifted/LiftedModuloNullableTests.cs | 13 ++--
 .../LiftedMultiplyCheckedNullableTests.cs     | 13 ++--
 .../Lifted/LiftedMultiplyNullableTests.cs     | 13 ++--
 .../LiftedSubtractCheckedNullableTests.cs     | 13 ++--
 .../Lifted/LiftedSubtractNullableTests.cs     | 13 ++--
 .../tests/SequenceTests/SequenceTests.cs      | 12 ++--
 .../Unary/UnaryDecrementNullableTests.cs      | 20 +++---
 .../tests/Unary/UnaryDecrementTests.cs        |  2 +-
 .../Unary/UnaryIncrementNullableTests.cs      | 20 +++---
 50 files changed, 468 insertions(+), 156 deletions(-)
 create mode 100644 src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOpsReflectionCache.cs

diff --git a/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs b/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
index bf676b7b6f26b..230e4cb4276a4 100644
--- a/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,6 +16,26 @@ public static class AssertExtensions
     {
         private static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
 
+
+        /// <summary>
+        /// Helper for AOT tests that verifies that the compile succeeds, or throws PlatformNotSupported
+        /// when AOT is enabled.
+        /// </summary>
+        public static void ThrowsOnAot<T>(Action action)
+            where T : Exception
+        {
+#if NETCOREAPP // Dynamic code is always supported on .NET Framework
+            if (!RuntimeFeature.IsDynamicCodeSupported)
+            {
+                Assert.Throws<T>(action);
+            }
+            else
+#endif
+            {
+                action();
+            }
+        }
+
         public static void Throws<T>(Action action, string expectedMessage)
             where T : Exception
         {
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/Expressions/ExpressionResolverBuilder.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/Expressions/ExpressionResolverBuilder.cs
index c28b9f00bb4e7..670c62ee2f69a 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/Expressions/ExpressionResolverBuilder.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/Expressions/ExpressionResolverBuilder.cs
@@ -123,6 +123,15 @@ static MethodInfo GetArrayEmptyMethodInfo(Type elementType)
                 return ServiceLookupHelpers.GetArrayEmptyMethodInfo(elementType);
             }
 
+            [UnconditionalSuppressMessage("AotAnalysis", "IL3050:RequiresDynamicCode",
+                Justification = "VerifyAotCompatibility ensures elementType is not a ValueType")]
+            static NewArrayExpression NewArrayInit(Type elementType, IEnumerable<Expression> expr)
+            {
+                Debug.Assert(!ServiceProvider.VerifyAotCompatibility || !elementType.IsValueType, "VerifyAotCompatibility=true will throw during building the IEnumerableCallSite if elementType is a ValueType.");
+
+                return Expression.NewArrayInit(elementType, expr);
+            }
+
             if (callSite.ServiceCallSites.Length == 0)
             {
                 return Expression.Constant(
@@ -130,7 +139,7 @@ static MethodInfo GetArrayEmptyMethodInfo(Type elementType)
                     .Invoke(obj: null, parameters: Array.Empty<object>()));
             }
 
-            return Expression.NewArrayInit(
+            return NewArrayInit(
                 callSite.ItemType,
                 callSite.ServiceCallSites.Select(cs =>
                     Convert(
diff --git a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.cs b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.cs
index 98bfd460ddb96..015cfb079d360 100644
--- a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.cs
+++ b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.cs
@@ -607,9 +607,13 @@ protected Expression(System.Linq.Expressions.ExpressionType nodeType, System.Typ
         public static System.Linq.Expressions.NewExpression New(System.Reflection.ConstructorInfo constructor, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>? arguments, params System.Reflection.MemberInfo[]? members) { throw null; }
         public static System.Linq.Expressions.NewExpression New(System.Reflection.ConstructorInfo constructor, params System.Linq.Expressions.Expression[]? arguments) { throw null; }
         public static System.Linq.Expressions.NewExpression New([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.NonPublicConstructors | System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)] System.Type type) { throw null; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Creating arrays at runtime requires dynamic code generation.")]
         public static System.Linq.Expressions.NewArrayExpression NewArrayBounds(System.Type type, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> bounds) { throw null; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Creating arrays at runtime requires dynamic code generation.")]
         public static System.Linq.Expressions.NewArrayExpression NewArrayBounds(System.Type type, params System.Linq.Expressions.Expression[] bounds) { throw null; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Creating arrays at runtime requires dynamic code generation.")]
         public static System.Linq.Expressions.NewArrayExpression NewArrayInit(System.Type type, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> initializers) { throw null; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Creating arrays at runtime requires dynamic code generation.")]
         public static System.Linq.Expressions.NewArrayExpression NewArrayInit(System.Type type, params System.Linq.Expressions.Expression[] initializers) { throw null; }
         public static System.Linq.Expressions.UnaryExpression Not(System.Linq.Expressions.Expression expression) { throw null; }
         public static System.Linq.Expressions.UnaryExpression Not(System.Linq.Expressions.Expression expression, System.Reflection.MethodInfo? method) { throw null; }
@@ -1028,6 +1032,7 @@ internal MethodCallExpression() { }
         System.Linq.Expressions.Expression System.Linq.Expressions.IArgumentProvider.GetArgument(int index) { throw null; }
         public System.Linq.Expressions.MethodCallExpression Update(System.Linq.Expressions.Expression? @object, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression>? arguments) { throw null; }
     }
+    [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Creating arrays at runtime requires dynamic code generation.")]
     public partial class NewArrayExpression : System.Linq.Expressions.Expression
     {
         internal NewArrayExpression() { }
diff --git a/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml b/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml
index 8185aa8209fa1..bf51da8ccbe29 100644
--- a/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml
+++ b/src/libraries/System.Linq.Expressions/src/CompatibilitySuppressions.xml
@@ -97,6 +97,48 @@
     <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
     <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.Call(System.Linq.Expressions.Expression,System.String,System.Type[],System.Linq.Expressions.Expression[]):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.Call(System.Type,System.String,System.Type[],System.Linq.Expressions.Expression[]):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.ListInit(System.Linq.Expressions.NewExpression,System.Collections.Generic.IEnumerable{System.Linq.Expressions.Expression}):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.ListInit(System.Linq.Expressions.NewExpression,System.Linq.Expressions.Expression[]):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.ListInit(System.Linq.Expressions.NewExpression,System.Reflection.MethodInfo,System.Collections.Generic.IEnumerable{System.Linq.Expressions.Expression}):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Linq.Expressions.Expression.ListInit(System.Linq.Expressions.NewExpression,System.Reflection.MethodInfo,System.Linq.Expressions.Expression[]):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0016</DiagnosticId>
+    <Target>M:System.Runtime.CompilerServices.CallSite`1.Create(System.Runtime.CompilerServices.CallSiteBinder):[T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute]</Target>
+    <Left>ref/net8.0/System.Linq.Expressions.dll</Left>
+    <Right>lib/net8.0/System.Linq.Expressions.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0020</DiagnosticId>
     <Target>M:System.Linq.Expressions.DynamicExpressionVisitor.#ctor</Target>
diff --git a/src/libraries/System.Linq.Expressions/src/Resources/Strings.resx b/src/libraries/System.Linq.Expressions/src/Resources/Strings.resx
index 01f6ec7be8ddc..cfbf09d82e02e 100644
--- a/src/libraries/System.Linq.Expressions/src/Resources/Strings.resx
+++ b/src/libraries/System.Linq.Expressions/src/Resources/Strings.resx
@@ -564,4 +564,7 @@
   <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
     <value>The given key '{0}' was not present in the dictionary.</value>
   </data>
+  <data name="LiftingInExpressionRequiresDynamicCode" xml:space="preserve">
+    <value>Nullable lifting on non-primitive type '{0}' is only supported in expression trees when dynamic code generation is available.</value>
+  </data>
 </root>
diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index 47375e1d82779..08f93036a937d 100644
--- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -3,7 +3,6 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DefineConstants> $(DefineConstants);FEATURE_FAST_CREATE</DefineConstants>
     <NoWarn>$(NoWarn);CA1859</NoWarn>
-    <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
     <!--
       Disable constant propagation so that methods referenced from ILLink.Substitutions.xml don't get inlined
       with a wrong value at library build time and the substitution can still be selected at publish time.
@@ -91,6 +90,7 @@
     <Compile Include="System\Runtime\CompilerServices\CallSite.cs" />
     <Compile Include="System\Runtime\CompilerServices\CallSiteBinder.cs" />
     <Compile Include="System\Runtime\CompilerServices\CallSiteOps.cs" />
+    <Compile Include="System\Runtime\CompilerServices\CallSiteOpsReflectionCache.cs" />
     <Compile Include="System\Runtime\CompilerServices\CallSiteHelpers.cs" />
     <Compile Include="System\Runtime\CompilerServices\DynamicAttribute.cs" />
     <Compile Include="System\Runtime\CompilerServices\DebugInfoGenerator.cs" />
diff --git a/src/libraries/System.Linq.Expressions/src/System/Dynamic/DynamicObject.cs b/src/libraries/System.Linq.Expressions/src/System/Dynamic/DynamicObject.cs
index 351e63d885406..19910ca7cf67c 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Dynamic/DynamicObject.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Dynamic/DynamicObject.cs
@@ -611,8 +611,7 @@ private DynamicMetaObject BuildCallMethodWithResult<TBinder>(MethodInfo method,
                                     Expression.Call(
                                         String_Format_String_ObjectArray,
                                         Expression.Constant(convertFailed),
-                                        Expression.NewArrayInit(
-                                            typeof(object),
+                                        Expression.NewObjectArrayInit(
                                             new TrueReadOnlyCollection<Expression>(
                                                 Expression.Condition(
                                                     Expression.Equal(resultMO.Expression, AstUtils.Null),
@@ -645,7 +644,7 @@ private DynamicMetaObject BuildCallMethodWithResult<TBinder>(MethodInfo method,
                     Expression.Block(
                         new TrueReadOnlyCollection<ParameterExpression>(result, callArgs),
                         new TrueReadOnlyCollection<Expression>(
-                            method != DynamicObject_TryBinaryOperation ? Expression.Assign(callArgs, Expression.NewArrayInit(typeof(object), callArgsValue)) : Expression.Assign(callArgs, callArgsValue[0]),
+                            method != DynamicObject_TryBinaryOperation ? Expression.Assign(callArgs, Expression.NewObjectArrayInit(callArgsValue)) : Expression.Assign(callArgs, callArgsValue[0]),
                             Expression.Condition(
                                 Expression.Call(
                                     GetLimitedSelf(),
@@ -705,7 +704,7 @@ private DynamicMetaObject CallMethodReturnLast<TBinder>(MethodInfo method, TBind
                     Expression.Block(
                         new TrueReadOnlyCollection<ParameterExpression>(result, callArgs),
                         new TrueReadOnlyCollection<Expression>(
-                            Expression.Assign(callArgs, Expression.NewArrayInit(typeof(object), callArgsValue)),
+                            Expression.Assign(callArgs, Expression.NewObjectArrayInit(callArgsValue)),
                             Expression.Condition(
                                 Expression.Call(
                                     GetLimitedSelf(),
@@ -768,7 +767,7 @@ private DynamicMetaObject CallMethodNoResult<TBinder>(MethodInfo method, TBinder
                     Expression.Block(
                         new TrueReadOnlyCollection<ParameterExpression>(callArgs),
                         new TrueReadOnlyCollection<Expression>(
-                            Expression.Assign(callArgs, Expression.NewArrayInit(typeof(object), callArgsValue)),
+                            Expression.Assign(callArgs, Expression.NewObjectArrayInit(callArgsValue)),
                             Expression.Condition(
                                 Expression.Call(
                                     GetLimitedSelf(),
diff --git a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/CachedReflectionInfo.cs b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/CachedReflectionInfo.cs
index fd426b339bafd..7052b27852b41 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/CachedReflectionInfo.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/CachedReflectionInfo.cs
@@ -21,10 +21,6 @@ internal static partial class CachedReflectionInfo
         public static MethodInfo CallSiteOps_SetNotMatched =>
             s_CallSiteOps_SetNotMatched ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.SetNotMatched))!;
 
-        private static MethodInfo? s_CallSiteOps_CreateMatchmaker;
-        public static MethodInfo CallSiteOps_CreateMatchmaker =>
-            s_CallSiteOps_CreateMatchmaker ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.CreateMatchmaker))!;
-
         private static MethodInfo? s_CallSiteOps_GetMatch;
         public static MethodInfo CallSiteOps_GetMatch =>
             s_CallSiteOps_GetMatch ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.GetMatch))!;
@@ -33,34 +29,6 @@ internal static partial class CachedReflectionInfo
         public static MethodInfo CallSiteOps_ClearMatch =>
             s_CallSiteOps_ClearMatch ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.ClearMatch))!;
 
-        private static MethodInfo? s_CallSiteOps_UpdateRules;
-        public static MethodInfo CallSiteOps_UpdateRules =>
-            s_CallSiteOps_UpdateRules ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.UpdateRules))!;
-
-        private static MethodInfo? s_CallSiteOps_GetRules;
-        public static MethodInfo CallSiteOps_GetRules =>
-            s_CallSiteOps_GetRules ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.GetRules))!;
-
-        private static MethodInfo? s_CallSiteOps_GetRuleCache;
-        public static MethodInfo CallSiteOps_GetRuleCache =>
-            s_CallSiteOps_GetRuleCache ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.GetRuleCache))!;
-
-        private static MethodInfo? s_CallSiteOps_GetCachedRules;
-        public static MethodInfo CallSiteOps_GetCachedRules =>
-            s_CallSiteOps_GetCachedRules ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.GetCachedRules))!;
-
-        private static MethodInfo? s_CallSiteOps_AddRule;
-        public static MethodInfo CallSiteOps_AddRule =>
-            s_CallSiteOps_AddRule ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.AddRule))!;
-
-        private static MethodInfo? s_CallSiteOps_MoveRule;
-        public static MethodInfo CallSiteOps_MoveRule =>
-            s_CallSiteOps_MoveRule ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.MoveRule))!;
-
-        private static MethodInfo? s_CallSiteOps_Bind;
-        public static MethodInfo CallSiteOps_Bind =>
-            s_CallSiteOps_Bind ??= typeof(CallSiteOps).GetMethod(nameof(CallSiteOps.Bind))!;
-
         private static MethodInfo? s_DynamicObject_TryGetMember;
         public static MethodInfo DynamicObject_TryGetMember =>
             s_DynamicObject_TryGetMember ??= typeof(DynamicObject).GetMethod(nameof(DynamicObject.TryGetMember))!;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/DelegateHelpers.cs b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/DelegateHelpers.cs
index 011322a2454ad..f49cba9afdd2b 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/DelegateHelpers.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/DelegateHelpers.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
@@ -55,7 +56,10 @@ internal static Delegate CreateObjectArrayDelegate(Type delegateType, Func<objec
         {
             if (CanEmitObjectArrayDelegate)
             {
+#pragma warning disable IL3050
+                // Suppress analyzer warnings since they don't currently support feature flags
                 return CreateObjectArrayDelegateRefEmit(delegateType, handler);
+#pragma warning restore IL3050
             }
             else
             {
@@ -100,8 +104,7 @@ public static TReturn FuncThunk2<T1, T2, TReturn>(Func<object?[], object> handle
             return (TReturn)handler(new object?[]{t1, t2});
         }
 
-        private static MethodInfo GetEmptyObjectArrayMethod() =>
-            typeof(Array).GetMethod(nameof(Array.Empty))!.MakeGenericMethod(typeof(object));
+        private static MethodInfo GetEmptyObjectArrayMethod() => ((Func<object[]>)Array.Empty<object>).GetMethodInfo();
 
         private static MethodInfo[] GetActionThunks()
         {
@@ -121,6 +124,7 @@ private static MethodInfo[] GetFuncThunks()
 
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2060:MakeGenericMethod",
             Justification = "The above ActionThunk and FuncThunk methods don't have trimming annotations.")]
+        [RequiresDynamicCode(Expression.GenericMethodRequiresDynamicCode)]
         private static MethodInfo? GetCSharpThunk(Type returnType, bool hasReturnValue, ParameterInfo[] parameters)
         {
             try
@@ -193,6 +197,7 @@ private static MethodInfo[] GetFuncThunks()
         //      param0 = (T0)args[0];   // only generated for each byref argument
         // }
         // return (TRet)ret;
+        [RequiresDynamicCode("Ref emit requires dynamic code.")]
         private static Delegate CreateObjectArrayDelegateRefEmit(Type delegateType, Func<object?[], object?> handler)
         {
             if (!s_thunks.TryGetValue(delegateType, out MethodInfo? thunkMethod))
diff --git a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs
index 1d0fca59e3068..f15f09139f70a 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Dynamic/Utils/TypeUtils.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace System.Dynamic.Utils
 {
@@ -20,6 +21,7 @@ internal static class TypeUtils
 
         public static Type GetNonNullableType(this Type type) => IsNullableType(type) ? type.GetGenericArguments()[0] : type;
 
+        [RequiresDynamicCode("Creating nullable types requires dynamic code.")]
         public static Type GetNullableType(this Type type)
         {
             Debug.Assert(type != null, "type cannot be null");
@@ -31,6 +33,66 @@ public static Type GetNullableType(this Type type)
             return type;
         }
 
+        /// <summary>
+        /// This is an alternative to <see cref="GetNullableType" /> that will throw
+        /// if dynamic code is required. Some common primitive types are special-cased.
+        /// </summary>
+        public static Type LiftPrimitiveOrThrow(this Type type)
+        {
+            if (RuntimeFeature.IsDynamicCodeSupported)
+            {
+#pragma warning disable IL3050
+                // Analyzer doesn't yet understand feature switches
+                return GetNullableType(type);
+#pragma warning restore IL3050
+            }
+            if (!type.IsValueType || IsNullableType(type))
+            {
+                return type;
+            }
+            switch (type.GetTypeCode())
+            {
+                case TypeCode.Boolean:
+                    return typeof(bool?);
+                case TypeCode.Int32:
+                    return typeof(int?);
+                case TypeCode.Int64:
+                    return typeof(long?);
+                case TypeCode.Single:
+                    return typeof(float?);
+                case TypeCode.Double:
+                    return typeof(double?);
+                case TypeCode.UInt32:
+                    return typeof(uint?);
+                case TypeCode.UInt64:
+                    return typeof(ulong?);
+                case TypeCode.Byte:
+                    return typeof(byte?);
+                case TypeCode.SByte:
+                    return typeof(sbyte?);
+                case TypeCode.Int16:
+                    return typeof(short?);
+                case TypeCode.UInt16:
+                    return typeof(ushort?);
+                case TypeCode.Char:
+                    return typeof(char?);
+                case TypeCode.Decimal:
+                    return typeof(decimal?);
+                case TypeCode.DateTime:
+                    return typeof(DateTime?);
+                default:
+                    if (type == typeof(DateTimeOffset))
+                    {
+                        return typeof(DateTimeOffset?);
+                    }
+                    else if (type == typeof(TimeSpan))
+                    {
+                        return typeof(TimeSpan?);
+                    }
+                    throw new NotSupportedException(Strings.LiftingInExpressionRequiresDynamicCode(type));
+            }
+        }
+
         public static ConstructorInfo GetNullableConstructor(Type nullableType)
         {
             Debug.Assert(nullableType.IsNullableType());
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs
index 4e54bed886f05..620e091d5cf49 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/BinaryExpression.cs
@@ -437,6 +437,8 @@ internal Expression ReduceUserdefinedLifted()
         [DynamicDependency("GetValueOrDefault", typeof(Nullable<>))]
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
             Justification = "The method will be preserved by the DynamicDependency.")]
+        [UnconditionalSuppressMessage("DynamicCode", "IL3050",
+            Justification = "GetValueOrDefault is not generic and therefore MakeGenericMethod will not be called")]
         private static MethodCallExpression CallGetValueOrDefault(ParameterExpression nullable)
         {
             return Call(nullable, "GetValueOrDefault", null);
@@ -615,7 +617,7 @@ public static BinaryExpression Assign(Expression left, Expression right)
                 {
                     if (method.ReturnType != typeof(bool) || liftToNull)
                     {
-                        return new MethodBinaryExpression(binaryType, left, right, method.ReturnType.GetNullableType(), method);
+                        return new MethodBinaryExpression(binaryType, left, right, method.ReturnType.LiftPrimitiveOrThrow(), method);
                     }
                     else
                     {
@@ -647,7 +649,7 @@ private static BinaryExpression GetMethodBasedBinaryOperator(ExpressionType bina
             {
                 if (method.ReturnType != typeof(bool) || liftToNull)
                 {
-                    return new MethodBinaryExpression(binaryType, left, right, method.ReturnType.GetNullableType(), method);
+                    return new MethodBinaryExpression(binaryType, left, right, method.ReturnType.LiftPrimitiveOrThrow(), method);
                 }
                 else
                 {
@@ -2236,7 +2238,7 @@ private static Type GetResultTypeOfShift(Type left, Type right)
             if (!left.IsNullableType() && right.IsNullableType())
             {
                 // lift the result type to Nullable<T>
-                return typeof(Nullable<>).MakeGenericType(left);
+                return left.LiftPrimitiveOrThrow();
             }
             return left;
         }
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/AssemblyGen.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/AssemblyGen.cs
index 1619aa3a0bf90..bf4827050dff5 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/AssemblyGen.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/AssemblyGen.cs
@@ -10,6 +10,7 @@
 
 namespace System.Linq.Expressions.Compiler
 {
+    [RequiresDynamicCode("Assembly generation requires dynamic code generation.")]
     internal sealed class AssemblyGen
     {
         private static AssemblyGen? s_assembly;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs
index e60561d19b28a..084a13e25161d 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.Storage.cs
@@ -1,6 +1,7 @@
 // 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.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
@@ -98,6 +99,7 @@ internal override void EmitAddress()
             }
         }
 
+        [RequiresDynamicCode(Expression.StrongBoxRequiresDynamicCode)]
         private sealed class ElementBoxStorage : Storage
         {
             private readonly int _index;
@@ -153,6 +155,7 @@ internal void EmitLoadBox()
             }
         }
 
+        [RequiresDynamicCode(Expression.StrongBoxRequiresDynamicCode)]
         private sealed class LocalBoxStorage : Storage
         {
             private readonly LocalBuilder _boxLocal;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs
index a866e7b7a779e..0bf51d4af5d07 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/CompilerScope.cs
@@ -9,6 +9,7 @@
 using System.Dynamic.Utils;
 using static System.Linq.Expressions.CachedReflectionInfo;
 using System.Collections;
+using System.Diagnostics.CodeAnalysis;
 
 namespace System.Linq.Expressions.Compiler
 {
@@ -28,6 +29,7 @@ internal enum VariableStorageKind
     /// Instances are produced by VariableBinder, which does a tree walk
     /// looking for scope nodes: LambdaExpression, BlockExpression, and CatchBlock.
     /// </summary>
+    [RequiresDynamicCode(Expression.StrongBoxRequiresDynamicCode)]
     internal sealed partial class CompilerScope
     {
         /// <summary>
@@ -394,6 +396,7 @@ private bool ShouldCache(ParameterExpression v)
             return ReferenceCount.TryGetValue(v, out refCount) && ShouldCache(v, refCount);
         }
 
+        [RequiresDynamicCode(Expression.StrongBoxRequiresDynamicCode)]
         private void CacheBoxToLocal(LambdaCompiler lc, ParameterExpression v)
         {
             Debug.Assert(ShouldCache(v) && !_locals.ContainsKey(v));
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs
index 651c1811938d3..aa940367777db 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs
@@ -119,10 +119,13 @@ private static System.Reflection.TypeInfo MakeNewCustomDelegate(Type[] types)
                 const MethodImplAttributes implAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
                 const MethodAttributes invokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
 
+#pragma warning disable IL3050
+                // Suppress analyzer warnings since they don't currently support feature flags
                 TypeBuilder builder = AssemblyGen.DefineDelegateType("Delegate" + types.Length);
                 builder.DefineConstructor(ctorAttributes, CallingConventions.Standard, delegateCtorSignature).SetImplementationFlags(implAttributes);
                 builder.DefineMethod("Invoke", invokeAttributes, returnType, parameters).SetImplementationFlags(implAttributes);
                 return builder.CreateTypeInfo();
+#pragma warning restore IL3050
             }
             else
             {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs
index c4e448a2dce29..63f2752b46f10 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.Binary.cs
@@ -5,6 +5,7 @@
 using System.Dynamic.Utils;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 using static System.Linq.Expressions.CachedReflectionInfo;
 
 namespace System.Linq.Expressions.Compiler
@@ -99,7 +100,7 @@ private void EmitBinaryMethod(BinaryExpression b, CompilationFlags flags)
                 Type resultType;
                 if (b.IsLiftedToNull)
                 {
-                    resultType = mc.Type.GetNullableType();
+                    resultType = mc.Type.LiftPrimitiveOrThrow();
                 }
                 else
                 {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.cs
index 0f1417d514537..2fc78ace54d03 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/LambdaCompiler.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Dynamic.Utils;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -23,6 +24,7 @@ internal interface ILocalCache
     /// contain multiple lambdas, the Compiler class is responsible for compiling the whole tree, individual
     /// lambdas are then compiled by the LambdaCompiler.
     /// </summary>
+    [RequiresDynamicCode(Expression.LambdaCompilerRequiresDynamicCode)]
     internal sealed partial class LambdaCompiler : ILocalCache
     {
         private static int s_lambdaMethodIndex;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs
index 010ce554fa746..4012dd1ebbd8b 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/StackSpiller.cs
@@ -462,6 +462,7 @@ private Result RewriteMethodCallExpression(Expression expr, Stack stack)
             return cr.Finish(expr);
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private Result RewriteNewArrayExpression(Expression expr, Stack stack)
         {
             var node = (NewArrayExpression)expr;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs
index 49279e00688ef..1fb5442ac7353 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/VariableBinder.cs
@@ -13,6 +13,7 @@ namespace System.Linq.Expressions.Compiler
     /// Determines if variables are closed over in nested lambdas and need to
     /// be hoisted.
     /// </summary>
+    [RequiresDynamicCode(Expression.StrongBoxRequiresDynamicCode)]
     internal sealed class VariableBinder : ExpressionVisitor
     {
         private readonly AnalyzedTree _tree = new AnalyzedTree();
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs
index 1f522c0f8d3b2..690f234fae729 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Expression.cs
@@ -20,6 +20,11 @@ public abstract partial class Expression
         internal const string ExpressionRequiresUnreferencedCode = "Creating Expressions requires unreferenced code because the members being referenced by the Expression may be trimmed.";
         internal const string PropertyFromAccessorRequiresUnreferencedCode = "The Property metadata or other accessor may be trimmed.";
         internal const string GenericMethodRequiresUnreferencedCode = "Calling a generic method cannot be statically analyzed. It's not possible to guarantee the availability of requirements of the generic method. This can be suppressed if the method is not generic.";
+        internal const string GenericMethodRequiresDynamicCode = "Calling a generic method requires dynamic code generation. This can be suppressed if the method is not generic.";
+        internal const string CallSiteRequiresDynamicCode = "Creating a call site may require dynamic code generation.";
+        internal const string LambdaCompilerRequiresDynamicCode = "Compiling a lambda expression requires dynamic code generation.";
+        internal const string StrongBoxRequiresDynamicCode = "Creating a StrongBox requires dynamic code generation.";
+        internal const string NewArrayRequiresDynamicCode = "Creating arrays at runtime requires dynamic code generation.";
 
         private static readonly CacheDict<Type, MethodInfo> s_lambdaDelegateCache = new CacheDict<Type, MethodInfo>(40);
         private static volatile CacheDict<Type, Func<Expression, string?, bool, ReadOnlyCollection<ParameterExpression>, LambdaExpression>>? s_lambdaFactories;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/ArrayOperations.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/ArrayOperations.cs
index ba16d0998d4ab..bc8d0f13a2e31 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/ArrayOperations.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/ArrayOperations.cs
@@ -1,8 +1,11 @@
 // 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;
+
 namespace System.Linq.Expressions.Interpreter
 {
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     internal sealed class NewArrayInitInstruction : Instruction
     {
         private readonly Type _elementType;
@@ -30,6 +33,7 @@ public override int Run(InterpretedFrame frame)
         }
     }
 
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     internal sealed class NewArrayInstruction : Instruction
     {
         private readonly Type _elementType;
@@ -54,6 +58,7 @@ public override int Run(InterpretedFrame frame)
         }
     }
 
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     internal sealed class NewArrayBoundsInstruction : Instruction
     {
         private readonly Type _elementType;
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/InstructionList.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/InstructionList.cs
index 1b0e18cc0318d..c3cac4e6078a3 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/InstructionList.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/InstructionList.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Dynamic.Utils;
+using System.Diagnostics.CodeAnalysis;
 
 namespace System.Linq.Expressions.Interpreter
 {
@@ -633,16 +634,16 @@ public void EmitSetArrayItem()
             Emit(SetArrayItemInstruction.Instance);
         }
 
-        public void EmitNewArray(Type elementType)
-        {
-            Emit(new NewArrayInstruction(elementType));
-        }
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
+        public void EmitNewArray(Type elementType) => Emit(new NewArrayInstruction(elementType));
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public void EmitNewArrayBounds(Type elementType, int rank)
         {
             Emit(new NewArrayBoundsInstruction(elementType, rank));
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public void EmitNewArrayInit(Type elementType, int elementCount)
         {
             Emit(new NewArrayInitInstruction(elementType, elementCount));
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/LightCompiler.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/LightCompiler.cs
index 2424fd75c352e..eae0ca0433a41 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/LightCompiler.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Interpreter/LightCompiler.cs
@@ -2509,8 +2509,12 @@ private void CompileMember(Expression? from, MemberInfo member, bool forBinding)
             }
         }
 
+        [UnconditionalSuppressMessage("DynamicDependency", "IL3050",
+            Justification = "NewArrayExpression has RequiresDynamicCode, so the only way to get here is by already "
+                + "seeing a warning.")]
         private void CompileNewArrayExpression(Expression expr)
         {
+            Debug.Assert(typeof(NewArrayExpression).GetCustomAttribute<RequiresDynamicCodeAttribute>() is not null);
             var node = (NewArrayExpression)expr;
 
             foreach (Expression arg in node.Expressions)
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs
index f4c2aa2f74baf..9b22fc9bc6e95 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/LambdaExpression.cs
@@ -138,7 +138,10 @@ public Delegate Compile()
         {
             if (CanCompileToIL)
             {
+#pragma warning disable IL3050
+                // Analyzer doesn't yet understand feature switches
                 return Compiler.LambdaCompiler.Compile(this);
+#pragma warning restore IL3050
             }
             else
             {
@@ -218,7 +221,10 @@ internal Expression(Expression body)
         {
             if (CanCompileToIL)
             {
+#pragma warning disable IL3050
+                // Analyzer doesn't yet understand feature switches
                 return (TDelegate)(object)Compiler.LambdaCompiler.Compile(this);
+#pragma warning restore IL3050
             }
             else
             {
@@ -607,6 +613,8 @@ public partial class Expression
         /// Creates an Expression{T} given the delegate type. Caches the
         /// factory method to speed up repeated creations for the same T.
         /// </summary>
+        [UnconditionalSuppressMessage("DynamicCode", "IL3050",
+            Justification = "MakeGenericType is only used for a Type that should be a delegate type, which are always reference types.")]
         internal static LambdaExpression CreateLambda(Type delegateType, Expression body, string? name, bool tailCall, ReadOnlyCollection<ParameterExpression> parameters)
         {
             // Get or create a delegate to the public Expression.Lambda<T>
@@ -621,7 +629,10 @@ internal static LambdaExpression CreateLambda(Type delegateType, Expression body
                 MethodInfo create;
                 if (LambdaExpression.CanCompileToIL)
                 {
+#pragma warning disable IL3050
+                    // Analyzer doesn't yet understand feature switches
                     create = typeof(Expression<>).MakeGenericType(delegateType).GetMethod("Create", BindingFlags.Static | BindingFlags.NonPublic)!;
+#pragma warning restore IL3050
                 }
                 else
                 {
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ListInitExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ListInitExpression.cs
index 42252e3eef617..65360e48100c7 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ListInitExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ListInitExpression.cs
@@ -105,6 +105,7 @@ public partial class Expression
         /// <param name="initializers">An array of <see cref="Expression"/> objects to use to populate the <see cref="ListInitExpression.Initializers"/> collection.</param>
         /// <returns>A <see cref="ListInitExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.ListInit"/> and the <see cref="ListInitExpression.NewExpression"/> property set to the specified value.</returns>
         [RequiresUnreferencedCode(ExpressionRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static ListInitExpression ListInit(NewExpression newExpression, params Expression[] initializers)
         {
             return ListInit(newExpression, initializers as IEnumerable<Expression>);
@@ -117,6 +118,7 @@ public static ListInitExpression ListInit(NewExpression newExpression, params Ex
         /// <param name="initializers">An <see cref="IEnumerable{T}"/> that contains <see cref="Expressions.ElementInit"/> objects to use to populate the <see cref="ListInitExpression.Initializers"/> collection.</param>
         /// <returns>A <see cref="ListInitExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.ListInit"/> and the <see cref="ListInitExpression.NewExpression"/> property set to the specified value.</returns>
         [RequiresUnreferencedCode(ExpressionRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static ListInitExpression ListInit(NewExpression newExpression, IEnumerable<Expression> initializers)
         {
             ArgumentNullException.ThrowIfNull(newExpression);
@@ -140,6 +142,7 @@ public static ListInitExpression ListInit(NewExpression newExpression, IEnumerab
         /// <param name="initializers">An array of <see cref="Expression"/> objects to use to populate the <see cref="ListInitExpression.Initializers"/> collection.</param>
         /// <returns>A <see cref="ListInitExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.ListInit"/> and the <see cref="ListInitExpression.NewExpression"/> property set to the specified value.</returns>
         [RequiresUnreferencedCode(ExpressionRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static ListInitExpression ListInit(NewExpression newExpression, MethodInfo? addMethod, params Expression[] initializers)
         {
             return ListInit(newExpression, addMethod, initializers as IEnumerable<Expression>);
@@ -153,6 +156,7 @@ public static ListInitExpression ListInit(NewExpression newExpression, MethodInf
         /// <param name="initializers">An <see cref="IEnumerable{T}"/> that contains <see cref="Expression"/> objects to use to populate the Initializers collection.</param>
         /// <returns>A <see cref="ListInitExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.ListInit"/> and the <see cref="ListInitExpression.NewExpression"/> property set to the specified value.</returns>
         [RequiresUnreferencedCode(ExpressionRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static ListInitExpression ListInit(NewExpression newExpression, MethodInfo? addMethod, IEnumerable<Expression> initializers)
         {
             if (addMethod == null)
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/MethodCallExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/MethodCallExpression.cs
index edd4adc5a3dd2..9bc4d295cb55d 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/MethodCallExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/MethodCallExpression.cs
@@ -1138,6 +1138,7 @@ public static MethodCallExpression Call(Expression? instance, MethodInfo method,
         /// <paramref name="instance"/> or <paramref name="methodName"/> is null.</exception>
         /// <exception cref="InvalidOperationException">No method whose name is <paramref name="methodName"/>, whose type parameters match <paramref name="typeArguments"/>, and whose parameter types match <paramref name="arguments"/> is found in <paramref name="instance"/>.Type or its base types.-or-More than one method whose name is <paramref name="methodName"/>, whose type parameters match <paramref name="typeArguments"/>, and whose parameter types match <paramref name="arguments"/> is found in <paramref name="instance"/>.Type or its base types.</exception>
         [RequiresUnreferencedCode(ExpressionRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static MethodCallExpression Call(Expression instance, string methodName, Type[]? typeArguments, params Expression[]? arguments)
         {
             ArgumentNullException.ThrowIfNull(instance);
@@ -1161,6 +1162,7 @@ public static MethodCallExpression Call(Expression instance, string methodName,
         /// <paramref name="type"/> or <paramref name="methodName"/> is null.</exception>
         /// <exception cref="InvalidOperationException">No method whose name is <paramref name="methodName"/>, whose type parameters match <paramref name="typeArguments"/>, and whose parameter types match <paramref name="arguments"/> is found in <paramref name="type"/> or its base types.-or-More than one method whose name is <paramref name="methodName"/>, whose type parameters match <paramref name="typeArguments"/>, and whose parameter types match <paramref name="arguments"/> is found in <paramref name="type"/> or its base types.</exception>
         [RequiresUnreferencedCode(GenericMethodRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         public static MethodCallExpression Call(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type type,
             string methodName,
@@ -1291,6 +1293,7 @@ private static bool TryQuote(Type parameterType, ref Expression argument)
         }
 
         [RequiresUnreferencedCode(GenericMethodRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         private static MethodInfo? FindMethod(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type type,
             string methodName,
@@ -1366,6 +1369,7 @@ private static bool IsCompatible(MethodBase m, Expression[] arguments)
         }
 
         [RequiresUnreferencedCode(GenericMethodRequiresUnreferencedCode)]
+        [RequiresDynamicCode(GenericMethodRequiresDynamicCode)]
         private static MethodInfo? ApplyTypeArgs(MethodInfo m, Type[]? typeArgs)
         {
             if (typeArgs == null || typeArgs.Length == 0)
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/NewArrayExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/NewArrayExpression.cs
index 9f6fa33f801a8..05f97c0f15ad3 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/NewArrayExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/NewArrayExpression.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Dynamic.Utils;
 using System.Runtime.CompilerServices;
 
@@ -13,6 +14,7 @@ namespace System.Linq.Expressions
     /// Represents creating a new array and possibly initializing the elements of the new array.
     /// </summary>
     [DebuggerTypeProxy(typeof(NewArrayExpressionProxy))]
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     public class NewArrayExpression : Expression
     {
         internal NewArrayExpression(Type type, ReadOnlyCollection<Expression> expressions)
@@ -76,6 +78,7 @@ public NewArrayExpression Update(IEnumerable<Expression> expressions)
         }
     }
 
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     internal sealed class NewArrayInitExpression : NewArrayExpression
     {
         internal NewArrayInitExpression(Type type, ReadOnlyCollection<Expression> expressions)
@@ -91,6 +94,7 @@ internal NewArrayInitExpression(Type type, ReadOnlyCollection<Expression> expres
         public sealed override ExpressionType NodeType => ExpressionType.NewArrayInit;
     }
 
+    [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
     internal sealed class NewArrayBoundsExpression : NewArrayExpression
     {
         internal NewArrayBoundsExpression(Type type, ReadOnlyCollection<Expression> expressions)
@@ -115,6 +119,7 @@ public partial class Expression
         /// <param name="type">A Type that represents the element type of the array.</param>
         /// <param name="initializers">The expressions used to create the array elements.</param>
         /// <returns>A <see cref="NewArrayExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.NewArrayInit"/> and the <see cref="NewArrayExpression.Expressions"/> property set to the specified value.</returns>
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static NewArrayExpression NewArrayInit(Type type, params Expression[] initializers)
         {
             return NewArrayInit(type, (IEnumerable<Expression>)initializers);
@@ -126,6 +131,7 @@ public static NewArrayExpression NewArrayInit(Type type, params Expression[] ini
         /// <param name="type">A Type that represents the element type of the array.</param>
         /// <param name="initializers">The expressions used to create the array elements.</param>
         /// <returns>A <see cref="NewArrayExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.NewArrayInit"/> and the <see cref="NewArrayExpression.Expressions"/> property set to the specified value.</returns>
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static NewArrayExpression NewArrayInit(Type type, IEnumerable<Expression> initializers)
         {
             ArgumentNullException.ThrowIfNull(type);
@@ -172,6 +178,13 @@ public static NewArrayExpression NewArrayInit(Type type, IEnumerable<Expression>
             return NewArrayExpression.Make(ExpressionType.NewArrayInit, type.MakeArrayType(), initializerList);
         }
 
+        [UnconditionalSuppressMessage("DynamicCode", "IL3050",
+            Justification = "Creating object arrays should always be possible, as it is fundamental to the runtime.")]
+        internal static NewArrayExpression NewObjectArrayInit(IEnumerable<Expression> initializers)
+        {
+            return NewArrayInit(typeof(object), initializers);
+        }
+
         #endregion
 
         #region NewArrayBounds
@@ -182,6 +195,7 @@ public static NewArrayExpression NewArrayInit(Type type, IEnumerable<Expression>
         /// <param name="type">A <see cref="System.Type"/> that represents the element type of the array.</param>
         /// <param name="bounds">An array that contains Expression objects to use to populate the <see cref="NewArrayExpression.Expressions"/> collection.</param>
         /// <returns>A <see cref="NewArrayExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.NewArrayBounds"/> and the <see cref="NewArrayExpression.Expressions"/> property set to the specified value.</returns>
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static NewArrayExpression NewArrayBounds(Type type, params Expression[] bounds)
         {
             return NewArrayBounds(type, (IEnumerable<Expression>)bounds);
@@ -193,6 +207,7 @@ public static NewArrayExpression NewArrayBounds(Type type, params Expression[] b
         /// <param name="type">A <see cref="System.Type"/> that represents the element type of the array.</param>
         /// <param name="bounds">An <see cref="IEnumerable{T}"/> that contains <see cref="Expression"/> objects to use to populate the <see cref="NewArrayExpression.Expressions"/> collection.</param>
         /// <returns>A <see cref="NewArrayExpression"/> that has the <see cref="NodeType"/> property equal to <see cref="ExpressionType.NewArrayBounds"/> and the <see cref="NewArrayExpression.Expressions"/> property set to the specified value.</returns>
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static NewArrayExpression NewArrayBounds(Type type, IEnumerable<Expression> bounds)
         {
             ArgumentNullException.ThrowIfNull(type);
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Strings.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Strings.cs
index b1f53512b8dcd..f94674d28dd8d 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Strings.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Strings.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.CompilerServices;
+
 namespace System.Linq.Expressions
 {
     /// <summary>
@@ -8,6 +10,12 @@ namespace System.Linq.Expressions
     /// </summary>
     internal static class Strings
     {
+        /// <summary>
+        /// A string like "Operation is not supported when dynamic code generation is not available."
+        /// </summary>
+        internal static string LiftingInExpressionRequiresDynamicCode(Type type)
+                => SR.Format(SR.LiftingInExpressionRequiresDynamicCode, type.FullName);
+
         /// <summary>
         /// A string like "reducible nodes must override Expression.Reduce()"
         /// </summary>
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/UnaryExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/UnaryExpression.cs
index 085249f96823e..43fb67f9f419e 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/UnaryExpression.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/UnaryExpression.cs
@@ -371,7 +371,7 @@ private static UnaryExpression GetUserDefinedUnaryOperatorOrThrow(ExpressionType
                 method = nnOperandType.GetAnyStaticMethodValidated(name, types);
                 if (method != null && method.ReturnType.IsValueType && !method.ReturnType.IsNullableType())
                 {
-                    return new UnaryExpression(unaryType, operand, method.ReturnType.GetNullableType(), method);
+                    return new UnaryExpression(unaryType, operand, method.ReturnType.LiftPrimitiveOrThrow(), method);
                 }
             }
             return null;
@@ -394,7 +394,7 @@ private static UnaryExpression GetMethodBasedUnaryOperator(ExpressionType unaryT
                 ParameterIsAssignable(pms[0], operand.Type.GetNonNullableType()) &&
                 method.ReturnType.IsValueType && !method.ReturnType.IsNullableType())
             {
-                return new UnaryExpression(unaryType, operand, method.ReturnType.GetNullableType(), method);
+                return new UnaryExpression(unaryType, operand, method.ReturnType.LiftPrimitiveOrThrow(), method);
             }
 
             throw Error.OperandTypesDoNotMatchParameters(unaryType, method.Name);
diff --git a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs
index dce9473a287df..bb3b579e4a1ee 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSite.cs
@@ -9,6 +9,8 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
+using System.Threading.Tasks.Sources;
 using static System.Linq.Expressions.CachedReflectionInfo;
 
 namespace System.Runtime.CompilerServices
@@ -80,6 +82,8 @@ internal CallSite(CallSiteBinder? binder)
         /// <param name="delegateType">The CallSite delegate type.</param>
         /// <param name="binder">The CallSite binder.</param>
         /// <returns>The new CallSite.</returns>
+        [UnconditionalSuppressMessage("DynamicCode", "IL3050",
+            Justification = "MakeGenericType is only used for a Type that should be a delegate type, which are always reference types.")]
         public static CallSite Create(Type delegateType, CallSiteBinder binder)
         {
             ArgumentNullException.ThrowIfNull(delegateType);
@@ -160,6 +164,7 @@ public T Update
         // Cached noMatch delegate for all sites with a given T
         private static volatile T? s_cachedNoMatch;
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private CallSite(CallSiteBinder binder)
             : base(binder)
         {
@@ -206,6 +211,7 @@ internal void ReleaseMatchmaker(CallSite matchMaker)
         /// </summary>
         /// <param name="binder">The binder responsible for the runtime binding of the dynamic operations at this call site.</param>
         /// <returns>The new instance of dynamic call site.</returns>
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static CallSite<T> Create(CallSiteBinder binder)
         {
             if (!typeof(T).IsSubclassOf(typeof(MulticastDelegate))) throw System.Linq.Expressions.Error.TypeMustBeDerivedFromSystemDelegate();
@@ -213,6 +219,7 @@ public static CallSite<T> Create(CallSiteBinder binder)
             return new CallSite<T>(binder);
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private T GetUpdateDelegate()
         {
             // This is intentionally non-static to speed up creation - in particular MakeUpdateDelegate
@@ -221,6 +228,7 @@ private T GetUpdateDelegate()
             return GetUpdateDelegate(ref s_cachedUpdate);
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private T GetUpdateDelegate(ref T? addr) =>
             // reduce creation cost by not using Interlocked.CompareExchange.  Calling I.CE causes
             // us to spend 25% of our creation time in JIT_GenericHandle.  Instead we'll rarely
@@ -272,6 +280,7 @@ internal void MoveRule(int i)
             }
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         internal T MakeUpdateDelegate()
         {
             Type target = typeof(T);
@@ -280,7 +289,10 @@ internal T MakeUpdateDelegate()
             if (System.Linq.Expressions.LambdaExpression.CanCompileToIL
                 && target.IsGenericType && IsSimpleSignature(invoke, out Type[] args))
             {
+#pragma warning disable IL3050
+                // Analyzer doesn't yet understand feature switches
                 return MakeUpdateDelegateWhenCanCompileToIL();
+#pragma warning restore IL3050
             }
 
             s_cachedNoMatch = CreateCustomNoMatchDelegate(invoke);
@@ -289,6 +301,7 @@ internal T MakeUpdateDelegate()
 
             [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2060:MakeGenericMethod",
                 Justification = "UpdateDelegates methods don't have ILLink annotations.")]
+            [RequiresDynamicCode(Expression.GenericMethodRequiresDynamicCode)]
             T MakeUpdateDelegateWhenCanCompileToIL()
             {
                 MethodInfo? method = null;
@@ -346,8 +359,7 @@ private static bool IsSimpleSignature(MethodInfo invoke, out Type[] sig)
             return supported;
         }
 
-        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2060:MakeGenericMethod",
-            Justification = "CallSiteOps methods don't have trimming annotations.")]
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private T CreateCustomUpdateDelegate(MethodInfo invoke)
         {
             Type returnType = invoke.GetReturnType();
@@ -394,7 +406,9 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
                 Expression.Assign(
                     site,
                     Expression.Call(
-                        CallSiteOps_CreateMatchmaker.MakeGenericMethod(typeArgs),
+#pragma warning disable CS0618 // CallSiteOps.CreateMatchmaker is obsolete
+                        CallSiteOpsReflectionCache<T>.CreateMatchmaker,
+#pragma warning restore CS0618
                         @this
                     )
                 )
@@ -409,7 +423,9 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
             Expression invokeRule = Expression.Invoke(rule, new TrueReadOnlyCollection<Expression>(@params));
 
             Expression onMatch = Expression.Call(
-                CallSiteOps_UpdateRules.MakeGenericMethod(typeArgs),
+#pragma warning disable CS0618 // CallSiteOps is obsolete
+                CallSiteOpsReflectionCache<T>.UpdateRules,
+#pragma warning restore CS0618
                 @this,
                 index
             );
@@ -453,7 +469,9 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
                         Expression.Assign(
                             applicable,
                             Expression.Call(
-                                CallSiteOps_GetRules.MakeGenericMethod(typeArgs),
+#pragma warning disable CS0618 // CallSiteOps is obsolete
+                                CallSiteOpsReflectionCache<T>.GetRules,
+#pragma warning restore CS0618
                                 @this
                             )
                         ),
@@ -502,14 +520,18 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
             body.UncheckedAdd(
                 Expression.Assign(
                     cache,
-                    Expression.Call(CallSiteOps_GetRuleCache.MakeGenericMethod(typeArgs), @this)
+#pragma warning disable CS0618 // CallSiteOps is obsolete
+                    Expression.Call(CallSiteOpsReflectionCache<T>.GetRuleCache, @this)
+#pragma warning restore CS0618
                 )
             );
 
             body.UncheckedAdd(
                 Expression.Assign(
                     applicable,
-                    Expression.Call(CallSiteOps_GetCachedRules.MakeGenericMethod(typeArgs), cache)
+#pragma warning disable CS0618 // CallSiteOps is obsolete
+                    Expression.Call(CallSiteOpsReflectionCache<T>.GetCachedRules, cache)
+#pragma warning restore CS0618
                 )
             );
 
@@ -540,8 +562,10 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
                 Expression.IfThen(
                     getMatch,
                     Expression.Block(
-                        Expression.Call(CallSiteOps_AddRule.MakeGenericMethod(typeArgs), @this, rule),
-                        Expression.Call(CallSiteOps_MoveRule.MakeGenericMethod(typeArgs), cache, rule, index)
+#pragma warning disable CS0618
+                        Expression.Call(CallSiteOpsReflectionCache<T>.AddRule, @this, rule),
+                        Expression.Call(CallSiteOpsReflectionCache<T>.MoveRule, cache, rule, index)
+#pragma warning restore CS0618
                     )
                 )
             );
@@ -578,7 +602,7 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
             body.UncheckedAdd(
                 Expression.Assign(
                     args,
-                    Expression.NewArrayInit(typeof(object), new TrueReadOnlyCollection<Expression>(argsElements))
+                    Expression.NewObjectArrayInit(new TrueReadOnlyCollection<Expression>(argsElements))
                 )
             );
 
@@ -592,7 +616,9 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
                 Expression.Assign(
                     rule,
                     Expression.Call(
-                        CallSiteOps_Bind.MakeGenericMethod(typeArgs),
+#pragma warning disable CS0618 // Type or member is obsolete
+                        CallSiteOpsReflectionCache<T>.Bind,
+#pragma warning restore CS0618
                         Expression.Property(@this, typeof(CallSite).GetProperty(nameof(Binder))!),
                         @this,
                         args
@@ -605,7 +631,9 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
                 Expression.IfThen(
                     getMatch,
                     Expression.Call(
-                        CallSiteOps_AddRule.MakeGenericMethod(typeArgs),
+#pragma warning disable 0618 // CallSiteOps.AddRule_Internal is obsolete
+                        CallSiteOpsReflectionCache<T>.AddRule,
+#pragma warning restore 0618
                         @this,
                         rule
                     )
@@ -640,6 +668,7 @@ private T CreateCustomUpdateDelegate(MethodInfo invoke)
             return lambda.Compile();
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         private T CreateCustomNoMatchDelegate(MethodInfo invoke)
         {
             ParameterExpression[] @params = Array.ConvertAll(invoke.GetParametersCached(), p => Expression.Parameter(p.ParameterType, p.Name));
diff --git a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteBinder.cs b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteBinder.cs
index 968b272e415a7..41df675b6aaf9 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteBinder.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteBinder.cs
@@ -4,10 +4,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Dynamic.Utils;
 using System.Linq.Expressions;
-using System.Threading;
 using System.Reflection;
+using System.Threading;
 using static System.Linq.Expressions.CachedReflectionInfo;
 
 namespace System.Runtime.CompilerServices
@@ -100,6 +101,7 @@ private LambdaSignature()
             return null;
         }
 
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         internal T BindCore<T>(CallSite<T> site, object[] args) where T : class
         {
             //
diff --git a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOps.cs b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOps.cs
index 4b3fd28ffdebe..9460333c4efb5 100644
--- a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOps.cs
+++ b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOps.cs
@@ -3,6 +3,8 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq.Expressions;
 
 namespace System.Runtime.CompilerServices
 {
@@ -151,6 +153,7 @@ public static T[] GetCachedRules<T>(RuleCache<T> cache) where T : class
         /// <param name="args">Arguments to the call site.</param>
         /// <returns>The new call site target.</returns>
         [Obsolete("CallSiteOps has been deprecated and is not supported.", error: true), EditorBrowsable(EditorBrowsableState.Never)]
+        [RequiresDynamicCode(Expression.NewArrayRequiresDynamicCode)]
         public static T Bind<T>(CallSiteBinder binder, CallSite<T> site, object[] args) where T : class
         {
             return binder.BindCore(site, args);
diff --git a/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOpsReflectionCache.cs b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOpsReflectionCache.cs
new file mode 100644
index 0000000000000..8bc40b9361d71
--- /dev/null
+++ b/src/libraries/System.Linq.Expressions/src/System/Runtime/CompilerServices/CallSiteOpsReflectionCache.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace System.Runtime.CompilerServices;
+internal static class CallSiteOpsReflectionCache<T> where T : class
+{
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo CreateMatchmaker = ((Delegate)CallSiteOps.CreateMatchmaker<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo UpdateRules = ((Delegate)CallSiteOps.UpdateRules<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo GetRules = ((Delegate)CallSiteOps.GetRules<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo GetRuleCache = ((Delegate)CallSiteOps.GetRuleCache<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo GetCachedRules = ((Delegate)CallSiteOps.GetCachedRules<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo AddRule = ((Delegate)CallSiteOps.AddRule<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    public static readonly MethodInfo MoveRule = ((Delegate)CallSiteOps.MoveRule<T>).GetMethodInfo();
+
+    [Obsolete("CallSiteOps has been deprecated and is not supported.", error: false), EditorBrowsable(EditorBrowsableState.Never)]
+    [UnconditionalSuppressMessage("DynamicCode", "IL3050",
+        Justification = "CallSiteOps is obsolete and CallSite has RUC. Propagating warnings through fields isn't worth it.")]
+    public static readonly MethodInfo Bind = ((Delegate)CallSiteOps.Bind<T>).GetMethodInfo();
+}
diff --git a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs
index 9ff5a7beebad9..fac272e452e66 100644
--- a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/BinaryMultiplyTests.cs
@@ -602,15 +602,18 @@ public static void VBStyleOperatorOverloading(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void VBStyleOperatorOverloadingLifted(bool useInterpreter)
         {
-            var b = Expression.Parameter(typeof(VBStyleExponentiation?));
-            var e = Expression.Parameter(typeof(VBStyleExponentiation?));
-            var func = Expression.Lambda<Func<VBStyleExponentiation?, VBStyleExponentiation?, VBStyleExponentiation?>>(
-                Expression.Power(b, e), b, e).Compile(useInterpreter);
-            Assert.Equal(8.0, func(2.0, 3.0).Value.Value);
-            Assert.Equal(10000.0, func(10.0, 4.0).Value.Value);
-            Assert.Null(func(2.0, null));
-            Assert.Null(func(null, 2.0));
-            Assert.Null(func(null, null));
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                var b = Expression.Parameter(typeof(VBStyleExponentiation?));
+                var e = Expression.Parameter(typeof(VBStyleExponentiation?));
+                var func = Expression.Lambda<Func<VBStyleExponentiation?, VBStyleExponentiation?, VBStyleExponentiation?>>(
+                    Expression.Power(b, e), b, e).Compile(useInterpreter);
+                Assert.Equal(8.0, func(2.0, 3.0).Value.Value);
+                Assert.Equal(10000.0, func(10.0, 4.0).Value.Value);
+                Assert.Null(func(2.0, null));
+                Assert.Null(func(null, 2.0));
+                Assert.Null(func(null, null));
+            });
         }
 
         // Simulate F#-style overloading of exponentiation operation
@@ -642,13 +645,16 @@ public static void FSStyleOperatorOverloadingLifted(bool useInterpreter)
         {
             var b = Expression.Parameter(typeof(FSStyleExponentiation?));
             var e = Expression.Parameter(typeof(FSStyleExponentiation?));
-            var func = Expression.Lambda<Func<FSStyleExponentiation?, FSStyleExponentiation?, FSStyleExponentiation?>>(
-                Expression.Power(b, e), b, e).Compile(useInterpreter);
-            Assert.Equal(8.0, func(2.0, 3.0).Value.Value);
-            Assert.Equal(10000.0, func(10.0, 4.0).Value.Value);
-            Assert.Null(func(2.0, null));
-            Assert.Null(func(null, 2.0));
-            Assert.Null(func(null, null));
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                var func = Expression.Lambda<Func<FSStyleExponentiation?, FSStyleExponentiation?, FSStyleExponentiation?>>(
+                    Expression.Power(b, e), b, e).Compile(useInterpreter);
+                Assert.Equal(8.0, func(2.0, 3.0).Value.Value);
+                Assert.Equal(10000.0, func(10.0, 4.0).Value.Value);
+                Assert.Null(func(2.0, null));
+                Assert.Null(func(null, 2.0));
+                Assert.Null(func(null, null));
+            });
         }
 
         [Fact]
diff --git a/src/libraries/System.Linq.Expressions/tests/HelperTypes.cs b/src/libraries/System.Linq.Expressions/tests/HelperTypes.cs
index ae01067743f9d..bcc88b0fc8573 100644
--- a/src/libraries/System.Linq.Expressions/tests/HelperTypes.cs
+++ b/src/libraries/System.Linq.Expressions/tests/HelperTypes.cs
@@ -5,7 +5,9 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 using Xunit;
+using Xunit.Sdk;
 
 namespace System.Linq.Expressions.Tests
 {
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddCheckedNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddCheckedNullableTests.cs
index d1d35552739ae..7d4f01fa0f4f7 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddCheckedNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddCheckedNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedAddCheckedNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedAddCheckedNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyAddCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyAddCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         [Fact] // See https://github.com/dotnet/runtime/issues/19106
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddNullableTests.cs
index c52cb4b3c8dbb..a6c7ed100e43e 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedAddNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedAddNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedAddNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyAddNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyAddNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseAndNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseAndNullableTests.cs
index 568044209d64b..b222b5f4c425a 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseAndNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseAndNullableTests.cs
@@ -117,14 +117,17 @@ public static void CheckLiftedBitwiseAndNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedBitwiseAndNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyBitwiseAndNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyBitwiseAndNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseExclusiveOrNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseExclusiveOrNullableTests.cs
index 4316f20ec6110..b6f11a104450c 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseExclusiveOrNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseExclusiveOrNullableTests.cs
@@ -117,14 +117,17 @@ public static void CheckLiftedBitwiseExclusiveOrNullableUShortTest(bool useInter
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedBitwiseExclusiveOrNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyBitwiseExclusiveOrNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyBitwiseExclusiveOrNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseOrNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseOrNullableTests.cs
index 3be67fe2ca1a7..5b2578c0eff46 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseOrNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedBitwiseOrNullableTests.cs
@@ -117,14 +117,17 @@ public static void CheckLiftedBitwiseOrNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedBitwiseOrNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyBitwiseOrNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyBitwiseOrNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedDivideNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedDivideNullableTests.cs
index b637dca86dffa..ad1a14504a26c 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedDivideNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedDivideNullableTests.cs
@@ -179,14 +179,17 @@ public static void CheckLiftedDivideNullableUShortTest(bool useInterpreter)
         [ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedDivideNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyDivideNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyDivideNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedModuloNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedModuloNullableTests.cs
index e02292c768273..3585e780aaa4e 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedModuloNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedModuloNullableTests.cs
@@ -179,14 +179,17 @@ public static void CheckLiftedModuloNullableUShortTest(bool useInterpreter)
         [ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedModuloNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyModuloNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyModuloNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyCheckedNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyCheckedNullableTests.cs
index 0e89eb032d1a7..5d2980778d7f0 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyCheckedNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyCheckedNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedMultiplyCheckedNullableUShortTest(bool useInterpre
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedMultiplyCheckedNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyMultiplyCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyMultiplyCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyNullableTests.cs
index f3482720686b8..0cdbd8b83ad94 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedMultiplyNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedMultiplyNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedMultiplyNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifyMultiplyNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifyMultiplyNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractCheckedNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractCheckedNullableTests.cs
index b89cf44b8b20e..b91ccf45df3da 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractCheckedNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractCheckedNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedSubtractCheckedNullableUShortTest(bool useInterpre
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedSubtractCheckedNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifySubtractCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifySubtractCheckedNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractNullableTests.cs
index 9e70857a17002..d231543baa465 100644
--- a/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Lifted/LiftedSubtractNullableTests.cs
@@ -169,14 +169,17 @@ public static void CheckLiftedSubtractNullableUShortTest(bool useInterpreter)
         [Theory, ClassData(typeof(CompilationTypes))]
         public static void CheckLiftedSubtractNullableNumberTest(bool useInterpreter)
         {
-            Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
-            for (int i = 0; i < values.Length; i++)
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
             {
-                for (int j = 0; j < values.Length; j++)
+                Number?[] values = new Number?[] { null, new Number(0), new Number(1), Number.MaxValue };
+                for (int i = 0; i < values.Length; i++)
                 {
-                    VerifySubtractNullableNumber(values[i], values[j], useInterpreter);
+                    for (int j = 0; j < values.Length; j++)
+                    {
+                        VerifySubtractNullableNumber(values[i], values[j], useInterpreter);
+                    }
                 }
-            }
+            });
         }
 
         #endregion
diff --git a/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs b/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs
index edd53405b83c8..35f1723c8038b 100644
--- a/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs
@@ -194,17 +194,17 @@ public static void TestUserDefinedOperators()
             TestUserDefinedMathOperators<U, U>();
             TestUserDefinedComparisonOperators<U, U>();
             TestUserDefinedBitwiseOperators<U, U>();
-            TestUserDefinedMathOperators<U?, U?>();
-            TestUserDefinedComparisonOperators<U?, U?>();
-            TestUserDefinedBitwiseOperators<U?, U?>();
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedMathOperators<U?, U?>);
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedComparisonOperators<U?, U?>);
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedBitwiseOperators<U?, U?>);
 
             TestUserDefinedComparisonOperators<B, B>();
             TestUserDefinedLogicalOperators<B, B>();
-            TestUserDefinedComparisonOperators<B?, B?>();
-            TestUserDefinedLogicalOperators<B?, B?>();
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedComparisonOperators<B?, B?>);
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedLogicalOperators<B?, B?>);
 
             TestUserDefinedMathOperators<M, N>();
-            TestUserDefinedMathOperators<M?, N?>();
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(TestUserDefinedMathOperators<M?, N?>);
         }
 
         internal static bool IsNullableType(Type type)
diff --git a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementNullableTests.cs
index 6a0defc163be3..cfa420e1be1d5 100644
--- a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementNullableTests.cs
@@ -136,9 +136,12 @@ public static void DecrementNonArithmetic(object value)
         [Theory, PerCompilationType(nameof(DecrementableValues), true)]
         public static void CustomOpDecrement(Decrementable? operand, Decrementable? expected, bool useInterpreter)
         {
-            Func<Decrementable?> func = Expression.Lambda<Func<Decrementable?>>(
-                Expression.Decrement(Expression.Constant(operand, typeof(Decrementable?)))).Compile(useInterpreter);
-            Assert.Equal(expected, func());
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                Func<Decrementable?> func = Expression.Lambda<Func<Decrementable?>>(
+                            Expression.Decrement(Expression.Constant(operand, typeof(Decrementable?)))).Compile(useInterpreter);
+                Assert.Equal(expected, func());
+            });
         }
 
         [Theory, PerCompilationType(nameof(DecrementableWhenNullableValues))]
@@ -153,10 +156,13 @@ public static void NonLiftedNullableOpDecrement(
         [Theory, PerCompilationType(nameof(DoublyDecrementedDecrementableValues), true)]
         public static void UserDefinedOpDecrement(Decrementable? operand, Decrementable? expected, bool useInterpreter)
         {
-            MethodInfo method = typeof(IncrementDecrementTests).GetMethod(nameof(DoublyDecrement));
-            Func<Decrementable?> func = Expression.Lambda<Func<Decrementable?>>(
-                Expression.Decrement(Expression.Constant(operand, typeof(Decrementable?)), method)).Compile(useInterpreter);
-            Assert.Equal(expected, func());
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                MethodInfo method = typeof(IncrementDecrementTests).GetMethod(nameof(DoublyDecrement));
+                Func<Decrementable?> func = Expression.Lambda<Func<Decrementable?>>(
+                                Expression.Decrement(Expression.Constant(operand, typeof(Decrementable?)), method)).Compile(useInterpreter);
+                Assert.Equal(expected, func());
+            });
         }
 
         [Theory, PerCompilationType(nameof(DoublyDecrementedInt32s), true)]
diff --git a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementTests.cs b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementTests.cs
index 1555ff320bb54..36ebc9f727a68 100644
--- a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryDecrementTests.cs
@@ -110,7 +110,7 @@ public static void DecrementNonArithmetic(object value)
         public static void CustomOpDecrement(Decrementable operand, Decrementable expected, bool useInterpreter)
         {
             Func<Decrementable> func = Expression.Lambda<Func<Decrementable>>(
-                Expression.Decrement(Expression.Constant(operand))).Compile(useInterpreter);
+                            Expression.Decrement(Expression.Constant(operand))).Compile(useInterpreter);
             Assert.Equal(expected.Value, func().Value);
         }
 
diff --git a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryIncrementNullableTests.cs b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryIncrementNullableTests.cs
index d027033fe4c28..a70b486ae6856 100644
--- a/src/libraries/System.Linq.Expressions/tests/Unary/UnaryIncrementNullableTests.cs
+++ b/src/libraries/System.Linq.Expressions/tests/Unary/UnaryIncrementNullableTests.cs
@@ -138,9 +138,12 @@ public static void DecrementNonArithmetic(object value)
         [Theory, PerCompilationType(nameof(IncrementableValues), true)]
         public static void CustomOpIncrement(Incrementable? operand, Incrementable? expected, bool useInterpreter)
         {
-            Func<Incrementable?> func = Expression.Lambda<Func<Incrementable?>>(
-                Expression.Increment(Expression.Constant(operand, typeof(Incrementable?)))).Compile(useInterpreter);
-            Assert.Equal(expected, func());
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                Func<Incrementable?> func = Expression.Lambda<Func<Incrementable?>>(
+                    Expression.Increment(Expression.Constant(operand, typeof(Incrementable?)))).Compile(useInterpreter);
+                Assert.Equal(expected, func());
+            });
         }
 
         [Theory, PerCompilationType(nameof(IncrementableWhenNullableValues))]
@@ -155,10 +158,13 @@ public static void NonLiftedNullableOpIncrement(
         [Theory, PerCompilationType(nameof(DoublyIncrementedIncrementableValues), true)]
         public static void UserDefinedOpIncrement(Incrementable? operand, Incrementable? expected, bool useInterpreter)
         {
-            MethodInfo method = typeof(IncrementDecrementTests).GetMethod(nameof(DoublyIncrement));
-            Func<Incrementable?> func = Expression.Lambda<Func<Incrementable?>>(
-                Expression.Increment(Expression.Constant(operand, typeof(Incrementable?)), method)).Compile(useInterpreter);
-            Assert.Equal(expected, func());
+            AssertExtensions.ThrowsOnAot<NotSupportedException>(() =>
+            {
+                MethodInfo method = typeof(IncrementDecrementTests).GetMethod(nameof(DoublyIncrement));
+                Func<Incrementable?> func = Expression.Lambda<Func<Incrementable?>>(
+                    Expression.Increment(Expression.Constant(operand, typeof(Incrementable?)), method)).Compile(useInterpreter);
+                Assert.Equal(expected, func());
+            });
         }
 
         [Theory, PerCompilationType(nameof(DoublyIncrementedInt32s), true)]

From b6a0e1c3b63b9673b3895cf1061ea5e4ae926655 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 11:58:54 -0600
Subject: [PATCH 05/14] [release/8.0-rc1] Unify with logging category matching
 (#90642)

* Unify with logging category matching

* -1 => 0

* Weird overlapping match

---------

Co-authored-by: Chris R <Tratcher@outlook.com>
---
 .../src/Metrics/ListenerSubscription.cs       | 55 ++++++++-------
 .../src/Resources/Strings.resx                | 67 ++++++++++++++++++-
 .../tests/ListenerSubscriptionTests.cs        | 33 +++++++--
 3 files changed, 121 insertions(+), 34 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/src/Metrics/ListenerSubscription.cs b/src/libraries/Microsoft.Extensions.Diagnostics/src/Metrics/ListenerSubscription.cs
index 24c6d0b7b7f29..c6eb978af5441 100644
--- a/src/libraries/Microsoft.Extensions.Diagnostics/src/Metrics/ListenerSubscription.cs
+++ b/src/libraries/Microsoft.Extensions.Diagnostics/src/Metrics/ListenerSubscription.cs
@@ -165,36 +165,39 @@ internal static bool RuleMatches(InstrumentRule rule, Instrument instrument, str
 
             // Meter
 
-            var ruleMeterName = rule.MeterName.AsSpan();
-            // Don't allow "*" anywhere except at the end.
-            var starIndex = ruleMeterName.IndexOf('*');
-            if (starIndex != -1 && starIndex != ruleMeterName.Length - 1)
+            // The same logic as Microsoft.Extensions.Logging.LoggerRuleSelector.IsBetter for category names
+            var meterName = rule.MeterName;
+            if (meterName != null)
             {
-                return false;
-            }
-            // Rule "System.Net.*" matches meter "System.Net" and "System.Net.Http"
-            if (ruleMeterName.EndsWith(".*".AsSpan(), StringComparison.Ordinal))
-            {
-                ruleMeterName = ruleMeterName.Slice(0, ruleMeterName.Length - 2);
-            }
-            // System.Net* matches System.Net and System.Net.Http
-            else if (starIndex != -1)
-            {
-                ruleMeterName = ruleMeterName.Slice(0, ruleMeterName.Length - 1);
-            }
+                const char WildcardChar = '*';
 
-            // Rule "" matches everything
-            if (ruleMeterName.IsEmpty)
-            {
-                return true;
+                int wildcardIndex = meterName.IndexOf(WildcardChar);
+                if (wildcardIndex >= 0 &&
+                    meterName.IndexOf(WildcardChar, wildcardIndex + 1) >= 0)
+                {
+                    throw new InvalidOperationException(SR.MoreThanOneWildcard);
+                }
+
+                ReadOnlySpan<char> prefix, suffix;
+                if (wildcardIndex < 0)
+                {
+                    prefix = meterName.AsSpan();
+                    suffix = default;
+                }
+                else
+                {
+                    prefix = meterName.AsSpan(0, wildcardIndex);
+                    suffix = meterName.AsSpan(wildcardIndex + 1);
+                }
+
+                if (!instrument.Meter.Name.AsSpan().StartsWith(prefix, StringComparison.OrdinalIgnoreCase) ||
+                    !instrument.Meter.Name.AsSpan().EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
             }
 
-            // "System.Net" matches "System.Net" and "System.Net.Http"
-            return instrument.Meter.Name.AsSpan().StartsWith(ruleMeterName, StringComparison.OrdinalIgnoreCase)
-                // Exact match +/- ".*"
-                && (ruleMeterName.Length == instrument.Meter.Name.Length
-                    // Only allow StartsWith on segment boundaries
-                    || instrument.Meter.Name[ruleMeterName.Length] == '.');
+            return true;
         }
 
         // Everything must already match the Instrument and listener, or be blank.
diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/src/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.Diagnostics/src/Resources/Strings.resx
index ab0d5ca5a461b..0589f84ba89e7 100644
--- a/src/libraries/Microsoft.Extensions.Diagnostics/src/Resources/Strings.resx
+++ b/src/libraries/Microsoft.Extensions.Diagnostics/src/Resources/Strings.resx
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -60,4 +120,7 @@
   <data name="InvalidScope" xml:space="preserve">
     <value>The meter factory does not allow a custom scope value when creating a meter.</value>
   </data>
-</root>
+  <data name="MoreThanOneWildcard" xml:space="preserve">
+    <value>Only one wildcard character is allowed in category name.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/tests/ListenerSubscriptionTests.cs b/src/libraries/Microsoft.Extensions.Diagnostics/tests/ListenerSubscriptionTests.cs
index da59cffc28d6a..a0c5d281bfaa0 100644
--- a/src/libraries/Microsoft.Extensions.Diagnostics/tests/ListenerSubscriptionTests.cs
+++ b/src/libraries/Microsoft.Extensions.Diagnostics/tests/ListenerSubscriptionTests.cs
@@ -214,13 +214,20 @@ public void RuleCanBeTurnedOffAndOnAgain()
         [InlineData("", "", "")]
         [InlineData("*", "", "")]
         [InlineData("lonG", "", "")]
+        [InlineData("lonG.", "", "")]
         [InlineData("lonG*", "", "")]
         [InlineData("lonG.*", "", "")]
+        [InlineData("lonG.sil", "", "")]
+        [InlineData("lonG.sil*", "", "")]
         [InlineData("lonG.sillY.meteR", "", "")]
         [InlineData("lonG.sillY.meteR*", "", "")]
         [InlineData("lonG.sillY.meteR.*", "", "")]
+        [InlineData("*namE", "", "")]
+        [InlineData("*.namE", "", "")]
+        [InlineData("*.sillY.meteR.Name", "", "")]
+        [InlineData("long*Name", "", "")]
+        [InlineData("lonG.sillY.meter*MeteR.namE", "", "")] // Shouldn't match, but does, left for compatibility with Logging.
         [InlineData("lonG.sillY.meteR.namE", "", "")]
-        [InlineData("lonG.sillY.meteR.namE.*", "", "")]
         [InlineData("", "instrumenTnamE", "")]
         [InlineData("lonG.sillY.meteR.namE", "instrumenTnamE", "")]
         [InlineData("", "", "listeneRnamE")]
@@ -237,15 +244,13 @@ public void RuleMatchesTest(string meterName, string instrumentName, string list
         }
 
         [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
-        [InlineData("*.*", "", "")]
         [InlineData("", "*", "")]
         [InlineData("", "", "*")]
-        [InlineData("lonG.", "", "")]
-        [InlineData("lonG.sil", "", "")]
-        [InlineData("lonG.sil*", "", "")]
         [InlineData("sillY.meteR.namE", "", "")]
+        [InlineData(".*", "", "")]
+        [InlineData("*.", "", "")]
+        [InlineData("lonG.sillY.meteR.namE.*", "", "")]
         [InlineData("namE", "", "")]
-        [InlineData("*.namE", "", "")]
         [InlineData("wrongMeter", "", "")]
         [InlineData("wrongMeter", "InstrumentName", "")]
         [InlineData("wrongMeter", "", "ListenerName")]
@@ -261,6 +266,17 @@ public void RuleMatchesNegativeTest(string meterName, string instrumentName, str
             }, meterName, instrumentName, listenerName).Dispose();
         }
 
+        [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+        public void MultipleWildcardsThrows()
+        {
+            RemoteExecutor.Invoke(() => {
+                var rule = new InstrumentRule("*.*", null, null, MeterScope.Global, enable: true);
+                var meter = new Meter("Long.Silly.Meter.Name");
+                var instrument = meter.CreateCounter<int>("InstrumentName");
+                Assert.Throws< InvalidOperationException>(() => ListenerSubscription.RuleMatches(rule, instrument, "ListenerName", new FakeMeterFactory()));
+            }).Dispose();
+        }
+
         [Theory]
         [MemberData(nameof(IsMoreSpecificTestData))]
         public void IsMoreSpecificTest(InstrumentRule rule, InstrumentRule? best, bool isLocalScope)
@@ -388,3 +404,8 @@ private class FakeMeterFactory : IMeterFactory
         }
     }
 }
+
+internal class SR
+{
+    public static string MoreThanOneWildcard => "More than one wildcard is not allowed in a rule.";
+}

From 4d44f2ff0b2a459042cb2eb509c400db4d226e26 Mon Sep 17 00:00:00 2001
From: Alhad Deshpande <97085048+alhad-deshpande@users.noreply.github.com>
Date: Wed, 16 Aug 2023 23:56:28 +0530
Subject: [PATCH 06/14] [ppc64le] performance improvements while branching
 (#90656)

---
 src/mono/mono/mini/mini-ppc.c | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/mono/mono/mini/mini-ppc.c b/src/mono/mono/mini/mini-ppc.c
index 3b9bdf2bcb985..b3514123b7e94 100644
--- a/src/mono/mono/mini/mini-ppc.c
+++ b/src/mono/mono/mini/mini-ppc.c
@@ -297,7 +297,7 @@ gboolean
 mono_ppc_is_direct_call_sequence (guint32 *code)
 {
 #ifdef TARGET_POWERPC64
-	g_assert(*code == 0x4e800021 || *code == 0x4e800020 || *code == 0x4e800420);
+	g_assert(*code == 0x4e800021 || *code == 0x4e800020 || *code == 0x4e800421 || *code == 0x4e800420);
 
 	/* the thunk-less direct call sequence: lis/ori/sldi/oris/ori/mtlr/blrl */
 	if (ppc_opcode (code [-1]) == 31) { /* mtlr */
@@ -2939,7 +2939,7 @@ ppc_patch_full (MonoCompile *cfg, guchar *code, const guchar *target, gboolean i
 		return;
 	}
 
-	if (prim == 15 || ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800420) {
+	if (prim == 15 || ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800421 || ins == 0x4e800420) {
 #ifdef TARGET_POWERPC64
 #if !defined(PPC_USES_FUNCTION_DESCRIPTOR)
 		handle_thunk (cfg, code, target);
@@ -2948,7 +2948,7 @@ ppc_patch_full (MonoCompile *cfg, guchar *code, const guchar *target, gboolean i
 		guint32 *branch_ins;
 
 		/* the trampoline code will try to patch the blrl, blr, bcctr */
-		if (ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800420) {
+		if (ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800421 || ins == 0x4e800420) {
 			branch_ins = seq;
 			if (ppc_is_load_op (seq [-3]) || ppc_opcode (seq [-3]) == 31) /* ld || lwz || mr */
 				code -= 32;
@@ -2996,7 +2996,7 @@ ppc_patch_full (MonoCompile *cfg, guchar *code, const guchar *target, gboolean i
 #else
 		guint32 *seq;
 		/* the trampoline code will try to patch the blrl, blr, bcctr */
-		if (ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800420) {
+		if (ins == 0x4e800021 || ins == 0x4e800020 || ins == 0x4e800421 || ins == 0x4e800420) {
 			code -= 12;
 		}
 		/* this is the lis/ori/mtlr/blrl sequence */
@@ -3004,7 +3004,7 @@ ppc_patch_full (MonoCompile *cfg, guchar *code, const guchar *target, gboolean i
 		g_assert ((seq [0] >> 26) == 15);
 		g_assert ((seq [1] >> 26) == 24);
 		g_assert ((seq [2] >> 26) == 31);
-		g_assert (seq [3] == 0x4e800021 || seq [3] == 0x4e800020 || seq [3] == 0x4e800420);
+		g_assert (seq [3] == 0x4e800021 || seq [3] == 0x4e800020 || seq [3] == 0x4e800421 || seq [3] == 0x4e800420);
 		/* FIXME: make this thread safe */
 		ppc_lis (code, PPC_CALL_REG, (guint32)(target) >> 16);
 		ppc_ori (code, PPC_CALL_REG, PPC_CALL_REG, (guint32)(target) & 0xffff);
@@ -3426,8 +3426,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 				cfg->thunk_area += THUNK_SIZE;
 #endif
-				ppc_mtlr (code, PPC_CALL_REG);
-				ppc_blrl (code);
+				ppc_mtctr (code, PPC_CALL_REG);
+				ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			} else {
 				ppc_bl (code, 0);
 			}
@@ -3913,8 +3913,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 				cfg->thunk_area += THUNK_SIZE;
 #endif
-				ppc_mtlr (code, PPC_CALL_REG);
-				ppc_blrl (code);
+				ppc_mtctr (code, PPC_CALL_REG);
+				ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			} else {
 				ppc_bl (code, 0);
 			}
@@ -3945,9 +3945,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				 }
 			}
 #endif
-			ppc_mtlr (code, ins->sreg1);
+			ppc_mtctr (code, ins->sreg1);
 #endif
-			ppc_blrl (code);
+			ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			/* FIXME: this should be handled somewhere else in the new jit */
 			code = emit_move_return_value (cfg, ins, code);
 			break;
@@ -3965,8 +3965,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 			} else {
 				ppc_ldptr (code, ppc_r12, ins->inst_offset, ins->sreg1);
 			}
-			ppc_mtlr (code, ppc_r12);
-			ppc_blrl (code);
+			ppc_mtctr (code, ppc_r12);
+			ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			/* FIXME: this should be handled somewhere else in the new jit */
 			code = emit_move_return_value (cfg, ins, code);
 			break;
@@ -4022,8 +4022,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 				cfg->thunk_area += THUNK_SIZE;
 #endif
-				ppc_mtlr (code, PPC_CALL_REG);
-				ppc_blrl (code);
+				ppc_mtctr (code, PPC_CALL_REG);
+				ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			} else {
 				ppc_bl (code, 0);
 			}
@@ -4040,8 +4040,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 				cfg->thunk_area += THUNK_SIZE;
 #endif
-				ppc_mtlr (code, PPC_CALL_REG);
-				ppc_blrl (code);
+				ppc_mtctr (code, PPC_CALL_REG);
+				ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			} else {
 				ppc_bl (code, 0);
 			}
@@ -4725,8 +4725,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 				ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 				cfg->thunk_area += THUNK_SIZE;
 #endif
-				ppc_mtlr (code, PPC_CALL_REG);
-				ppc_blrl (code);
+				ppc_mtctr (code, PPC_CALL_REG);
+				ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 			} else {
 				ppc_bl (code, 0);
 			}
@@ -5348,8 +5348,8 @@ mono_arch_emit_prolog (MonoCompile *cfg)
 			ppc_ldr (code, PPC_CALL_REG, 0, PPC_CALL_REG);
 			cfg->thunk_area += THUNK_SIZE;
 #endif
-			ppc_mtlr (code, PPC_CALL_REG);
-			ppc_blrl (code);
+			ppc_mtctr (code, PPC_CALL_REG);
+			ppc_bcctrl (code, PPC_BR_ALWAYS, 0);
 		} else {
 			ppc_bl (code, 0);
 		}

From 243a5aea6983e8a36abbabd14d4f95bf8123ce5b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 12:27:32 -0600
Subject: [PATCH 07/14] Fix problems with `Assembler::ReflectionNotation()`
 (#90655)

Do more parameter validation, correct buffer size calculations
for security-enhanced CRT functions, and avoid memcpy
buffer overrun of locale.

Co-authored-by: Bruce Forstall <brucefo@microsoft.com>
---
 src/coreclr/ilasm/assem.cpp | 84 ++++++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 15 deletions(-)

diff --git a/src/coreclr/ilasm/assem.cpp b/src/coreclr/ilasm/assem.cpp
index dd2c91ac093ac..2bd90fadb8f91 100644
--- a/src/coreclr/ilasm/assem.cpp
+++ b/src/coreclr/ilasm/assem.cpp
@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)
 
 char* Assembler::ReflectionNotation(mdToken tk)
 {
+    // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
+    // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
+    // length is in bytes.
     char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
+    const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
+    const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
     *sz=0;
     switch(TypeFromToken(tk))
     {
@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
                 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
                 if(pClass)
                 {
-                    strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
+                    strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
                     pc = sz;
                     while((pc = strchr(pc,NESTING_SEP)) != NULL)
                     {
@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
             {
                 ULONG   N;
                 mdToken tkResScope;
-                if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
+                if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
                 {
-                    WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
+                    int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
                     if(TypeFromToken(tkResScope)==mdtAssemblyRef)
                     {
                         AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
                         if(pAsmRef)
                         {
-                            pc = &sz[strlen(sz)];
-                            pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
+                            // We assume below that if sprintf_s fails due to buffer overrun,
+                            // execution fails fast and sprintf_s doesn't return.
+                            int sprintf_ret;
+                            const size_t szLen = strlen(sz);
+                            pc = &sz[szLen];
+                            size_t szRemainingSizeBytes = szSizeBytes - szLen;
+
+                            sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
                                     pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
-                            ULONG L=0;
-                            if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
+                            pc += sprintf_ret;
+                            szRemainingSizeBytes -= (size_t)sprintf_ret;
+
+                            unsigned L=0;
+                            if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
+                            {
+                                // L is in bytes and doesn't include the terminating null.
+                                if (L > (cchUniBuf - 1) * sizeof(WCHAR))
+                                {
+                                    report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
+                                    *sz=0;
+                                    break;
+                                }
+                                else if (szRemainingSizeBytes == 0)
+                                {
+                                    report->error("TypeRef too long.\n");
+                                    *sz=0;
+                                    break;
+                                }
+
+                                if (szRemainingSizeBytes > 0)
+                                {
+                                    memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
+                                    wzUniBuf[L>>1] = 0;
+                                    ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
+                                    if (ret <= 0)
+                                    {
+                                        report->error("Locale too long.\n");
+                                        *sz=0;
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        pc += ret;
+                                        szRemainingSizeBytes -= (size_t)ret;
+                                    }
+                                }
+                            }
+                            else
                             {
-                                memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
-                                wzUniBuf[L>>1] = 0;
-                                WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
+                                sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
+                                pc += sprintf_ret;
+                                szRemainingSizeBytes -= (size_t)sprintf_ret;
                             }
-                            else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
-                            pc = &sz[strlen(sz)];
-                            if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
+                            if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
                             {
-                                pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
+                                sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
+                                pc += sprintf_ret;
+                                szRemainingSizeBytes -= (size_t)sprintf_ret;
+
                                 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
-                                for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
+                                for(unsigned i=0; i<L; i++,pb++)
+                                {
+                                    sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
+                                    pc += sprintf_ret;
+                                    szRemainingSizeBytes -= (size_t)sprintf_ret;
+                                }
                             }
                         }
                     }

From dbb6f4569a2a1056d010f11fc38512476ebf6033 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 12:44:08 -0600
Subject: [PATCH 08/14] Fix NullableAttribute illink test failures (#90680)

When we started building with preview 7 in
5549f72da3b3cea9e74bb81cfbb0f2d27731fc42, NullableAttribute in
these testcases started to use the attribute definition from the
framework, instead of generating it into the code. This broke the
`--used-attrs-only` optimization because `skip` assemblies (the
default for the framework in these testcases) are treated as if
all types in them are kept, for the purposes of the
`--used-attrs-only` optimization. (The optimization removes
attribute instances unless the attribute type is preserved for
some other reason).

It's not clear what the intended behavior of `--used-attrs-only`
is for `skip` assemblies, and the discussion in
https://github.com/dotnet/linker/issues/952 indicates that it's
considered experimental, so this fixes the failures by using the
`link` action. This represents a more realistic scenario since
`skip` is mainly used in testing to avoid linking the framework
in every testcase.

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../Attributes/OnlyKeepUsed/NullableOnConstraints.cs             | 1 +
 .../LinqExpressions/CanPreserveNullableCustomOperators.cs        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/NullableOnConstraints.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/NullableOnConstraints.cs
index b396bb3b10b56..b5efaa7dbcae0 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/NullableOnConstraints.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Attributes/OnlyKeepUsed/NullableOnConstraints.cs
@@ -7,6 +7,7 @@ namespace Mono.Linker.Tests.Cases.Attributes.OnlyKeepUsed
 {
 	[SetupCSharpCompilerToUse ("csc")]
 	[SetupLinkerArgument ("--used-attrs-only", "true")]
+	[SetupLinkerTrimMode ("link")]
 	public class NullableOnConstraints
 	{
 		public static void Main ()
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinqExpressions/CanPreserveNullableCustomOperators.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinqExpressions/CanPreserveNullableCustomOperators.cs
index 32398f667348c..ec676fe133221 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/LinqExpressions/CanPreserveNullableCustomOperators.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/LinqExpressions/CanPreserveNullableCustomOperators.cs
@@ -5,6 +5,7 @@ namespace Mono.Linker.Tests.Cases.LinqExpressions
 {
 	[SetupCompileArgument ("/unsafe")]
 	[SetupLinkerArgument ("--used-attrs-only")]
+	[SetupLinkerTrimMode ("link")]
 	public class CanPreserveNullableCustomOperators
 	{
 		public static void Main ()

From 7cc25f5d8df703d9ba4c0083de0bd43cf0f059f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 21:42:28 +0200
Subject: [PATCH 09/14] [release/8.0-rc1] Add missing type forwards (#90673)

* Add missing type forwards

Fixes https://github.com/dotnet/runtime/issues/90578

IDispatchImplAttribute, IDispatchImplType and SetWin32ContextInIDispatchAttribute were removed with https://github.com/dotnet/runtime/commit/9f1dd1aa499a882453b34d4e8810626423fbfed8 and https://github.com/dotnet/runtime/commit/26a91ad6ac02393c6c7463500c030ec07803c5e6

Those dropped types weren't flagged because APICompat only validates reference assemblies. We have three implementation only shim assemblies: mscorlib, System and System.Data. I verified that no other type forwards were lost between .NET 7 and .NET 8.

* Update mscorlib.cs

---------

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/libraries/shims/mscorlib/src/mscorlib.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libraries/shims/mscorlib/src/mscorlib.cs b/src/libraries/shims/mscorlib/src/mscorlib.cs
index 857e2a83bfc48..eb77227a1130a 100644
--- a/src/libraries/shims/mscorlib/src/mscorlib.cs
+++ b/src/libraries/shims/mscorlib/src/mscorlib.cs
@@ -109,3 +109,9 @@
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))]
+// These types are required for back-compatibility with .NET Framework and previous versions of .NETCoreApp. -->
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.PEFileKinds))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.AssemblyRegistrationFlags))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ExporterEventKind))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.RegistrationClassContext))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.RegistrationConnectionType))]

From c96e5abe28678cc9ebd08d071de534ec7ed8b283 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:14:48 -0700
Subject: [PATCH 10/14] [release/8.0-rc1] [mono] Fix InlineArray tests on
 android platforms (#90679)

* Enable inline array tests

* Run android jobs only

* Add verbose logging

* Revert runtime changes

* Remove android-arm64 job

* Rename common assembly and revert CI changes

* Rename assembly name

---------

Co-authored-by: Milos Kotlar <kotlarmilos@gmail.com>
---
 .../Loader/classloader/InlineArray/InlineArrayInvalid.csproj   | 2 +-
 .../Loader/classloader/InlineArray/InlineArrayValid.csproj     | 2 +-
 .../{InvalidCSharp.il => InvalidCSharpInlineArray.il}          | 2 +-
 .../{InvalidCSharp.ilproj => InvalidCSharpInlineArray.ilproj}  | 2 +-
 src/tests/issues.targets                                       | 3 ---
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename src/tests/Loader/classloader/InlineArray/{InvalidCSharp.il => InvalidCSharpInlineArray.il} (98%)
 rename src/tests/Loader/classloader/InlineArray/{InvalidCSharp.ilproj => InvalidCSharpInlineArray.ilproj} (73%)

diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
index c9c4d3b28342f..2b17f8cac36a5 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
@@ -7,7 +7,7 @@
     <Compile Include="InlineArrayInvalid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="InvalidCSharp.ilproj" />
+    <ProjectReference Include="InvalidCSharpInlineArray.ilproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
index 125a6c3f5432e..2ed1ccb70a0bb 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
@@ -7,7 +7,7 @@
     <Compile Include="InlineArrayValid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="InvalidCSharp.ilproj" />
+    <ProjectReference Include="InvalidCSharpInlineArray.ilproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.il b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
similarity index 98%
rename from src/tests/Loader/classloader/InlineArray/InvalidCSharp.il
rename to src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
index ff8d65c09be00..af16b27db42d6 100644
--- a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.il
+++ b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
@@ -3,7 +3,7 @@
 
 .assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 
-.assembly InvalidCSharp { }
+.assembly InvalidCSharpInlineArray { }
 
 .class public explicit ansi sealed beforefieldinit Explicit
     extends [System.Runtime]System.ValueType
diff --git a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.ilproj
similarity index 73%
rename from src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj
rename to src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.ilproj
index d577c8f9c7a1a..2a82d64591e9d 100644
--- a/src/tests/Loader/classloader/InlineArray/InvalidCSharp.ilproj
+++ b/src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.ilproj
@@ -3,6 +3,6 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="InvalidCSharp.il" />
+    <Compile Include="InvalidCSharpInlineArray.il" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 09e50e73c7dd3..87f8bbf2673dd 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3482,9 +3482,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
             <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/**">
-            <Issue>https://github.com/dotnet/runtime/issues/90398</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">

From 322c85c11a4b8b1fd8ebdc3def52b8172262bb72 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steveisok@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:20:51 -0700
Subject: [PATCH 11/14] [release/8.0-rc1] Bump package version for net7 to
 7.0.11 (#90651)

Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
---
 eng/Versions.props | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index ff21c1ee1f07d..d75c6567090d0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,12 +7,14 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <SdkBandVersion>8.0.100</SdkBandVersion>
-    <PackageVersionNet7>7.0.8</PackageVersionNet7>
+    <PackageVersionNet7>7.0.11</PackageVersionNet7>
     <PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
     <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <WorkloadVersionSuffix Condition="'$(PreReleaseVersionLabel)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
     <SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
+    <!-- set to false for release branches -->
+    <WorkloadsTestPreviousVersions Condition="'$(WorkloadsTestPreviousVersions)' == ''">false</WorkloadsTestPreviousVersions>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>

From a37d1382047f6b6e79f4e1a6476fd48589d432a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:22:34 -0700
Subject: [PATCH 12/14] [mono] Add a --path command line argument as an
 alternative to MONO_PATH. (#90678)

Can be specified multiple times.

Co-authored-by: Zoltan Varga <vargaz@gmail.com>
---
 src/mono/mono/mini/driver.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/mono/mono/mini/driver.c b/src/mono/mono/mini/driver.c
index c5f04a816a1fa..a49820113d18a 100644
--- a/src/mono/mono/mini/driver.c
+++ b/src/mono/mono/mini/driver.c
@@ -1617,6 +1617,7 @@ mini_usage (void)
 #endif
 		"    --handlers             Install custom handlers, use --help-handlers for details.\n"
 		"    --aot-path=PATH        List of additional directories to search for AOT images.\n"
+		"    --path=DIR             Add DIR to the list of directories to search for assemblies.\n"
 	  );
 
 	g_print ("\nOptions:\n");
@@ -2069,6 +2070,7 @@ mono_main (int argc, char* argv[])
 	char *aot_options = NULL;
 	GPtrArray *agents = NULL;
 	char *extra_bindings_config_file = NULL;
+	GList *paths = NULL;
 #ifdef MONO_JIT_INFO_TABLE_TEST
 	int test_jit_info_table = FALSE;
 #endif
@@ -2294,6 +2296,8 @@ mono_main (int argc, char* argv[])
 				g_free (tmp);
 				split++;
 			}
+		} else if (strncmp (argv [i], "--path=", 7) == 0) {
+			paths = g_list_append (paths, argv [i] + 7);
 		} else if (strncmp (argv [i], "--compile-all=", 14) == 0) {
 			action = DO_COMPILE;
 			recompilation_times = atoi (argv [i] + 14);
@@ -2503,6 +2507,16 @@ mono_main (int argc, char* argv[])
 	if (g_hasenv ("MONO_XDEBUG"))
 		enable_debugging = TRUE;
 
+	if (paths) {
+		char **p = g_new0 (char *, g_list_length (paths) + 1);
+		int pindex = 0;
+		for (GList *l = paths; l; l = l->next)
+			p [pindex ++] = (char*)l->data;
+		g_list_free (paths);
+
+		mono_set_assemblies_path_direct (p);
+	}
+
 #ifdef MONO_CROSS_COMPILE
 	if (!mono_compile_aot) {
 		fprintf (stderr, "This mono runtime is compiled for cross-compiling. Only the --aot option is supported.\n");

From f84caca6fce726501f6722dab5f78db8bc0d88fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 15:39:04 -0700
Subject: [PATCH 13/14] Do not set fetch depth on source-build (#90704)

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
---
 eng/pipelines/common/global-build-job.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index 7e24fd3d045d5..b870ba34757c2 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -147,7 +147,10 @@ jobs:
     steps:
     - checkout: self
       clean: true
-      fetchDepth: $(checkoutFetchDepth)
+      # If running in source build mode, a git stash will be used for the inner clone. Avoid setting a fetch depth,
+      # as a stash of a shallow cloned repo is not currently supported.
+      ${{ if ne(parameters.isSourceBuild, true) }}:
+        fetchDepth: $(checkoutFetchDepth)
 
     - ${{ if and(eq(parameters.isOfficialBuild, true), notin(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator')) }}:
       - template: /eng/pipelines/common/restore-internal-tools.yml

From b5a0345e44924bcbba2a29234d77c8f5b96c87ec Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 16:36:32 -0700
Subject: [PATCH 14/14] Update dependencies from
 https://github.com/dotnet/arcade build 20230815.4 (#90665)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23415.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23408.1 -> To Version 1.0.0-beta.23415.1 (parent: Microsoft.DotNet.Arcade.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
---
 eng/Version.Details.xml                | 76 +++++++++++++-------------
 eng/Versions.props                     | 30 +++++-----
 eng/common/SetupNugetSources.ps1       |  8 +--
 eng/common/SetupNugetSources.sh        |  6 +-
 eng/common/native/init-distro-rid.sh   |  6 +-
 eng/common/sdl/trim-assets-version.ps1 | 75 +++++++++++++++++++++++++
 eng/common/tools.ps1                   |  6 +-
 global.json                            |  6 +-
 8 files changed, 145 insertions(+), 68 deletions(-)
 create mode 100644 eng/common/sdl/trim-assets-version.ps1

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e31341152d13b..6d255bdbc9f2a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -107,79 +107,79 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
+      <Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
     <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -330,9 +330,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d75c6567090d0..fd3e699e21403 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -85,21 +85,21 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index 2dc86ea2cdda1..6c65e81925f2a 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -2,7 +2,7 @@
 # This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
 #
 # What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
-# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
+# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential 
 # entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
 #
 # This script needs to be called in every job that will restore packages and which the base repo has
@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
 # Add source entry to PackageSources
 function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
     $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
-
+    
     if ($packageSource -eq $null)
     {
         $packageSource = $doc.CreateElement("add")
@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
     else {
         Write-Host "Package source $SourceName already present."
     }
-
+    
     AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
 }
 
@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
     $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
 
     Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
-
+    
     ForEach ($PackageSource in $maestroPrivateSources) {
         Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
         AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index a8bb8acd3be18..d387c7eac95e5 100644
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -4,7 +4,7 @@
 # This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
 #
 # What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
-# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
+# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential 
 # entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
 #
 # This script needs to be called in every job that will restore packages and which the base repo has
@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
     sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
 fi
 
-# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
+# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section. 
 grep -i "<packageSourceCredentials>" $ConfigFile
 if [ "$?" != "0" ]; then
     echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
@@ -142,7 +142,7 @@ IFS=$PrevIFS
 
 for FeedName in ${PackageSources[@]} ; do
     # Check if there is no existing credential for this FeedName
-    grep -i "<$FeedName>" $ConfigFile
+    grep -i "<$FeedName>" $ConfigFile 
     if [ "$?" != "0" ]; then
         echo "Adding credentials for $FeedName."
 
diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh
index aba9fe24028b0..de1687b2ccbe7 100644
--- a/eng/common/native/init-distro-rid.sh
+++ b/eng/common/native/init-distro-rid.sh
@@ -79,7 +79,6 @@ getNonPortableDistroRid()
 # Input:
 #   os: (str)
 #   arch: (str)
-#   isPortable: (int)
 #   rootfsDir?: (nullable:string)
 #
 # Return:
@@ -97,10 +96,9 @@ initDistroRidGlobal()
 {
     local targetOs="$1"
     local targetArch="$2"
-    local isPortable="$3"
     local rootfsDir=""
-    if [ "$#" -ge 4 ]; then
-        rootfsDir="$4"
+    if [ "$#" -ge 3 ]; then
+        rootfsDir="$3"
     fi
 
     if [ -n "${rootfsDir}" ]; then
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
new file mode 100644
index 0000000000000..d8cfec910c77e
--- /dev/null
+++ b/eng/common/sdl/trim-assets-version.ps1
@@ -0,0 +1,75 @@
+<#
+.SYNOPSIS
+Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.
+
+.PARAMETER InputPath
+Full path to directory where artifact packages are stored
+
+.PARAMETER Recursive
+Search for NuGet packages recursively
+
+#>
+
+Param(
+  [string] $InputPath,
+  [bool] $Recursive = $true
+)
+
+$CliToolName = "Microsoft.DotNet.VersionTools.Cli"
+
+function Install-VersionTools-Cli {
+  param(
+      [Parameter(Mandatory=$true)][string]$Version
+  )
+
+  Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
+  $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
+
+  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
+  Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
+}
+
+# -------------------------------------------------------------------
+
+if (!(Test-Path $InputPath)) {
+  Write-Host "Input Path '$InputPath' does not exist"
+  ExitWithExitCode 1
+}
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+# `tools.ps1` checks $ci to perform some actions. Since the SDL
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+. $PSScriptRoot\..\tools.ps1
+
+try {
+  $dotnetRoot = InitializeDotNetCli -install:$true
+  $dotnet = "$dotnetRoot\dotnet.exe"
+
+  $toolsetVersion = Read-ArcadeSdkVersion
+  Install-VersionTools-Cli -Version $toolsetVersion
+
+  $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
+  if ($null -eq $cliToolFound) {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
+    ExitWithExitCode 1
+  }
+
+  Exec-BlockVerbosely {
+    & "$dotnet" $CliToolName trim-assets-version `
+      --assets-path $InputPath `
+      --recursive $Recursive
+    Exit-IfNZEC "Sdl"
+  }
+}
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index c9eced9f7df4c..aa74ab4a81e78 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -671,6 +671,10 @@ function InitializeNativeTools() {
   }
 }
 
+function Read-ArcadeSdkVersion() {
+  return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+}
+
 function InitializeToolset() {
   if (Test-Path variable:global:_ToolsetBuildProj) {
     return $global:_ToolsetBuildProj
@@ -678,7 +682,7 @@ function InitializeToolset() {
 
   $nugetCache = GetNuGetPackageCachePath
 
-  $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+  $toolsetVersion = Read-ArcadeSdkVersion
   $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
 
   if (Test-Path $toolsetLocationFile) {
diff --git a/global.json b/global.json
index b4ca83d356c28..cf4ac698e3e8c 100644
--- a/global.json
+++ b/global.json
@@ -8,9 +8,9 @@
     "dotnet": "8.0.100-preview.7.23376.3"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
-    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
+    "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"