Skip to content

Commit f4c8f6f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime (#27786)
[main] Update dependencies from dotnet/runtime - Update tests to match linker warnings in runtime - Removed redundant import
1 parent 5f19e30 commit f4c8f6f

File tree

3 files changed

+61
-46
lines changed

3 files changed

+61
-46
lines changed

‎eng/Version.Details.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@
66
<Sha>c6297c3329cbd45a811eb93d32de3648d8317d04</Sha>
77
<SourceBuild RepoName="templating" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22457.17">
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22460.5">
1010
<Uri>https://github.com/dotnet/runtime</Uri>
11-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
11+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
1212
</Dependency>
13-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22457.17">
13+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22460.5">
1414
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
15+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22457.17">
17+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22460.5">
1818
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
19+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22457.17">
21+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22460.5">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
23+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22457.17">
25+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22460.5">
2626
<Uri>https://github.com/dotnet/runtime</Uri>
27-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
27+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22457.17">
29+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22460.5">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
31+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22457.17">
33+
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22460.5">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
35+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22457.17">
37+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22460.5">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
39+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22457.17">
41+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22460.5">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
43+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22451-06">
4646
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -114,30 +114,30 @@
114114
<Sha>a9060d14067758ca17f8da072f4d2aa238b90045</Sha>
115115
<SourceBuild RepoName="linker" ManagedOnly="true" />
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22457.17">
117+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22460.5">
118118
<Uri>https://github.com/dotnet/runtime</Uri>
119-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
119+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
120120
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
121121
</Dependency>
122122
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22458.1">
123123
<Uri>https://github.com/dotnet/linker</Uri>
124124
<Sha>a9060d14067758ca17f8da072f4d2aa238b90045</Sha>
125125
</Dependency>
126-
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22457.17">
126+
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22460.5">
127127
<Uri>https://github.com/dotnet/runtime</Uri>
128-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
128+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
129129
</Dependency>
130-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22457.17">
130+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22460.5">
131131
<Uri>https://github.com/dotnet/runtime</Uri>
132-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
132+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22457.17">
134+
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22460.5">
135135
<Uri>https://github.com/dotnet/runtime</Uri>
136-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
136+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
137137
</Dependency>
138-
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22457.17">
138+
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22460.5">
139139
<Uri>https://github.com/dotnet/runtime</Uri>
140-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
140+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
141141
</Dependency>
142142
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22457.11">
143143
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -284,9 +284,9 @@
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285285
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
286286
</Dependency>
287-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22457.17">
287+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22460.5">
288288
<Uri>https://github.com/dotnet/runtime</Uri>
289-
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
289+
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
290290
</Dependency>
291291
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
292292
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@
3636
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3737
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22456.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
39-
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22457.17</SystemSecurityCryptographyProtectedDataPackageVersion>
39+
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22460.5</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4141
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4242
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
4343
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
44-
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22457.17</SystemReflectionMetadataLoadContextVersion>
44+
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22460.5</SystemReflectionMetadataLoadContextVersion>
4545
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4646
<SystemCommandLineVersion>2.0.0-beta4.22457.1</SystemCommandLineVersion>
4747
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4848
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4949
</PropertyGroup>
5050
<PropertyGroup>
5151
<!-- Dependencies from https://github.com/dotnet/runtime -->
52-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreAppRefPackageVersion>
53-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22457.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
54-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
52+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreAppRefPackageVersion>
53+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22460.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
54+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5555
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
56-
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftExtensionsDependencyModelPackageVersion>
57-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58-
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22457.17</MicrosoftNETHostModelVersion>
56+
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftExtensionsDependencyModelPackageVersion>
57+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58+
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22460.5</MicrosoftNETHostModelVersion>
5959
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
6060
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
6161
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
@@ -91,10 +91,10 @@
9191
</PropertyGroup>
9292
<PropertyGroup>
9393
<!-- Dependencies from https://github.com/dotnet/runtime -->
94-
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22457.17</SystemCodeDomPackageVersion>
95-
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22457.17</SystemTextEncodingCodePagesPackageVersion>
96-
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22457.17</SystemResourcesExtensionsPackageVersion>
97-
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftDotNetILCompilerPackageVersion>
94+
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22460.5</SystemCodeDomPackageVersion>
95+
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22460.5</SystemTextEncodingCodePagesPackageVersion>
96+
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22460.5</SystemResourcesExtensionsPackageVersion>
97+
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftDotNetILCompilerPackageVersion>
9898
</PropertyGroup>
9999
<PropertyGroup>
100100
<!-- Dependencies from https://github.com/dotnet/format -->

‎src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,24 +645,37 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused(s
645645
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
646646

647647
// Please keep list below sorted and de-duplicated
648-
var expectedOutput = new string[] {
648+
var expectedOutput = new List<string> {
649649
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComActivator.GetClassFactoryForTypeInternal(ComActivationContextInternal*",
650650
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComponentActivator.GetFunctionPointer(IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr",
651-
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
652651
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.DeserializeUsingBinaryFormatter(DesigntimeLicenseContextSerializer.StreamWrapper, String, RuntimeLicenseContext",
653652
"ILLink : Trim analysis warning IL2026: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream, Assembly",
654653
"ILLink : Trim analysis warning IL2026: System.StartupHookProvider.ProcessStartupHooks(",
655654
"ILLink : Trim analysis warning IL2063: System.RuntimeType.GetInterface(String, Boolean",
656655
"ILLink : Trim analysis warning IL2065: System.Runtime.Serialization.FormatterServices.InternalGetSerializableMembers(Type",
657656
};
657+
switch (targetFramework) {
658+
case "net6.0":
659+
expectedOutput.AddRange(new string[] {
660+
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
661+
});
662+
break;
663+
case "net7.0":
664+
expectedOutput.AddRange(new string[] {
665+
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssemblyInContextWhenSupported(IntPtr, IntPtr",
666+
});
667+
break;
668+
default:
669+
throw new InvalidOperationException();
670+
}
658671

659672
var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName);
660673
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
661674

662675
var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
663676
var result = publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:PublishTrimmed=true", "/p:TrimMode=copyused", "/p:TrimmerSingleWarn=false");
664677
result.Should().Pass();
665-
ValidateWarningsOnHelloWorldApp(publishCommand, result, expectedOutput, targetFramework, rid);
678+
ValidateWarningsOnHelloWorldApp(publishCommand, result, expectedOutput.ToArray(), targetFramework, rid);
666679
}
667680

668681
[RequiresMSBuildVersionTheory("17.0.0.32901")]
@@ -675,7 +688,6 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr
675688
// Please keep list below sorted and de-duplicated
676689
var expectedOutput = new List<string> {
677690
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComponentActivator.GetFunctionPointer(IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr",
678-
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
679691
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.DeserializeUsingBinaryFormatter(DesigntimeLicenseContextSerializer.StreamWrapper, String, RuntimeLicenseContext",
680692
"ILLink : Trim analysis warning IL2026: System.ComponentModel.Design.DesigntimeLicenseContextSerializer.SerializeWithBinaryFormatter(Stream, String, DesigntimeLicenseContext",
681693
"ILLink : Trim analysis warning IL2026: System.Data.DataSet.System.Xml.Serialization.IXmlSerializable.GetSchema(",
@@ -690,14 +702,17 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr
690702
switch (targetFramework) {
691703
case "net6.0":
692704
expectedOutput.AddRange(new string[] {
705+
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssembly(IntPtr, IntPtr",
693706
"ILLink : Trim analysis warning IL2055: System.Runtime.Serialization.ClassDataContract.UnadaptedClassType.get",
694707
"ILLink : Trim analysis warning IL2067: System.Runtime.Serialization.SurrogateDataContract.GetUninitializedObject(Type"
695708
});
696709
break;
697710
case "net7.0":
698711
expectedOutput.AddRange(new string[] {
699712
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.ComActivator.GetClassFactoryForTypeInternal(ComActivationContextInternal*",
713+
"ILLink : Trim analysis warning IL2026: Internal.Runtime.InteropServices.InMemoryAssemblyLoader.LoadInMemoryAssemblyInContextWhenSupported(IntPtr, IntPtr",
700714
"ILLink : Trim analysis warning IL2026: System.Linq.Queryable: Using member 'System.Linq.EnumerableRewriter.s_seqMethods' which has 'RequiresUnreferencedCodeAttribute'",
715+
"ILLink : Trim analysis warning IL2026: System.Transactions.DtcProxyShim.DtcProxyShimFactory.ConnectToProxyCore(String, Guid, Object, Boolean&, Byte[]&, ResourceManagerShim&",
701716
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.Marshal.GenerateProgIdForType(Type",
702717
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.Marshal.GenerateProgIdForType(Type",
703718
"ILLink : Trim analysis warning IL2045: System.Runtime.InteropServices.ComAwareEventInfo.GetDataForComInvocation(EventInfo, Guid&, Int32&",

0 commit comments

Comments
 (0)