Skip to content

Commit cd25a65

Browse files
dotnet-botdotnet-bot
committed
[internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions
- Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal: from 3.1.10-servicing.20519.3 to 3.1.11-servicing.20566.6 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.10 to 3.1.11 (parent: Microsoft.Extensions.Logging) - Update SetupNugetSources
1 parent 2dda073 commit cd25a65

File tree

5 files changed

+47
-38
lines changed

5 files changed

+47
-38
lines changed

‎NuGet.config‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-core-setup -->
7+
<add key="darc-int-dotnet-core-setup-f5eceb8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-core-setup -->
69
<!-- Begin: Package sources from dotnet-extensions -->
7-
<add key="darc-pub-dotnet-extensions-2f22488" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-2f22488e/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-extensions-77d62c5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json" />
811
<!-- End: Package sources from dotnet-extensions -->
912
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
10-
<!-- Begin: Package sources from dotnet-extensions -->
11-
<!-- End: Package sources from dotnet-extensions -->
1213
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1314
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1415
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
@@ -18,5 +19,12 @@
1819
<add key="myget-legacy" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
1920
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
2021
</packageSources>
21-
<disabledPackageSources />
22+
<disabledPackageSources>
23+
<add key="darc-int-dotnet-extensions-ce485be" value="true" />
24+
<add key="darc-int-dotnet-extensions-8be2e8d" value="true" />
25+
<add key="darc-int-dotnet-extensions-77d62c5" value="true" />
26+
<!-- Begin: Package sources from dotnet-core-setup -->
27+
<add key="darc-int-dotnet-core-setup-f5eceb8" value="true" />
28+
<!-- End: Package sources from dotnet-core-setup -->
29+
</disabledPackageSources>
2230
</configuration>

‎eng/Version.Details.xml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.11-servicing.20560.5">
5-
<Uri>https://github.com/dotnet/extensions</Uri>
6-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
4+
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.11-servicing.20567.16">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
6+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.11-servicing.20560.5">
9-
<Uri>https://github.com/dotnet/extensions</Uri>
10-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
8+
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.11-servicing.20567.16">
9+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
10+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.11-servicing.20560.5">
13-
<Uri>https://github.com/dotnet/extensions</Uri>
14-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
12+
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.11-servicing.20567.16">
13+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
14+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.11">
17-
<Uri>https://github.com/dotnet/extensions</Uri>
18-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
17+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
18+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.11-servicing.20560.5">
21-
<Uri>https://github.com/dotnet/extensions</Uri>
22-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
20+
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.11-servicing.20567.16">
21+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
22+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20560.5">
25-
<Uri>https://github.com/dotnet/extensions</Uri>
26-
<Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha>
24+
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20567.16">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
26+
<Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
2727
</Dependency>
2828
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
@@ -49,9 +49,9 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
5050
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.10-servicing.20519.3" CoherentParentDependency="Microsoft.Extensions.Logging">
53-
<Uri>https://github.com/dotnet/core-setup</Uri>
54-
<Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</Sha>
52+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.11-servicing.20566.6" CoherentParentDependency="Microsoft.Extensions.Logging">
53+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54+
<Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha>
5555
</Dependency>
5656
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
5757
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
@@ -62,9 +62,9 @@
6262
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
6363
All Runtime.$rid packages should have the same version.
6464
-->
65-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Extensions.Logging">
66-
<Uri>https://github.com/dotnet/core-setup</Uri>
67-
<Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</Sha>
65+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Extensions.Logging">
66+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
67+
<Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha>
6868
</Dependency>
6969
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
7070
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.11-servicing.20560.5</MicrosoftAspNetCoreTestingPackageVersion>
52-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
50+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.11-servicing.20567.16</MicrosoftAspNetCoreTestingPackageVersion>
52+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5353
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
54-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
54+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
5555
<MicrosoftExtensionsLoggingPackageVersion>3.1.11</MicrosoftExtensionsLoggingPackageVersion>
56-
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
56+
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
5757
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
58-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.10-servicing.20519.3</MicrosoftNETCoreAppInternalPackageVersion>
58+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.11-servicing.20566.6</MicrosoftNETCoreAppInternalPackageVersion>
6060
<MicrosoftNETCorePlatformsPackageVersion>3.1.3</MicrosoftNETCorePlatformsPackageVersion>
6161
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
6262
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
9999
function EnablePrivatePackageSources($DisabledPackageSources) {
100100
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
101101
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
102-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
103-
$DisabledPackageSource.SetAttribute("value", "false")
102+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
103+
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
104+
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
104105
}
105106
}
106107

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ if [ "$?" == "0" ]; then
159159
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
160160
if [[ $DisabledSourceName == darc-int* ]]
161161
then
162-
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
163-
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
162+
OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
163+
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
164164
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
165165
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
166166
fi

0 commit comments

Comments
 (0)