Skip to content

Commit 70a577c

Browse files
authored
Move generation of SuggestedBindingRedirects.targets to inner build (#112379)
* 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 7bb850f commit 70a577c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<UseCompilerGeneratedDocXmlFile>false</UseCompilerGeneratedDocXmlFile>
1010
<IsPackable>true</IsPackable>
1111
<SuggestedBindingRedirectsPackageFile>$(BaseIntermediateOutputPath)SuggestedBindingRedirects.targets</SuggestedBindingRedirectsPackageFile>
12-
<BeforePack>$(BeforePack);GeneratePackageTargetsFile</BeforePack>
1312
<PackageDescription>Provides classes which read and write resources in a format that supports non-primitive objects.
1413

1514
Commonly Used Types:
@@ -97,7 +96,8 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
9796
<Target Name="GeneratePackageTargetsFile"
9897
Inputs="$(MSBuildAllProjects)"
9998
Outputs="$(SuggestedBindingRedirectsPackageFile)"
100-
Condition="'$(NetFrameworkMinimum)' != ''">
99+
AfterTargets="CoreCompile"
100+
Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'">
101101
<PropertyGroup>
102102
<SuggestedBindingRedirectsPackageFileContent><![CDATA[<Project>
103103
<!-- ResolveAssemblyReferences will never see the assembly reference embedded in the resources type,
@@ -114,10 +114,11 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription>
114114
Lines="$(SuggestedBindingRedirectsPackageFileContent)"
115115
Overwrite="true" />
116116

117-
<ItemGroup>
118-
<Content Include="$(SuggestedBindingRedirectsPackageFile)"
119-
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
120-
</ItemGroup>
121117
</Target>
122118

119+
<ItemGroup Condition="'$(NetFrameworkMinimum)' != ''">
120+
<None Include="$(SuggestedBindingRedirectsPackageFile)" Pack="true"
121+
PackagePath="buildTransitive\$(NetFrameworkMinimum)\$(PackageId).targets" />
122+
</ItemGroup>
123+
123124
</Project>

0 commit comments

Comments
 (0)