From 192fd18c7c6955bfe1af8d25cd7c05eec878f4f8 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 23 Feb 2022 12:21:21 -0800 Subject: [PATCH 1/3] Code gen --- eng/CodeGen.proj | 24 +++++++++++++++++ eng/TrimmableProjects.props | 27 +++++++++++++++++++ eng/targets/ResolveReferences.targets | 1 + ...rosoft.AspNetCore.Http.Abstractions.csproj | 1 - .../LinkabilityChecker.csproj | 11 ++++---- 5 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 eng/TrimmableProjects.props diff --git a/eng/CodeGen.proj b/eng/CodeGen.proj index 799c20e07c08..41916fd33a29 100644 --- a/eng/CodeGen.proj +++ b/eng/CodeGen.proj @@ -23,6 +23,7 @@ <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'true')->Distinct())" /> <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'false')->Distinct())" /> + <_TrimmableProject Include="@(_ProjectReferenceProvider->WithMetadataValue('Trimmable', 'true')->Distinct())" /> @@ -73,6 +74,29 @@ + + + $(MSBuildThisFileDirectory)TrimmableProjects.props + + properties from each .csproj in this repository. +--> + + + @(_TrimmableProject->'', '%0A ') + + + ]]> + + + + + diff --git a/eng/TrimmableProjects.props b/eng/TrimmableProjects.props new file mode 100644 index 000000000000..9f769e59da97 --- /dev/null +++ b/eng/TrimmableProjects.props @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 077c13088e44..99835cfe6894 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -316,6 +316,7 @@ $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) $([MSBuild]::ValueOrDefault($(IsPackable),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) + $([MSBuild]::ValueOrDefault($(Trimmable),'false')) diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj index 849312a4f462..6de147dda8ac 100644 --- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -13,7 +13,6 @@ Microsoft.AspNetCore.Http.HttpResponse true aspnetcore false - true diff --git a/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj b/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj index 01741adf0fa6..2643063b73f2 100644 --- a/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj +++ b/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj @@ -4,13 +4,14 @@ false Exe + + + - - - - - + + + From 94d30fabe4221d399a90a50822775af6b77f01d7 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 23 Feb 2022 15:37:11 -0800 Subject: [PATCH 2/3] Update eng/CodeGen.proj Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- eng/CodeGen.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/CodeGen.proj b/eng/CodeGen.proj index 41916fd33a29..afcecf3cb6b1 100644 --- a/eng/CodeGen.proj +++ b/eng/CodeGen.proj @@ -84,7 +84,7 @@ This file contains a complete list of projects annotated for trimming. - This project is generated using the properties from each .csproj in this repository. + This file is generated using the properties from each .csproj in this repository. --> From b81cbed780960e3d88545c7305f87345eb0f5ea6 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 23 Feb 2022 16:20:04 -0800 Subject: [PATCH 3/3] Fixup --- eng/TrimmableProjects.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/TrimmableProjects.props b/eng/TrimmableProjects.props index 9f769e59da97..4600e90d4f3f 100644 --- a/eng/TrimmableProjects.props +++ b/eng/TrimmableProjects.props @@ -3,7 +3,7 @@ This file contains a complete list of projects annotated for trimming. - This project is generated using the properties from each .csproj in this repository. + This file is generated using the properties from each .csproj in this repository. -->