Skip to content

Merging internal commits for release/8.0 #13451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 14, 2025
Merged

Merging internal commits for release/8.0 #13451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5be4db7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 2, 2025
e7b8c36
Merged PR 48911: [internal/release/8.0] Update dependencies from dnce…
Apr 3, 2025
707bf26
Merge commit '2eb560bc996a8f604804f11b4bc5ae5739d2c729'
Apr 3, 2025
361e117
Merge commit '80614eea4c6a66b6239f8f9e019a371fa094765f'
Apr 8, 2025
98fcf10
Merged PR 49092: [release/8.0] Update dependencies from dotnet/arcade…
Apr 9, 2025
1259387
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 11, 2025
e7ef1f0
Merged PR 49172: [internal/release/8.0] Update dependencies from dnce…
Apr 14, 2025
e3ffe5d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Apr 17, 2025
fc2e443
Merged PR 49260: [internal/release/8.0] Update dependencies from dnce…
Apr 17, 2025
c4b79de
Merged PR 49314: [internal/release/8.0] - revert invalid dependencies
vseanreesermsft Apr 17, 2025
d964d14
Merge commit 'c4b79deca3753d92e126fa2df778fe10ab4e6d6d' into internal…
vseanreesermsft May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -25,9 +23,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="true" />
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="true" />
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.13">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -23,29 +23,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.15-servicing.25164.13">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.15-servicing.25164.13">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.15-servicing.25164.13">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.15-servicing.25164.13">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.15-servicing.25164.13">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -55,17 +55,17 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.15-servicing.25164.13">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.16-servicing.25215.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
</Dependency>
<!-- These dependencies are required by windowsdesktop for coherency. -->
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0">
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.16-servicing.25215.6</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>8.0.0</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>8.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>8.0.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>8.0.1</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>8.0.15-servicing.25164.13</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>8.0.16-servicing.25215.6</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>8.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>8.0.1</SystemSecurityCryptographyPkcsPackageVersion>
Expand All @@ -32,18 +32,18 @@
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>8.0.0</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>8.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.15</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.15-servicing.25164.13</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.16</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.16-servicing.25215.6</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>8.0.15-servicing.25164.13</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.15-servicing.25164.13</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.15-servicing.25164.13</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>8.0.16-servicing.25215.6</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.16-servicing.25215.6</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.16-servicing.25215.6</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25208.7",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "8.0.15-servicing.25164.13"
"Microsoft.NET.Sdk.IL": "8.0.16-servicing.25215.6"
},
"native-tools": {
"cmake": "latest"
Expand Down