diff --git a/eng/Versions.props b/eng/Versions.props
index 4406b25e7d29b3..63c6691d325576 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,7 +49,7 @@
- 4.4.0-1.22358.14
+ 4.4.0-2.22412.11
0.2.0
7.0.100-rc.1.22402.1
diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props
index 0a48403f391258..da3533e49c939f 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.props
+++ b/eng/testing/linker/SupportFiles/Directory.Build.props
@@ -3,8 +3,7 @@
true
true
true
- link
- link
+ full
false
true
true
diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index 1cfa4ba1cdecab..1149c35511ca91 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -11,7 +11,7 @@
$(AssemblyName).exe
chmod +rwx $(AssemblyName) && ./$(AssemblyName)
-
+
true
true
@@ -27,11 +27,47 @@
$(CoreCLRAotSdkDir)
$(NetCoreAppCurrentTestHostSharedFrameworkPath)
$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002
+ partial
false
true
true
+
+
+
+ $(NoWarn);IL2026;IL2116
+
+ $(NoWarn);IL2041;IL2042;IL2043;IL2056
+
+ $(NoWarn);IL2045
+
+ $(NoWarn);IL2046
+
+ $(NoWarn);IL2050
+
+ $(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096
+
+ $(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066
+
+ $(NoWarn);IL2067;IL2068;IL2069;IL2070;IL2071;IL2072;IL2073;IL2074;IL2075;IL2076;IL2077;IL2078;IL2079;IL2080;IL2081;IL2082;IL2083;IL2084;IL2085;IL2086;IL2087;IL2088;IL2089;IL2090;IL2091
+
+ $(NoWarn);IL2092;IL2093;IL2094;IL2095
+
+ $(NoWarn);IL2097;IL2098;IL2099;IL2106
+
+ $(NoWarn);IL2103
+
+ $(NoWarn);IL2107;IL2117
+
+ $(NoWarn);IL2109
+
+ $(NoWarn);IL2110;IL2111;IL2114;IL2115
+
+ $(NoWarn);IL2112;IL2113
+
+ $(NoWarn);IL2118;IL2119;IL2120
+
diff --git a/global.json b/global.json
index f84b02d1ed39e3..f20d7f03daca4c 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "7.0.100-preview.5.22307.18",
+ "version": "7.0.100-preview.7.22377.5",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "7.0.100-preview.5.22307.18"
+ "dotnet": "7.0.100-preview.7.22377.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
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 886f7aa791fd69..2850c56a10f3c9 100644
--- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs
+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs
@@ -133,6 +133,7 @@ public sealed class IsByRefLikeAttribute : Attribute
public static class RuntimeFeature
{
+ public const string ByRefFields = nameof(ByRefFields);
public const string VirtualStaticsInInterfaces = nameof(VirtualStaticsInInterfaces);
}
}
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props
index 4fd71a9573f841..b7aa445890d07e 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.props
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props
@@ -13,8 +13,6 @@
false
Debug;Release;Checked
true
-
- link
diff --git a/src/coreclr/tools/dotnet-pgo/Program.cs b/src/coreclr/tools/dotnet-pgo/Program.cs
index 02cde991728a9e..53f61f05fb6722 100644
--- a/src/coreclr/tools/dotnet-pgo/Program.cs
+++ b/src/coreclr/tools/dotnet-pgo/Program.cs
@@ -1626,7 +1626,7 @@ void AddToInstrumentationData(int eventClrInstanceId, long methodID, int methodF
if (data->ProcessId != p.ProcessID)
continue;
- Span lbr32 = data->Entries(e.EventDataLength);
+ Span lbr32 = LbrTraceEventData32.Entries(ref *data, e.EventDataLength);
correlator.AttributeSampleToLbrRuns(lbr32);
}
else
@@ -1640,7 +1640,7 @@ void AddToInstrumentationData(int eventClrInstanceId, long methodID, int methodF
if (data->ProcessId != p.ProcessID)
continue;
- Span lbr64 = data->Entries(e.EventDataLength);
+ Span lbr64 = LbrTraceEventData64.Entries(ref *data, e.EventDataLength);
correlator.AttributeSampleToLbrRuns(lbr64);
}
}
diff --git a/src/coreclr/tools/dotnet-pgo/SPGO/LbrEntry.cs b/src/coreclr/tools/dotnet-pgo/SPGO/LbrEntry.cs
index 5f01ddfab8b431..d87b8e837766aa 100644
--- a/src/coreclr/tools/dotnet-pgo/SPGO/LbrEntry.cs
+++ b/src/coreclr/tools/dotnet-pgo/SPGO/LbrEntry.cs
@@ -55,10 +55,10 @@ public unsafe struct LbrTraceEventData32
public LbrOptionFlags Options;
private LbrEntry32 _entries;
- public Span Entries(int totalSize)
+ public static Span Entries(ref LbrTraceEventData32 data, int totalSize)
{
- IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As(ref this), ref Unsafe.As(ref _entries));
- return MemoryMarshal.CreateSpan(ref _entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry32));
+ IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As(ref data), ref Unsafe.As(ref data._entries));
+ return MemoryMarshal.CreateSpan(ref data._entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry32));
}
}
@@ -71,10 +71,10 @@ public unsafe struct LbrTraceEventData64
public LbrOptionFlags Options;
private LbrEntry64 _entries;
- public Span Entries(int totalSize)
+ public static Span Entries(ref LbrTraceEventData64 data, int totalSize)
{
- IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As(ref this), ref Unsafe.As(ref _entries));
- return MemoryMarshal.CreateSpan(ref _entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry64));
+ IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As(ref data), ref Unsafe.As(ref data._entries));
+ return MemoryMarshal.CreateSpan(ref data._entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry64));
}
}
}
diff --git a/src/tests/nativeaot/Directory.Build.props b/src/tests/nativeaot/Directory.Build.props
deleted file mode 100644
index c80fd3b623f2f2..00000000000000
--- a/src/tests/nativeaot/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- link
-
-
-