Skip to content

[master] Update dependencies from dotnet/runtime #14574

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e0d8e220b8fa267fd948ddfaa4cc0ac1a1ce6add</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20610.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3346d7b4ff047c854913fb2ded6e3aa726da6d11</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
Expand Down Expand Up @@ -110,21 +110,21 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>a074fbfd1d0d639893bd61afc7e946a275af9e55</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20560.10">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-alpha.1.20612.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -208,9 +208,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3346d7b4ff047c854913fb2ded6e3aa726da6d11</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-alpha.1.20616.14">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20aa7ad9fd4890be28ab4673a796e9b5928ceabd</Sha>
<Sha>be27e294a12514638bb5337c7fe5cc72d93a443a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
22 changes: 11 additions & 11 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@
<SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.20610.4</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-alpha.1.20560.10</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-alpha.1.20616.14</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>5.0.0</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-alpha.1.20616.14</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20560.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20616.14</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20616.14</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20616.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20560.10</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-alpha.1.20560.10</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.0-alpha.1.20560.10</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20616.14</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-alpha.1.20616.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.0-alpha.1.20616.14</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -76,10 +76,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20560.10</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0-alpha.1.20560.10</SystemTextEncodingCodePagesPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20616.14</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0-alpha.1.20616.14</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20307.4</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20560.10</SystemResourcesExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20616.14</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="4.7.2" Condition="'$(UseSystemTextJson)'=='True'"/>
<!-- No PackageReference to System.Text.Json necessary, because it's included in .NET 5.0 and higher -->
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" Condition="'$(UseSystemTextJson)'!='True'"/>

