Skip to content

Commit 2dcf3a6

Browse files
committed
Merge branch 'release/8.0.4xx' into darc-release/8.0.4xx-fe19b2e6-5161-43cb-a0b2-06862f5226e1
# Conflicts: # NuGet.config
2 parents 626b9a0 + c4dd145 commit 2dcf3a6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<!-- Begin: Package sources from dotnet-maui -->
1616
<!-- End: Package sources from dotnet-maui -->
1717
<!-- Begin: Package sources from dotnet-runtime -->
18+
<add key="darc-int-dotnet-runtime-2f6e04b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2f6e04be/nuget/v3/index.json" />
1819
<!-- End: Package sources from dotnet-runtime -->
1920
<!-- Begin: Package sources from xamarin-xamarin-macios -->
2021
<!-- End: Package sources from xamarin-xamarin-macios -->
@@ -33,6 +34,7 @@
3334
<clear />
3435
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3536
<!-- Begin: Package sources from dotnet-runtime -->
37+
<add key="darc-int-dotnet-runtime-2f6e04b" value="true" />
3638
<!-- End: Package sources from dotnet-runtime -->
3739
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3840
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.23" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
6+
<Sha>2f6e04bea8740e3925c3f88137c6a6ee48acc903</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.22" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99
<Uri>https://github.com/dotnet/emsdk</Uri>
10-
<Sha>9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8</Sha>
10+
<Sha>81d2833ee1bf80f65cae9957c1926993ce1a299f</Sha>
1111
</Dependency>
1212
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-8.0.100" Version="34.0.154">
1313
<Uri>https://github.com/dotnet/android</Uri>
@@ -33,9 +33,9 @@
3333
<Uri>https://github.com/dotnet/maui</Uri>
3434
<Sha>f4dbb744f19d479c9dc0582e97ba7753df149638</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.416-servicing.25528.2">
36+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.417-servicing.25574.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-installer</Uri>
38-
<Sha>f9da71086ee0965c809ee57a18dbdb323a14db17</Sha>
38+
<Sha>c104aa468c05f701ad1b8c33c2ca6155c101ba37</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest80100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
7070
</PropertyGroup>
7171
<PropertyGroup Label="MonoWorkloads">
72-
<MicrosoftNETCoreAppRefPackageVersion>8.0.22</MicrosoftNETCoreAppRefPackageVersion>
72+
<MicrosoftNETCoreAppRefPackageVersion>8.0.23</MicrosoftNETCoreAppRefPackageVersion>
7373
<!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
7474
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
7575
<!-- mono workload prerelease version band must match the runtime feature band -->

0 commit comments

Comments
 (0)