Skip to content

DRAFT: Patch for missing TFM trimming change in Roslyn #15961

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

Closed
NikolaMilosavljevic wants to merge 2 commits into from
Closed

DRAFT: Patch for missing TFM trimming change in Roslyn #15961

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2e91d
Patch for missing TFM trimming change in Roslyn
NikolaMilosavljevic Mar 30, 2023
a112d4d
Added backport PR link
NikolaMilosavljevic Mar 31, 2023
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
Next Next commit
Patch for missing TFM trimming change in Roslyn
  • Loading branch information
@NikolaMilosavljevic
NikolaMilosavljevic committed Mar 30, 2023
commit dc2e91d485f59457b3c70cd0ca065e53cdd4f6aa
35 changes: 35 additions & 0 deletions src/SourceBuild/patches/roslyn/0001-Use-Content-for-non-TFM-specific-items.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <[email protected]>
Date: Thu, 30 Mar 2023 22:30:25 +0000
Subject: [PATCH] Use Content for non-TFM specific items

Copy link
Member

@MichaelSimons MichaelSimons Mar 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include a "Backport: <PR/Issue>" comment on all patches. This is very helpful for tracking purposes.

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Mar 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed with commit: a112d4d

---
.../AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
index 2ff9bc9edd3..690c01ea4ef 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
@@ -42,6 +42,11 @@
SetTargetFramework="TargetFramework=net6.0" />
</ItemGroup>

+ <ItemGroup>
+ <Content Include="build\**\*.*" PackagePath="build\" />
+ <Content Include="buildMultiTargeting\**\*.*" PackagePath="buildMultiTargeting\" />
+ </ItemGroup>
+
<Target Name="_GetFilesToPackage" DependsOnTargets="$(_DependsOn)">
<ItemGroup>
<_File Include="@(DesktopCompilerArtifact)" TargetDir="tasks/net472"/>
@@ -51,9 +56,6 @@
<_File Include="@(CoreClrCompilerBinArtifact)" TargetDir="tasks/net6.0/bincore"/>
<_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tasks/net6.0/bincore/runtimes"/>

- <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="build" />
- <_File Include="$(MSBuildProjectDirectory)\buildMultiTargeting\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="buildMultiTargeting" />
-
<TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)/%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)" />
</ItemGroup>
</Target>