<!-- Reference this package to avoid package downgrade errors. See https://github.com/dotnet/sdk/issues/3044 for details -->
Expand Down
61 changes: 18 additions & 43 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -291,55 +291,30 @@ public void ILLink_verify_analysis_warnings_hello_world_app(string targetFramewo
{
var projectName = "AnalysisWarningsOnHelloWorldApp";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
List<string> expectedOutput = new List<string>() {
"ILLink : Trim analysis warning IL2059: System.Reflection.RuntimeConstructorInfo.Invoke(Object,BindingFlags,Binder,Object[],CultureInfo",
"ILLink : Trim analysis warning IL2070: System.Reflection.RuntimeAssembly.AddPublicNestedTypes(Type,List<Type>,List<Exception>",
"ILLink : Trim analysis warning IL2026: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.GetMethodInternal(String,BindingFlags,Binder,CallingConventions,Type[],ParameterModifier[]",
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.GetMethodInternal(String,BindingFlags,Binder,CallingConventions,Type[],ParameterModifier[]",

// Please keep list below sorted and de-duplicated
List<string> expectedOutput = new List<string> () {
"ILLink : Trim analysis warning IL2026: System.Runtime.Serialization.Formatters.Binary.ObjectReader.TopLevelAssemblyTypeResolver.ResolveType(Assembly,String,Boolean",
"ILLink : Trim analysis warning IL2026: System.Runtime.Serialization.FormatterServices.GetTypeFromAssembly(Assembly,String",
"ILLink : Trim analysis warning IL2057: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2057: System.Resources.ResourceReader.FindType(Int32",
"ILLink : Trim analysis warning IL2057: System.Runtime.Serialization.Formatters.Binary.ObjectReader.GetSimplyNamedTypeFromAssembly(Assembly,String,Type&",
"ILLink : Trim analysis warning IL2060: System.Resources.ResourceReader.InitializeBinaryFormatter(",
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.ManifestBuilder.GetTypeName(Type",
"ILLink : Trim analysis warning IL2075: System.Diagnostics.Tracing.ManifestBuilder.CreateManifestString(",
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.TypeAnalysis.TypeAnalysis(Type,EventDataAttribute,List<Type>",
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.NullableTypeInfo.NullableTypeInfo(Type,List<Type>",
"ILLink : Trim analysis warning IL2077: System.Runtime.Serialization.Formatters.Binary.ObjectReader.ParseObject(ParseRecord",
"ILLink : Trim analysis warning IL2075: System.Runtime.Serialization.ObjectManager.DoValueTypeFixup(FieldInfo,ObjectHolder,Object",
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.TypeAnalysis.TypeAnalysis(Type,EventDataAttribute,List<Type>",
"ILLink : Trim analysis warning IL2070: System.Runtime.Serialization.FormatterServices.GetSerializableFields(Type",
"ILLink : Trim analysis warning IL2070: System.Runtime.Serialization.ObjectManager.GetDeserializationConstructor(Type",
"ILLink : Trim analysis warning IL2057: System.Runtime.Serialization.Formatters.Binary.ObjectReader.GetSimplyNamedTypeFromAssembly(Assembly,String,Type&",
"ILLink : Trim analysis warning IL2026: System.Runtime.Serialization.FormatterServices.GetTypeFromAssembly(Assembly,String",
"ILLink : Trim analysis warning IL2055: System.Reflection.Emit.TypeBuilder.DefineDefaultConstructorNoLock(MethodAttributes",
"ILLink : Trim analysis warning IL2055: System.Reflection.Emit.TypeBuilder.DefineDefaultConstructorNoLock(MethodAttributes",
"ILLink : Trim analysis warning IL2075: System.Reflection.Emit.TypeBuilder.DefineDefaultConstructorNoLock(MethodAttributes",
"ILLink : Trim analysis warning IL2075: System.Reflection.Emit.TypeBuilder.DefineDefaultConstructorNoLock(MethodAttributes",
"ILLink : Trim analysis warning IL2026: System.Runtime.Serialization.Formatters.Binary.ObjectReader.TopLevelAssemblyTypeResolver.ResolveType(Assembly,String,Boolean",
"ILLink : Trim analysis warning IL2075: System.Runtime.Serialization.FormatterServices.InternalGetSerializableMembers(Type",
"ILLink : Trim analysis warning IL2055: System.Reflection.Emit.TypeBuilder.GetConstructor(Type,ConstructorInfo",
"ILLink : Trim analysis warning IL2070: System.Runtime.Serialization.SerializationEvents.GetMethodsWithAttribute(Type,Type",
"ILLink : Trim analysis warning IL2070: System.Runtime.Serialization.FormatterServices.GetSerializableFields(Type",
"ILLink : Trim analysis warning IL2082: System.Reflection.Emit.TypeBuilder.DefineConstructorNoLock(MethodAttributes,CallingConventions,Type[],Type[][],Type[][]",
"ILLink : Trim analysis warning IL2026: System.TypeNameParser.ResolveType(Assembly,String[],Func<Assembly,String,Boolean,Type>,Boolean,Boolean,StackCrawlMark&",
"ILLink : Trim analysis warning IL2075: System.TypeNameParser.ResolveType(Assembly,String[],Func<Assembly,String,Boolean,Type>,Boolean,Boolean,StackCrawlMark&",
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetTypeNoLock(String,Boolean,Boolean",
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetTypeNoLock(String,Boolean,Boolean",
"ILLink : Trim analysis warning IL2075: System.Reflection.CustomAttributeData.Init(Object",
"ILLink : Trim analysis warning IL2075: System.Diagnostics.StackTrace.TryResolveStateMachineMethod(MethodBase&,Type&",
"ILLink : Trim analysis warning IL2057: System.Resources.ResourceReader.FindType(Int32",
"ILLink : Trim analysis warning IL2057: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2072: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2057: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2072: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2077: System.Resources.ResourceReader.InitializeBinaryFormatter(",
"ILLink : Trim analysis warning IL2072: System.Diagnostics.Tracing.EventSource.EnsureDescriptorsInitialized(",
"ILLink : Trim analysis warning IL2075: System.Attribute.GetParentDefinition(PropertyInfo,Type[]",
"ILLink : Trim analysis warning IL2075: System.Attribute.GetParentDefinition(EventInfo",
"ILLink : Trim analysis warning IL2080: System.Resources.ResourceReader.<>c.<InitializeBinaryFormatter>b__6_1(",
"ILLink : Trim analysis warning IL2060: System.Resources.ResourceReader.<>c.<InitializeBinaryFormatter>b__6_1(",
"ILLink : Trim analysis warning IL2075: System.Diagnostics.Tracing.EventSource.CreateManifestAndDescriptors(Type,String,EventSource,EventManifestOptions",
"ILLink : Trim analysis warning IL2072: System.Diagnostics.Tracing.NullableTypeInfo.WriteData(PropertyValue",
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetGenericMethodBaseDefinition(MethodBase",
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetGenericMethodBaseDefinition(MethodBase",
"ILLink : Trim analysis warning IL2055: System.RuntimeTypeHandle.GetTypeHelper(Type,Type[],IntPtr,Int32"
"ILLink : Trim analysis warning IL2072: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
"ILLink : Trim analysis warning IL2075: System.Diagnostics.Tracing.EventSource.CreateManifestAndDescriptors(Type,String,EventSource,EventManifestOptions",
"ILLink : Trim analysis warning IL2075: System.Diagnostics.Tracing.ManifestBuilder.CreateManifestString(",
"ILLink : Trim analysis warning IL2075: System.Runtime.Serialization.FormatterServices.InternalGetSerializableMembers(Type",
"ILLink : Trim analysis warning IL2075: System.Runtime.Serialization.ObjectManager.DoValueTypeFixup(FieldInfo,ObjectHolder,Object",
"ILLink : Trim analysis warning IL2077: System.Resources.ResourceReader.InitializeBinaryFormatter(",
"ILLink : Trim analysis warning IL2077: System.Runtime.Serialization.Formatters.Binary.ObjectReader.ParseObject(ParseRecord",
};

var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName);
Expand Down