Skip to content

Commit 52ce550

Browse files
authored
Move generation of SuggestedBindingRedirects.targets to inner build (#112379) (#112494)
* Move generation of SuggestedBindingRedirects.targets to inner build These targets depend on the AssemblyVersion of the library which is specific to the inner-build of the library. Generate them in the inner-build. * Update src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
1 parent 6f7daef commit 52ce550

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
88
<IsPackable>true</IsPackable>
99
<SuggestedBindingRedirectsPackageFile>$(BaseIntermediateOutputPath)SuggestedBindingRedirects.targets</SuggestedBindingRedirectsPackageFile>
10-
<BeforePack>$(BeforePack);GeneratePackageTargetsFile</BeforePack>
1110
<PackageDescription>Provides classes which read and write resources in a format that supports non-primitive objects.
1211

1312
Commonly Used Types:
@@ -41,7 +40,7 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
4140
</ItemGroup>
4241

4342
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
44-
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs"
43+
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs"
4544
Link="System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
4645
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs"
4746
Link="System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
@@ -51,10 +50,11 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
5150
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
5251
</ItemGroup>
5352

54-
<Target Name="GeneratePackageTargetsFile"
53+
<Target Name="GeneratePackageTargetsFile"
5554
Inputs="$(MSBuildAllProjects)"
5655
Outputs="$(SuggestedBindingRedirectsPackageFile)"
57-
Condition="'$(NetFrameworkMinimum)' != ''">
56+
AfterTargets="CoreCompile"
57+
Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
5858
<PropertyGroup>
5959
<SuggestedBindingRedirectsPackageFileContent><![CDATA[<Project>
6060
<!-- ResolveAssemblyReferences will never see the assembly reference embedded in the resources type,
@@ -71,9 +71,11 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
7171
Lines="$(SuggestedBindingRedirectsPackageFileContent)"
7272
Overwrite="true" />
7373

74-
<ItemGroup>
75-
<Content Include="$(SuggestedBindingRedirectsPackageFile)"
76-
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
77-
</ItemGroup>
7874
</Target>
75+
76+
<ItemGroup Condition="'$(NetFrameworkMinimum)' != ''">
77+
<None Include="$(SuggestedBindingRedirectsPackageFile)" Pack="true"
78+
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
79+
</ItemGroup>
80+
7981
</Project>

0 commit comments

Comments
 (0)