Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/sdk (#9846)
Browse files Browse the repository at this point in the history
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21124.3 to 6.0.100-preview.2.21125.1 (parent: Microsoft.NET.Sdk)

 - Don't set IsTrimmable on netcoreapp in 6.0

These assemblies now opt into trimming using AssemblyMetadata:
dotnet/runtime#48428.

The SDK side of the change was made in dotnet/sdk#16094.

For more context, see
https://github.com/mono/linker/blob/main/docs/design/trimmed-assemblies.md#net-6.
  • Loading branch information
dotnet-maestro[bot] authored Mar 2, 2021
1 parent 6f4819c commit 6c2b855
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>02cac30b1fbd0111c05c3b7684cb62b27aabd8c0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21151.12">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21151.14">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>8cf31f039a6ad6859351d79982d65c822d0c909f</Sha>
<Sha>4275de407c08927f0b0dc6d15a78eb0fa35e091a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21151.12">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21151.14">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>8cf31f039a6ad6859351d79982d65c822d0c909f</Sha>
<Sha>4275de407c08927f0b0dc6d15a78eb0fa35e091a</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21126.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand All @@ -116,9 +116,9 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>0447617600851a20f1d75a2ff86da4c0fc67d999</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21124.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21125.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/mono/linker</Uri>
<Sha>6b3a3050c70577bd1b3fd7611eef56679e22a4f1</Sha>
<Sha>44907d98e524f65db0a0edc2cab8afe077ba812a</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21151.16" CoherentParentDependency="Microsoft.NET.Sdk">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21151.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21151.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21151.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21151.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down
1 change: 0 additions & 1 deletion src/redist/targets/GenerateBundledVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
IsTrimmable="true"
/>
<KnownAppHostPack Include="Microsoft.NETCore.App"
Expand Down

0 comments on commit 6c2b855

Please sign in to comment.