Skip to content

Commit

Permalink
Merge pull request #11644 from vseanreesermsft/internal-merge-8.0-202…
Browse files Browse the repository at this point in the history 
…4-07-09-1039-af5e2b52-9b46-4cde-bae6-53d9a347c86e

Merging internal commits for release/8.0
  • Loading branch information
@lonitra
lonitra authored Jul 10, 2024
2 parents 8b7bfe8 + 7a0d2cf commit 9362880
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 33 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +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-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/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 @@ -22,6 +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-2aade6b" 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
46 changes: 23 additions & 23 deletions eng/Version.Details.xml
View file
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.5-servicing.24216.15">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.5-servicing.24216.15">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</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,49 +23,49 @@ 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.5-servicing.24216.15">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.5-servicing.24216.15">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.5-servicing.24216.15">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.5-servicing.24216.15">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.5-servicing.24216.15">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.3">
<Dependency Name="System.Text.Json" Version="8.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.5">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.5">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.5-servicing.24216.15">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.7-servicing.24313.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<!-- These dependencies are required by windowsdesktop for coherency. -->
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0">
Expand Down Expand Up @@ -146,7 +146,7 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,34 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.5-servicing.24216.15</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.7-servicing.24313.11</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>8.0.0</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>8.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>8.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>8.0.0</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>8.0.5-servicing.24216.15</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>8.0.7-servicing.24313.11</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>8.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>8.0.0</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>8.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>8.0.3</SystemTextJsonPackageVersion>
<SystemTextJsonPackageVersion>8.0.4</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>8.0.0</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>8.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.5-servicing.24216.15</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.7-servicing.24313.11</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>8.0.5-servicing.24216.15</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.5-servicing.24216.15</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.5-servicing.24216.15</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>8.0.7-servicing.24313.11</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.7-servicing.24313.11</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.7-servicing.24313.11</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.7",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "8.0.5-servicing.24216.15"
"Microsoft.NET.Sdk.IL": "8.0.7-servicing.24313.11"
},
"native-tools": {
"cmake": "latest"
Expand Down

0 comments on commit 9362880

Please sign in to comment.