Skip to content

Commit 2f889a2

Browse files
authored
Pin System.Formats.Nrbf and its transitive dependencies to 10.0.4 release for .NET Framework (#14487)
This change pins the runtime assemblies pulled in by the System.Formats.Nrbf reference to the 10.0.4 release for .NET Framework project Microsoft.Private.Windows.Core.csproj. This is required for consumption in Dev18 VS. • System.Formats.Nrbf → 10.0.4 • System.Collections.Immutable → 10.0.4 (transitive, now explicitly referenced with PrivateAssets="all") • System.Reflection.Metadata → 10.0.4 (transitive, now explicitly referenced with PrivateAssets="all") Without these pins, restore was resolving the .NET 11 preview (11.0.0-preview.4.26215.121) for these packages. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/winforms/pull/14487)
2 parents 62085c0 + 5b7469e commit 2f889a2

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

eng/Versions.props

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,11 @@
7474
<VsWherePackageVersion>2.6.7</VsWherePackageVersion>
7575
<!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->
7676
<SystemFormatsAsn1PackageVersion>8.0.1</SystemFormatsAsn1PackageVersion>
77+
<!-- Pin versions consumed on .NET Framework to the .NET 10 servicing release. -->
78+
<SystemFormatsNrbfNetFxPackageVersion>10.0.4</SystemFormatsNrbfNetFxPackageVersion>
79+
<SystemCollectionsImmutableNetFxPackageVersion>10.0.4</SystemCollectionsImmutableNetFxPackageVersion>
80+
<SystemReflectionMetadataNetFxPackageVersion>10.0.4</SystemReflectionMetadataNetFxPackageVersion>
81+
<SystemResourcesExtensionsNetFxPackageVersion>10.0.4</SystemResourcesExtensionsNetFxPackageVersion>
7782
</PropertyGroup>
7883

79-
<ItemGroup Condition="'$(TargetFramework)' == 'net481' or '$(TargetFramework)' == 'net472'">
80-
<PackageReference Update="System.Collections.Immutable" VersionOverride="10.0.3" />
81-
<PackageReference Update="System.Resources.Extensions" VersionOverride="10.0.3" />
82-
<PackageReference Update="System.Formats.Nrbf" VersionOverride="10.0.3" />
83-
</ItemGroup>
84-
8584
</Project>

src/System.Private.Windows.Core/src/Microsoft.Private.Windows.Core.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="Microsoft.Windows.CsWin32" PrivateAssets="all" />
42-
<PackageReference Include="System.Formats.Nrbf" />
4342
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
4443
<PackageReference Include="System.ComponentModel.Annotations" />
44+
<!-- Pin System.Formats.Nrbf and its transitive dependencies to the .NET 10. -->
45+
<PackageReference Include="System.Formats.Nrbf" VersionOverride="$(SystemFormatsNrbfNetFxPackageVersion)" />
46+
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutableNetFxPackageVersion)" PrivateAssets="all" />
47+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataNetFxPackageVersion)" PrivateAssets="all" />
4548
</ItemGroup>
4649

4750
<ItemGroup>

0 commit comments

Comments
 (0)