Skip to content

Commit 0ae5136

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/runtime (#14303)
[master] Update dependencies from dotnet/runtime - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 6.0.0-alpha.1.20516.1 to 6.0.0-alpha.1.20527.2 (parent: Microsoft.NETCore.App.Internal) - Merge branch 'master' into darc-master-ac160965-c65c-4720-91ea-31b6c47f3c32 - Update test to expect less warnings from default console app This is in reaction to dotnet/runtime#43594.
1 parent 8b05176 commit 0ae5136

File tree

3 files changed

+37
-49
lines changed

3 files changed

+37
-49
lines changed

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,41 @@
99
<Uri>https://github.com/dotnet/templating</Uri>
1010
<Sha>f7852759a89c245167c090657576c11c8e1839ee</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20521.2">
12+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20551.7">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
14+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20521.2">
16+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20551.7">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
18+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20521.2">
20+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20551.7">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
22+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-alpha.1.20521.2">
24+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-alpha.1.20551.7">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
26+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20521.2">
28+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-alpha.1.20551.7">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
30+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20529.1">
3333
<Uri>https://github.com/dotnet/arcade</Uri>
3434
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-alpha.1.20521.2">
36+
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-alpha.1.20551.7">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
38+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20521.2">
40+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-alpha.1.20551.7">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
42+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-alpha.1.20521.2">
44+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-alpha.1.20551.7">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
46+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
4747
</Dependency>
4848
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
4949
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
@@ -85,25 +85,25 @@
8585
<Uri>https://github.com/microsoft/vstest</Uri>
8686
<Sha>81d3148c7cd588c84a9e6cadbd7e04189127d4c9</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.20516.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
88+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.20527.2" CoherentParentDependency="Microsoft.NETCore.App.Internal">
8989
<Uri>https://github.com/mono/linker</Uri>
90-
<Sha>388d3905692d220e758f2f76987bf41aa8a8bb85</Sha>
90+
<Sha>57974c1f5790e6fb33f5fce161707be5cd86c4d3</Sha>
9191
</Dependency>
92-
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20521.2">
92+
<Dependency Name="System.CodeDom" Version="6.0.0-alpha.1.20551.7">
9393
<Uri>https://github.com/dotnet/runtime</Uri>
94-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
94+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
9595
</Dependency>
96-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-alpha.1.20521.2">
96+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-alpha.1.20551.7">
9797
<Uri>https://github.com/dotnet/runtime</Uri>
98-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
98+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
9999
</Dependency>
100-
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-alpha.1.20521.2">
100+
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-alpha.1.20551.7">
101101
<Uri>https://github.com/dotnet/runtime</Uri>
102-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
102+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
103103
</Dependency>
104-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20521.2">
104+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-alpha.1.20551.7">
105105
<Uri>https://github.com/dotnet/runtime</Uri>
106-
<Sha>2c854456ede5139c4eabf21a8a76fe7ef1cedcb7</Sha>
106+
<Sha>ecd979c9860caee8326f8678736ae98a77bdae5b</Sha>
107107
</Dependency>
108108
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-alpha.1.20531.1">
109109
<Uri>https://github.com/dotnet/windowsdesktop</Uri>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@
2929
<SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion>
3030
<MicrosoftDotNetSignToolVersion>6.0.0-beta.20529.1</MicrosoftDotNetSignToolVersion>
3131
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
32-
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-alpha.1.20521.2</SystemSecurityCryptographyProtectedDataPackageVersion>
32+
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-alpha.1.20551.7</SystemSecurityCryptographyProtectedDataPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3434
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3535
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3636
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
3737
</PropertyGroup>
3838
<PropertyGroup>
3939
<!-- Dependencies from https://github.com/dotnet/runtime -->
40-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20521.2</MicrosoftNETCoreAppRefPackageVersion>
41-
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20521.2</MicrosoftNETCoreAppInternalPackageVersion>
42-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20521.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
40+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20551.7</MicrosoftNETCoreAppRefPackageVersion>
41+
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20551.7</MicrosoftNETCoreAppInternalPackageVersion>
42+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20551.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4343
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
44-
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20521.2</MicrosoftExtensionsDependencyModelPackageVersion>
45-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-alpha.1.20521.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
46-
<MicrosoftNETHostModelVersion>6.0.0-alpha.1.20521.2</MicrosoftNETHostModelVersion>
44+
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-alpha.1.20551.7</MicrosoftExtensionsDependencyModelPackageVersion>
45+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-alpha.1.20551.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
46+
<MicrosoftNETHostModelVersion>6.0.0-alpha.1.20551.7</MicrosoftNETHostModelVersion>
4747
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
4848
</PropertyGroup>
4949
<PropertyGroup>
@@ -70,14 +70,14 @@
7070
</PropertyGroup>
7171
<PropertyGroup>
7272
<!-- Dependencies from https://github.com/mono/linker -->
73-
<MicrosoftNETILLinkTasksPackageVersion>6.0.0-alpha.1.20516.1</MicrosoftNETILLinkTasksPackageVersion>
73+
<MicrosoftNETILLinkTasksPackageVersion>6.0.0-alpha.1.20527.2</MicrosoftNETILLinkTasksPackageVersion>
7474
</PropertyGroup>
7575
<PropertyGroup>
7676
<!-- Dependencies from https://github.com/dotnet/runtime -->
77-
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20521.2</SystemCodeDomPackageVersion>
78-
<SystemTextEncodingCodePagesPackageVersion>6.0.0-alpha.1.20521.2</SystemTextEncodingCodePagesPackageVersion>
77+
<SystemCodeDomPackageVersion>6.0.0-alpha.1.20551.7</SystemCodeDomPackageVersion>
78+
<SystemTextEncodingCodePagesPackageVersion>6.0.0-alpha.1.20551.7</SystemTextEncodingCodePagesPackageVersion>
7979
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20307.4</SystemSecurityCryptographyProtectedDataPackageVersion>
80-
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20521.2</SystemResourcesExtensionsPackageVersion>
80+
<SystemResourcesExtensionsPackageVersion>6.0.0-alpha.1.20551.7</SystemResourcesExtensionsPackageVersion>
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,23 +290,13 @@ public void ILLink_verify_analysis_warnings_hello_world_app(string targetFramewo
290290
var projectName = "AnalysisWarningsOnHelloWorldApp";
291291
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
292292
List<string> expectedOutput = new List<string> () {
293-
"ILLink : Trim analysis warning IL2070: System.RuntimeType.GetMethodBase(RuntimeType,RuntimeMethodHandleInternal",
294293
"ILLink : Trim analysis warning IL2059: System.Reflection.RuntimeConstructorInfo.Invoke(Object,BindingFlags,Binder,Object[],CultureInfo",
295-
"ILLink : Trim analysis warning IL2026: System.Reflection.CustomAttribute.GetAttributeUsage(RuntimeType",
296-
"ILLink : Trim analysis warning IL2065: System.Reflection.CustomAttribute.AddCustomAttributes(ListBuilder`1&,RuntimeModule,Int32,RuntimeType,Boolean,RuntimeType.ListBuilder<Object>",
297-
"ILLink : Trim analysis warning IL2065: System.Reflection.CustomAttribute.AddCustomAttributes(ListBuilder`1&,RuntimeModule,Int32,RuntimeType,Boolean,RuntimeType.ListBuilder<Object>",
298-
"ILLink : Trim analysis warning IL2065: System.Reflection.CustomAttribute.AddCustomAttributes(ListBuilder`1&,RuntimeModule,Int32,RuntimeType,Boolean,RuntimeType.ListBuilder<Object>",
299-
"ILLink : Trim analysis warning IL2055: System.Reflection.Emit.TypeBuilderInstantiation.Substitute(Type[]",
300294
"ILLink : Trim analysis warning IL2070: System.Reflection.RuntimeAssembly.AddPublicNestedTypes(Type,List<Type>,List<Exception>",
301295
"ILLink : Trim analysis warning IL2026: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
302296
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
303297
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.ResolveLiteralField(Int32,Type[],Type[]",
304298
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.GetMethodInternal(String,BindingFlags,Binder,CallingConventions,Type[],ParameterModifier[]",
305299
"ILLink : Trim analysis warning IL2075: System.Reflection.RuntimeModule.GetMethodInternal(String,BindingFlags,Binder,CallingConventions,Type[],ParameterModifier[]",
306-
"ILLink : Trim analysis warning IL2026: System.Reflection.CustomAttribute.FilterCustomAttributeRecord(MetadataToken,MetadataImport&,RuntimeModule,MetadataToken,RuntimeType,Boolean,ListBuilder`1&,RuntimeType&,IRuntimeMethodInfo&,Boolean&",
307-
"ILLink : Trim analysis warning IL2026: System.Reflection.CustomAttribute.FilterCustomAttributeRecord(MetadataToken,MetadataImport&,RuntimeModule,MetadataToken,RuntimeType,Boolean,ListBuilder`1&,RuntimeType&,IRuntimeMethodInfo&,Boolean&",
308-
"ILLink : Trim analysis warning IL2075: System.Reflection.CustomAttributeData.CustomAttributeData(RuntimeModule,MetadataToken,ConstArray&",
309-
"ILLink : Trim analysis warning IL2075: System.Reflection.CustomAttributeData.CustomAttributeData(RuntimeModule,MetadataToken,ConstArray&",
310300
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.ManifestBuilder.GetTypeName(Type",
311301
"ILLink : Trim analysis warning IL2075: System.Diagnostics.Tracing.ManifestBuilder.CreateManifestString(",
312302
"ILLink : Trim analysis warning IL2070: System.Diagnostics.Tracing.TypeAnalysis.TypeAnalysis(Type,EventDataAttribute,List<Type>",
@@ -332,15 +322,13 @@ public void ILLink_verify_analysis_warnings_hello_world_app(string targetFramewo
332322
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetTypeNoLock(String,Boolean,Boolean",
333323
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetTypeNoLock(String,Boolean,Boolean",
334324
"ILLink : Trim analysis warning IL2075: System.Reflection.CustomAttributeData.Init(Object",
335-
"ILLink : Trim analysis warning IL2055: System.Reflection.SignatureTypeExtensions.TryMakeGenericType(Type,Type[]",
336325
"ILLink : Trim analysis warning IL2075: System.Diagnostics.StackTrace.TryResolveStateMachineMethod(MethodBase&,Type&",
337326
"ILLink : Trim analysis warning IL2057: System.Resources.ResourceReader.FindType(Int32",
338327
"ILLink : Trim analysis warning IL2057: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
339328
"ILLink : Trim analysis warning IL2072: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
340329
"ILLink : Trim analysis warning IL2057: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
341330
"ILLink : Trim analysis warning IL2072: System.Resources.ManifestBasedResourceGroveler.CreateResourceSet(Stream,Assembly",
342331
"ILLink : Trim analysis warning IL2077: System.Resources.ResourceReader.InitializeBinaryFormatter(",
343-
"ILLink : Trim analysis warning IL2026: System.Reflection.Associates.AssignAssociates(Int32,RuntimeType,RuntimeType",
344332
"ILLink : Trim analysis warning IL2072: System.Diagnostics.Tracing.EventSource.EnsureDescriptorsInitialized(",
345333
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetGenericMethodBaseDefinition(MethodBase",
346334
"ILLink : Trim analysis warning IL2026: System.Reflection.Emit.ModuleBuilder.GetGenericMethodBaseDefinition(MethodBase",

0 commit comments

Comments
 (0)