Skip to content

Use linker matching TFM #29441

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
sbomer merged 9 commits into from
Dec 21, 2022
Merged

Use linker matching TFM #29441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7d0127
Use linker matching TFM
sbomer Dec 8, 2022
0b64548
Fix dependencies
sbomer Dec 8, 2022
824d8fd
Fix unrelated warning about types without namespace
sbomer Dec 8, 2022
29dfc71
Fix imports for unsupported TFMs
sbomer Dec 8, 2022
afabee4
Fix imports for IsTrimmable projects
sbomer Dec 8, 2022
78ddc5a
Add link to PR
sbomer Dec 8, 2022
f959fe2
Add empty ILLink target for blazor
sbomer Dec 8, 2022
fc9c6de
Revert "Fix unrelated warning about types without namespace"
sbomer Dec 8, 2022
181a21d
Update src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
sbomer Dec 9, 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
Prev Previous commit
Next Next commit
Add empty ILLink target for blazor
  • Loading branch information
@sbomer
sbomer committed Dec 8, 2022
commit f959fe231d62216deb295674ecbe2da8483ea524
2 changes: 1 addition & 1 deletion src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,23 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="ComputeFilesToPublish"
DependsOnTargets="PrepareForPublish;
ComputeResolvedFilesToPublishList;
ILLink;
CreateReadyToRunImages;
GeneratePublishDependencyFile;
GenerateSingleFileBundle">
</Target>

<!--
============================================================
ILLink

Initially an empty placeholder target. When trimming, this
will be redefined to invoke ILLink to perform IL trimming.
The placeholder exists to allow other targets to depend on it for ordering purposes.
============================================================
-->
<Target Name="ILLink" />

<PropertyGroup>
<CopyBuildOutputToPublishDirectory Condition="'$(CopyBuildOutputToPublishDirectory)'==''">true</CopyBuildOutputToPublishDirectory>
<CopyOutputSymbolsToPublishDirectory Condition="'$(CopyOutputSymbolsToPublishDirectory)'==''">true</CopyOutputSymbolsToPublishDirectory>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -1528,7 +1528,7 @@ static void Main() {}
@{
System.IO.Compression.ZipFile.OpenRead("test.zip");
}
""",
""",
},
AdditionalProperties =
{
Expand Down