Skip to content

Fix ValueTuple consumption on >= net471 #215

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

Merged
ericstj merged 2 commits into from
Mar 19, 2025
Merged

Fix ValueTuple consumption on >= net471 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a2b712
Fix ValueTuple consumption on >= net471
ViktorHofer Mar 19, 2025
0e6b561
Update src/System.ValueTuple/src/System.ValueTuple.csproj
carlossanlop Mar 19, 2025
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
10 changes: 8 additions & 2 deletions src/System.ValueTuple/src/System.ValueTuple.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<!-- Package servicing properties -->
<PropertyGroup>
<IsPackable>false</IsPackable>
<IsPackable>true</IsPackable>
<VersionPrefix>4.6.0</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">4.7.0</VersionPrefix>
<VersionPrefix Condition="'$(IsPackable)' == 'true'">4.6.1</VersionPrefix>
<AssemblyVersion>4.0.4.0</AssemblyVersion>
<AssemblyVersion Condition="'$(IsPackable)' == 'true'">4.0.5.0</AssemblyVersion>
<PackageValidationBaselineVersion>4.6.0</PackageValidationBaselineVersion>
Expand All @@ -40,6 +40,12 @@
</When>
</Choose>

<!-- Also put into build folder for packages.config support. -->
<ItemGroup>
<Content Include="buildTransitive\net471\System.ValueTuple.targets" PackagePath="buildTransitive\net471\$(PackageId).targets" />
<Content Include="buildTransitive\net471\System.ValueTuple.targets" PackagePath="build\net471\$(PackageId).targets" />
</ItemGroup>

<Target Name="FailForUpdatedNetFrameworkMinimum" Condition="'$(NetFrameworkMinimum)' != 'net462'">
<Error Text="NetFrameworkMinimum got changed to '$(NetFrameworkMinimum)'. Consider removing this implementation or the whole library." />
</Target>
Expand Down
11 changes: 11 additions & 0 deletions src/System.ValueTuple/src/buildTransitive/net471/System.ValueTuple.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project>

<!-- System.ValueTuple is inbox on .NET Framework >= 4.7.1 and therefore any potential redirect for it should be removed.
This is necessary as the assembly version in the already shipped packages is higher than what's provided inbox on .NET Framework. -->
<Target Name="RemoveValueTupleRedirectForNet471AndAbove" DependsOnTargets="ResolveAssemblyReferences" BeforeTargets="GenerateBindingRedirects">
<ItemGroup>
<SuggestedBindingRedirects Remove="System.ValueTuple, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
</ItemGroup>
</Target>

</Project>