diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4adebd39f9f7..b5ae885bef8f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,41 +6,41 @@
b265e05b3f91833874ff709f128fea847029e428
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
https://github.com/dotnet/msbuild
@@ -114,30 +114,30 @@
a9060d14067758ca17f8da072f4d2aa238b90045
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
https://github.com/dotnet/linker
a9060d14067758ca17f8da072f4d2aa238b90045
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
https://github.com/dotnet/windowsdesktop
@@ -284,9 +284,9 @@
https://github.com/dotnet/arcade
4f864b2841b3317bdfc516ead0ba6e7856fab575
-
+
https://github.com/dotnet/runtime
- cc9d46546b8e72b34a5f387a5ec9615197d79f1f
+ 1f94e11358debe8a9e4804f03939eac535ee41a4
https://github.com/dotnet/xliff-tasks
diff --git a/eng/Versions.props b/eng/Versions.props
index 4254c7a0933f..0530dd9243d3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,12 +36,12 @@
6.0.0
8.0.0-beta.22456.4
7.0.0-preview.22423.2
- 8.0.0-alpha.1.22457.17
+ 8.0.0-alpha.1.22460.5
4.3.0
4.3.0
4.0.5
6.0.0
- 8.0.0-alpha.1.22457.17
+ 8.0.0-alpha.1.22460.5
4.6.0
2.0.0-beta4.22457.1
1.0.0-preview5.1.22263.1
@@ -49,13 +49,13 @@
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
6.0.0-preview.7.21363.9
$(MicrosoftExtensionsDependencyModelPackageVersion)
6.0.0
@@ -91,10 +91,10 @@
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
- 8.0.0-alpha.1.22457.17
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
+ 8.0.0-alpha.1.22460.5
diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
index a69b7d7cbed0..eac85bcd6a21 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
@@ -645,16 +645,29 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused(s
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
// Please keep list below sorted and de-duplicated
- var expectedOutput = new string[] {
+ var expectedOutput = new List {
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComActivator.GetClassFactoryForTypeInternal(ComActivationContextInternal*",
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComponentActivator.GetFunctionPointer(IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr",
- "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.DeserializeUsingBinaryFormatter(DesigntimeLicenseContextSerializer.StreamWrapper, String, RuntimeLicenseContext",
"ILLink : Trim analysis warning IL2026: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream, Assembly",
"ILLink : Trim analysis warning IL2026: System.StartupHookProvider.ProcessStartupHooks(",
"ILLink : Trim analysis warning IL2063: System.RuntimeType.GetInterface(String, Boolean",
"ILLink : Trim analysis warning IL2065: System.Runtime.Serialization.FormatterServices.InternalGetSerializableMembers(Type",
};
+ switch (targetFramework) {
+ case "net6.0":
+ expectedOutput.AddRange(new string[] {
+ "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
+ });
+ break;
+ case "net7.0":
+ expectedOutput.AddRange(new string[] {
+ "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssemblyInContextWhenSupported(IntPtr, IntPtr",
+ });
+ break;
+ default:
+ throw new InvalidOperationException();
+ }
var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName);
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
@@ -662,7 +675,7 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused(s
var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
var result = publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:PublishTrimmed=true", "/p:TrimMode=copyused", "/p:TrimmerSingleWarn=false");
result.Should().Pass();
- ValidateWarningsOnHelloWorldApp(publishCommand, result, expectedOutput, targetFramework, rid);
+ ValidateWarningsOnHelloWorldApp(publishCommand, result, expectedOutput.ToArray(), targetFramework, rid);
}
[RequiresMSBuildVersionTheory("17.0.0.32901")]
@@ -675,7 +688,6 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr
// Please keep list below sorted and de-duplicated
var expectedOutput = new List {
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComponentActivator.GetFunctionPointer(IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr",
- "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.DeserializeUsingBinaryFormatter(DesigntimeLicenseContextSerializer.StreamWrapper, String, RuntimeLicenseContext",
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.SerializeWithBinaryFormatter(Stream, String, DesigntimeLicenseContext",
"ILLink : Trim analysis warning IL2026: System.Data.DataSet.System.Xml.Serialization.IXmlSerializable.GetSchema(",
@@ -690,6 +702,7 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr
switch (targetFramework) {
case "net6.0":
expectedOutput.AddRange(new string[] {
+ "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
"ILLink : Trim analysis warning IL2055: System.Runtime.Serialization.ClassDataContract.UnadaptedClassType.get",
"ILLink : Trim analysis warning IL2067: System.Runtime.Serialization.SurrogateDataContract.GetUninitializedObject(Type"
});
@@ -697,7 +710,9 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr
case "net7.0":
expectedOutput.AddRange(new string[] {
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComActivator.GetClassFactoryForTypeInternal(ComActivationContextInternal*",
+ "ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssemblyInContextWhenSupported(IntPtr, IntPtr",
"ILLink : Trim analysis warning IL2026: System.Linq.Queryable: Using member 'System.Linq.EnumerableRewriter.s_seqMethods' which has 'RequiresUnreferencedCodeAttribute'",
+ "ILLink : Trim analysis warning IL2026: System.Transactions.DtcProxyShim.DtcProxyShimFactory.ConnectToProxyCore(String, Guid, Object, Boolean&, Byte[]&, ResourceManagerShim&",
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.Marshal.GenerateProgIdForType(Type",
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.Marshal.GenerateProgIdForType(Type",
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.ComAwareEventInfo.GetDataForComInvocation(EventInfo, Guid&, Int32&",