Skip to content

Commit da24700

Browse files
authored
Merging internal commits for release/8.0 (#35473)
2 parents 2042519 + ce7ae06 commit da24700

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

NuGet.config

+2-14
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-dcf4a22" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcf4a22c/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-9cb3b72" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9cb3b725/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
148
<!-- End: Package sources from dotnet-runtime -->
159
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1610
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,13 +19,7 @@
2519
<clear />
2620
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2721
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
29-
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
30-
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
31-
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
32-
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
33-
<add key="darc-int-dotnet-runtime-9cb3b72" value="true" />
34-
<add key="darc-int-dotnet-runtime-dcf4a22" value="true" />
22+
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
3523
<!-- End: Package sources from dotnet-runtime -->
3624
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3725
</disabledPackageSources>

eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.11-servicing.24517.7">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.12-servicing.24603.5">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
34+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -45,18 +45,18 @@
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4646
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.11">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
50+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.11">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.12">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
54+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
5555
</Dependency>
5656
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
57-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.11-servicing.24517.7">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.12-servicing.24603.5">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
59-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
59+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>

eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
2525
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
2626
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.11-servicing.24517.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.12-servicing.24603.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
2929
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.11</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.11</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.11-servicing.24517.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.12</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.12-servicing.24603.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
3636
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)