Skip to content

Commit 44bbf32

Browse files
MSLukeWestnohwnd
andauthored
Updating System.Collections.Immutable package reference to version 9.0.0 (#15392)
* Updating System.Collections.Immutable package reference to version 10.0.1 * trigger GitHub actions * Updating binding redirect * Moving down to version 9.0.0 * Fix versions and redirects * Moving version back to 9.0.0 * Update system.collections.immutable * Setting NU1510 warning as message * Moving suppression to NoWarn * Trigger build --------- Co-authored-by: nohwnd <me@jakubjares.com>
1 parent a836f4a commit 44bbf32

5 files changed

Lines changed: 9 additions & 4 deletions

File tree

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<MicrosoftVSSDKBuildToolsVersion>17.14.2119</MicrosoftVSSDKBuildToolsVersion>
6666
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
6767
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
68-
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
68+
<SystemCollectionsImmutableVersion>9.0.0</SystemCollectionsImmutableVersion>
6969
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
7070
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
7171
<TestPlatformExternalsVersion>18.0.0-preview-1-10911-061</TestPlatformExternalsVersion>

src/datacollector/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependentAssembly>
2727
<dependentAssembly>
2828
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
29-
<bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
29+
<bindingRedirect oldVersion="1.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
3030
</dependentAssembly>
3131
<dependentAssembly>
3232
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
3232
<!-- NU5100: No dlls in lib folder -->
3333
<NoWarn>$(NoWarn);NU5100</NoWarn>
34+
<!-- NU1510: PackageReference will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. -->
35+
<NoWarn>$(NoWarn);NU1510</NoWarn>
3436
<!--
3537
Sometimes NU1702 is not suppressed correctly, so force reducing severity of the warning.
3638
See https://github.com/NuGet/Home/issues/9147
@@ -82,6 +84,7 @@
8284
<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="$(MicrosoftDiagnosticsNETCoreClientVersion)" PrivateAssets="All" GeneratePathProperty="true" />
8385
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" Condition="'$(TargetFramework)'=='$(NetFrameworkRunnerTargetFramework)'" />
8486
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" Condition="'$(TargetFramework)' != 'NetFrameworkRunnerTargetFramework'" />
87+
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" />
8588
</ItemGroup>
8689

8790
<Target Name="CopyFiles" AfterTargets="Build">
@@ -93,6 +96,7 @@
9396
<MicrosoftInternalDia Include="$(PkgMicrosoft_Internal_Dia)\tools\netstandard\**\*"></MicrosoftInternalDia>
9497
<MicrosoftDiagnosticsNETCoreClient Include="$(PkgMicrosoft_Diagnostics_NETCore_Client)\lib\netstandard2.0\**\*"></MicrosoftDiagnosticsNETCoreClient>
9598
<MicrosoftInternalDia Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\**\*"></MicrosoftInternalDia>
99+
<SystemCollectionsImmutableFiles Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\*"></SystemCollectionsImmutableFiles>
96100
</ItemGroup>
97101

98102
<Copy SourceFiles="@(MicrosoftCodeCoverageIO)" DestinationFiles="$(OutDir)\Microsoft.CodeCoverage.IO\%(RecursiveDir)%(Filename)%(Extension)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
@@ -101,6 +105,7 @@
101105
<Copy SourceFiles="@(NewtonsoftJson)" DestinationFiles="$(OutDir)\Newtonsoft.Json\%(RecursiveDir)%(Filename)%(Extension)" />
102106
<Copy SourceFiles="@(MicrosoftDiagnosticsNETCoreClient)" DestinationFiles="$(OutDir)\Microsoft.Diagnostics.NETCore.Client\%(RecursiveDir)%(Filename)%(Extension)" />
103107
<Copy SourceFiles="@(MicrosoftInternalDia)" DestinationFiles="$(OutDir)\Microsoft.Internal.Dia\%(RecursiveDir)%(Filename)%(Extension)" />
108+
<Copy SourceFiles="@(SystemCollectionsImmutableFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
104109
</Target>
105110

106111
</Project>

src/testhost.x86/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</dependentAssembly>
4040
<dependentAssembly>
4141
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
42-
<bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
42+
<bindingRedirect oldVersion="1.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
4343
</dependentAssembly>
4444
<dependentAssembly>
4545
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

src/vstest.console/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependentAssembly>
3232
<dependentAssembly>
3333
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
34-
<bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
34+
<bindingRedirect oldVersion="1.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
3535
</dependentAssembly>
3636
<dependentAssembly>
3737
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

0 commit comments

Comments
 (0)