Skip to content

[main] Update dependencies from dotnet/runtime #27786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 12, 2022
Merged

[main] Update dependencies from dotnet/runtime #27786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5534a9b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 9, 2022
ee2c900
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 10, 2022
0dfcd0a
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 11, 2022
499547d
Update tests to match linker warnings in runtime
jkurdek Sep 12, 2022
59d7d42
Removed redundant import
jkurdek Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
<Sha>b265e05b3f91833874ff709f128fea847029e428</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22451-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -114,30 +114,30 @@
<Sha>a9060d14067758ca17f8da072f4d2aa238b90045</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22458.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>a9060d14067758ca17f8da072f4d2aa238b90045</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22457.11">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -284,9 +284,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22457.17">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22460.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cc9d46546b8e72b34a5f387a5ec9615197d79f1f</Sha>
<Sha>1f94e11358debe8a9e4804f03939eac535ee41a4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22456.4</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22457.17</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22460.5</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22457.17</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22460.5</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22457.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22457.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22460.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22457.17</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22460.5</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -91,10 +91,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22457.17</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22457.17</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22457.17</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22457.17</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22460.5</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22460.5</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22460.5</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22460.5</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
23 changes: 19 additions & 4 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,24 +645,37 @@ 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<string> {
"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);

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")]
Expand All @@ -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<string> {
"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(",
Expand All @@ -690,14 +702,17 @@ 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"
});
break;
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&",
Expand Down