From 86f009c6439da012bad061d561503c31782e798c Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:21:00 -0700
Subject: [PATCH 1/3] Update to compiler build 4.4.0-3.22431.10
---
eng/Versions.props | 2 +-
src/libraries/System.Runtime/tests/System/Attributes.cs | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 3775e42248c8f3..e49743815b75ba 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,7 +49,7 @@
- 4.4.0-2.22412.11
+ 4.4.0-3.22452.8
0.2.0
7.0.100-rc.1.22402.1
diff --git a/src/libraries/System.Runtime/tests/System/Attributes.cs b/src/libraries/System.Runtime/tests/System/Attributes.cs
index d0b474f3110821..0b75b48ea133e7 100644
--- a/src/libraries/System.Runtime/tests/System/Attributes.cs
+++ b/src/libraries/System.Runtime/tests/System/Attributes.cs
@@ -331,10 +331,11 @@ public static void customAttributeCount()
{
List customAttributes = typeof(GetCustomAttribute).Module.CustomAttributes.ToList();
// [System.Security.UnverifiableCodeAttribute()]
+ // [System.Runtime.CompilerServices.RefSafetyRulesAttribute((Int32)11)]
// [TestAttributes.FooAttribute()]
// [TestAttributes.ComplicatedAttribute((Int32)1, Stuff = 2)]
// [System.Diagnostics.DebuggableAttribute((Boolean)True, (Boolean)False)]
- Assert.Equal(4, customAttributes.Count);
+ Assert.Equal(5, customAttributes.Count);
}
[Fact]
From fb84cdd82ffd18241014ba5d1e4ba8a86629633a Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:34:09 -0700
Subject: [PATCH 2/3] Add missing types
---
.../CoreTestAssembly/Platform.cs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs
index 6935dd75d92c93..2239925645c77c 100644
--- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs
+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs
@@ -61,6 +61,14 @@ public struct RuntimeMethodHandle { }
public struct RuntimeFieldHandle { }
public class Attribute { }
+ public class AttributeUsageAttribute : Attribute
+ {
+ public AttributeUsageAttribute(AttributeTargets targets) { }
+ public bool AllowMultiple { get; set; }
+ public bool Inherited { get; set; }
+ }
+
+ public enum AttributeTargets { }
public class ThreadStaticAttribute : Attribute { }
From 242856101a5567db032b46913bfb9e1f89b1cfe6 Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Tue, 6 Sep 2022 06:52:53 -0700
Subject: [PATCH 3/3] Remove duplicate Microsoft.Interop.SourceGeneration
reference
---
.../src/System.Net.WebSockets.Client.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
index 28bc6b32221b13..b7da9d3e90becb 100644
--- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
@@ -45,7 +45,6 @@
-