add SystemCollectionsImmutableVersion

T-Gro · T-Gro · commit e6428f44204f · 2026-03-03T12:48:12.000+01:00
diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets
@@ -51,6 +51,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <!-- SCI 10.x net462 build has assembly version 10.0.0.2, but FCS (netstandard2.0) references 10.0.0.0.
+         A direct ref ensures binding redirect generation bridges the mismatch on .NET Framework. -->
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
   </ItemGroup>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -7,6 +7,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
+  <!-- SCI 10.x has mismatched assembly versions between net462 (10.0.0.2) and netstandard2.0 (10.0.0.0).
+       A direct ref ensures binding redirect generation bridges this on .NET Framework test runners. -->
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+  </ItemGroup>
+
   <!-- xUnit3 packages for all test projects (except Test.Utilities which is a library) -->
   <ItemGroup Condition="($(MSBuildProjectName.EndsWith('.Tests')) OR $(MSBuildProjectName.EndsWith('.ComponentTests')) OR $(MSBuildProjectName.EndsWith('.UnitTests'))) AND '$(ExcludeFromTestPackageReferences)' != 'true'">
     <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitVersion)" />
diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
@@ -99,7 +99,8 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
   </ItemGroup>
 <PropertyGroup>
- <NoWarn>$(NoWarn);NU1510;44</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
+ <NoWarn>$(NoWarn);NU1510;NU1504;44</NoWarn> <!-- NU1510: Project is explicitly referencing the runtime assembly 'System.Collections.Immutable', however, if we remove it, it tries to find it on the wrong path. Also, local NoWarn does not help - This is just me trying to enforce it -->
+ <!-- NU1504: Duplicate PackageReference for System.Collections.Immutable — one from tests/Directory.Build.props (net472 binding redirect fix) and one here for GeneratePathProperty. -->
  <!-- 44: AssemblyName.CodeBase is deprecated but needed for assembly resolution in VS integration tests -->
 </PropertyGroup>
   <ItemGroup>
diff --git a/vsintegration/tests/Directory.Build.props b/vsintegration/tests/Directory.Build.props
@@ -15,4 +15,10 @@
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
+  <!-- SCI 10.x has mismatched assembly versions between net462 (10.0.0.2) and netstandard2.0 (10.0.0.0).
+       A direct ref ensures binding redirect generation bridges this on .NET Framework test runners. -->
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+  </ItemGroup>
+
 </Project>
