Skip to content

Commit 6c2b855

Browse files
[master] Update dependencies from dotnet/sdk (#9846)
[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.
1 parent 6f4819c commit 6c2b855

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@
9191
<Uri>https://github.com/dotnet/templating</Uri>
9292
<Sha>02cac30b1fbd0111c05c3b7684cb62b27aabd8c0</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21151.12">
94+
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21151.14">
9595
<Uri>https://github.com/dotnet/sdk</Uri>
96-
<Sha>8cf31f039a6ad6859351d79982d65c822d0c909f</Sha>
96+
<Sha>4275de407c08927f0b0dc6d15a78eb0fa35e091a</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21151.12">
98+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21151.14">
9999
<Uri>https://github.com/dotnet/sdk</Uri>
100-
<Sha>8cf31f039a6ad6859351d79982d65c822d0c909f</Sha>
100+
<Sha>4275de407c08927f0b0dc6d15a78eb0fa35e091a</Sha>
101101
</Dependency>
102102
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
103103
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21126.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -116,9 +116,9 @@
116116
<Uri>https://github.com/microsoft/vstest</Uri>
117117
<Sha>0447617600851a20f1d75a2ff86da4c0fc67d999</Sha>
118118
</Dependency>
119-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21124.3" CoherentParentDependency="Microsoft.NET.Sdk">
119+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21125.1" CoherentParentDependency="Microsoft.NET.Sdk">
120120
<Uri>https://github.com/mono/linker</Uri>
121-
<Sha>6b3a3050c70577bd1b3fd7611eef56679e22a4f1</Sha>
121+
<Sha>44907d98e524f65db0a0edc2cab8afe077ba812a</Sha>
122122
<RepoName>linker</RepoName>
123123
</Dependency>
124124
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21151.16" CoherentParentDependency="Microsoft.NET.Sdk">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
</PropertyGroup>
5959
<PropertyGroup>
6060
<!-- Dependencies from https://github.com/dotnet/sdk -->
61-
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21151.12</MicrosoftNETSdkPackageVersion>
62-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21151.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
61+
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21151.14</MicrosoftNETSdkPackageVersion>
62+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21151.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6363
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6464
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
6565
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

src/redist/targets/GenerateBundledVersions.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ Copyright (c) .NET Foundation. All rights reserved.
250250
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
251251
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
252252
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
253-
IsTrimmable="true"
254253
/>
255254
256255
<KnownAppHostPack Include="Microsoft.NETCore.App"

0 commit comments

Comments
 (0)