Skip to content

Commit 9837650

Browse files
authored
Pin Extensions & Core-Setup refPacks to 3.1.0 rtm versions (#17468)
1 parent 6accf24 commit 9837650

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
77
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
88
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />

eng/Version.Details.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@
281281
<Uri>https://github.com/aspnet/Extensions</Uri>
282282
<Sha>04bb33fefa1e681da5dd88ce9c0f50963443c646</Sha>
283283
</Dependency>
284-
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19575.5" CoherentParentDependency="Microsoft.EntityFrameworkCore">
285-
<Uri>https://github.com/aspnet/Extensions</Uri>
286-
<Sha>04bb33fefa1e681da5dd88ce9c0f50963443c646</Sha>
287-
</Dependency>
288284
<Dependency Name="Microsoft.JSInterop" Version="3.1.0-rtm.19575.5" CoherentParentDependency="Microsoft.EntityFrameworkCore">
289285
<Uri>https://github.com/aspnet/Extensions</Uri>
290286
<Sha>04bb33fefa1e681da5dd88ce9c0f50963443c646</Sha>
@@ -385,10 +381,6 @@
385381
<Uri>https://github.com/dotnet/core-setup</Uri>
386382
<Sha>f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1</Sha>
387383
</Dependency>
388-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.1-servicing.19575.1" CoherentParentDependency="Microsoft.Extensions.Logging">
389-
<Uri>https://github.com/dotnet/core-setup</Uri>
390-
<Sha>f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1</Sha>
391-
</Dependency>
392384
<!--
393385
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
394386
All Runtime.$rid packages should have the same version.
@@ -401,6 +393,15 @@
401393
<Uri>https://github.com/dotnet/core-setup</Uri>
402394
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
403395
</Dependency>
396+
<!-- Keep these dependencies at the bottom of ProductDependencies, else they will be picked as the parent for CoherentParentDependencies -->
397+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
398+
<Uri>https://github.com/dotnet/core-setup</Uri>
399+
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
400+
</Dependency>
401+
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4" Pinned="true">
402+
<Uri>https://github.com/aspnet/Extensions</Uri>
403+
<Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
404+
</Dependency>
404405
</ProductDependencies>
405406
<ToolsetDependencies>
406407
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta4-19569-03</MicrosoftNetCompilersToolsetPackageVersion>
7171
<!-- Packages from dotnet/core-setup -->
7272
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.1-servicing.19575.1</MicrosoftExtensionsDependencyModelPackageVersion>
73-
<MicrosoftNETCoreAppRefPackageVersion>3.1.1-servicing.19575.1</MicrosoftNETCoreAppRefPackageVersion>
73+
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
7474
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19575.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
7575
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
7676
<!-- Packages from dotnet/corefx -->
@@ -159,7 +159,7 @@
159159
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.0-rtm.19575.5</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
160160
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.0-rtm.19575.5</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
161161
<MicrosoftExtensionsWebEncodersPackageVersion>3.1.0-rtm.19575.5</MicrosoftExtensionsWebEncodersPackageVersion>
162-
<MicrosoftInternalExtensionsRefsPackageVersion>3.1.0-rtm.19575.5</MicrosoftInternalExtensionsRefsPackageVersion>
162+
<MicrosoftInternalExtensionsRefsPackageVersion>3.1.0-rtm.19565.4</MicrosoftInternalExtensionsRefsPackageVersion>
163163
<MicrosoftJSInteropPackageVersion>3.1.0-rtm.19575.5</MicrosoftJSInteropPackageVersion>
164164
<MonoWebAssemblyInteropPackageVersion>3.1.0-preview4.19575.5</MonoWebAssemblyInteropPackageVersion>
165165
<!-- Packages from aspnet/EntityFrameworkCore -->

0 commit comments

Comments
 (0)