Skip to content

Commit 9cf989b

Browse files
committed
Reference specific versions of packages in HotReload.Agent.PipeRpc rather than pinning them globally
1 parent ab65646 commit 9cf989b

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

Directory.Packages.props

-3
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
<PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9393
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9494
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
95-
<PackageVersion Include="System.Buffers" Version="$(SystemBuffersVersion)" />
96-
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
97-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
9895
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
9996
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
10097
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />

eng/Versions.props

+3-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,13 @@
129129
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
130130
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
131131
<MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>2.0.0-preview.1.24427.4</MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>
132+
<SystemBuffersToolsetPackageVersion>4.5.1</SystemBuffersToolsetPackageVersion>
132133
<SystemCollectionsImmutableToolsetPackageVersion>8.0.0</SystemCollectionsImmutableToolsetPackageVersion>
134+
<SystemMemoryToolsetPackageVersion>4.5.5</SystemMemoryToolsetPackageVersion>
133135
<SystemReflectionMetadataLoadContextToolsetPackageVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetPackageVersion>
134136
<SystemReflectionMetadataToolsetPackageVersion>8.0.0</SystemReflectionMetadataToolsetPackageVersion>
135137
<SystemTextJsonToolsetPackageVersion>8.0.5</SystemTextJsonToolsetPackageVersion>
138+
<SystemThreadingTasksExtensionsToolsetPackageVersion>4.5.4</SystemThreadingTasksExtensionsToolsetPackageVersion>
136139
<SystemResourcesExtensionsToolsetPackageVersion>8.0.0</SystemResourcesExtensionsToolsetPackageVersion>
137140
</PropertyGroup>
138141
<PropertyGroup>
@@ -282,11 +285,6 @@
282285
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkGitLabVersion>
283286
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.25072.1</MicrosoftSourceLinkBitbucketGitVersion>
284287
</PropertyGroup>
285-
<PropertyGroup>
286-
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
287-
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
288-
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
289-
</PropertyGroup>
290288
<!-- Get .NET Framework reference assemblies from NuGet packages -->
291289
<PropertyGroup>
292290
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>

src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<!-- netstandard2.0 polyfills -->
27-
<PackageReference Include="System.Buffers" />
28-
<PackageReference Include="System.Memory" />
29-
<PackageReference Include="System.Threading.Tasks.Extensions" />
30-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
26+
<!-- netstandard2.0 polyfills
27+
Since this code may be run in Visual Studio / full framework MSBuild, these packages need to use the "toolset" package versions so they
28+
don't depend on higher versions of the packages than are available in those environments.
29+
-->
30+
<PackageReference Include="System.Buffers" VersionOverride="$(SystemBuffersToolsetPackageVersion)" />
31+
<PackageReference Include="System.Memory" VersionOverride="$(SystemMemoryToolsetPackageVersion)" />
32+
<PackageReference Include="System.Threading.Tasks.Extensions" VersionOverride="$(SystemThreadingTasksExtensionsToolsetPackageVersion)" />
33+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="$(MicrosoftBclAsyncInterfacesToolsetPackageVersion)"/>
3134
</ItemGroup>
3235

3336
<!-- Make sure the shared source files do not require any global usings -->

src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,13 @@
109109
<ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
110110
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
111111
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
112-
<ExpectedDependencies Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
112+
<ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
113113
<ExpectedDependencies Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
114-
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
115-
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
116-
<ExpectedDependencies Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
114+
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
115+
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
116+
<ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
117117
<ExpectedDependencies Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
118+
<ExpectedDependencies Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
118119
</ItemGroup>
119120

120121
<!-- Check that the dependencies of the output assembly match our expectations -->

0 commit comments

Comments
 (0)