Skip to content
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

[release/8.0-staging] Move generation of SuggestedBindingRedirects.targets to inner build #112494

Merged
merged 1 commit into from
Feb 19, 2025
+10 −8
Merged

[release/8.0-staging] Move generation of SuggestedBindingRedirects.targets to inner build #112494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
<IsPackable>true</IsPackable>
<SuggestedBindingRedirectsPackageFile>$(BaseIntermediateOutputPath)SuggestedBindingRedirects.targets</SuggestedBindingRedirectsPackageFile>
<BeforePack>$(BeforePack);GeneratePackageTargetsFile</BeforePack>
<PackageDescription>Provides classes which read and write resources in a format that supports non-primitive objects.

Commonly Used Types:
Expand Down Expand Up @@ -41,7 +40,7 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs"
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs"
Link="System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs"
Link="System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
Expand All @@ -51,10 +50,11 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
</ItemGroup>

<Target Name="GeneratePackageTargetsFile"
<Target Name="GeneratePackageTargetsFile"
Inputs="$(MSBuildAllProjects)"
Outputs="$(SuggestedBindingRedirectsPackageFile)"
Condition="'$(NetFrameworkMinimum)' != ''">
AfterTargets="CoreCompile"
Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
<PropertyGroup>
<SuggestedBindingRedirectsPackageFileContent><![CDATA[<Project>
<!-- ResolveAssemblyReferences will never see the assembly reference embedded in the resources type,
Expand All @@ -71,9 +71,11 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
Lines="$(SuggestedBindingRedirectsPackageFileContent)"
Overwrite="true" />

<ItemGroup>
<Content Include="$(SuggestedBindingRedirectsPackageFile)"
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
</ItemGroup>
</Target>

<ItemGroup Condition="'$(NetFrameworkMinimum)' != ''">
Copy link
Member

Choose a reason for hiding this comment

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

Condition="'$(NetFrameworkMinimum)' != ''"

Does it make any difference checking NetFrameworkMinimum or checking the target framework to be NET Framework?

<None Include="$(SuggestedBindingRedirectsPackageFile)" Pack="true"
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
</ItemGroup>

</Project>
Loading