Skip to content

Commit

Permalink
Merged PR 33382: [internal/release/6.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:1746fd8a-3905-4afb-af8a-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 1746fd8a-3905-4afb-af8a-08d961c59698
- **Build**: 20230824.25
- **Date Produced**: August 25, 2023 4:48:56 AM UTC
- **Commit**: 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **Microsoft.NET.Sdk.IL**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.22 to 6.0.22][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.22 to 6.0.22][1]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCad40cc35b5&targetVersion=GC4bb6dc195c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1746fd8a-3905-4afb-af8a-08d961c59698)
  • Loading branch information
@dotnet-bot @marcpopMSFT
dotnet-bot authored and marcpopMSFT committed Aug 25, 2023
2 parents 0db2312 + f906e79 commit 53190af
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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-ad40cc3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ad40cc35/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-4bb6dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4bb6dc19/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 @@ -19,7 +19,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-ad40cc3" value="true" />
<add key="darc-int-dotnet-runtime-4bb6dc1" 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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ 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.6.0" Version="6.0.22-servicing.23415.11">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -43,21 +43,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.22-servicing.23415.11">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23415.11">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23415.11">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23415.11">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -79,9 +79,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.22-servicing.23415.11">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -113,15 +113,15 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.22-servicing.23415.11">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.22-servicing.23424.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.22-servicing.23415.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.22-servicing.23424.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>6.0.1</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>6.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>6.0.0</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.22-servicing.23415.11</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.22-servicing.23424.25</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>6.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.3</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
Expand All @@ -37,9 +37,9 @@
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23415.11</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23415.11</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23415.11</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23424.25</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23424.25</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.22-servicing.23424.25</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": "6.0.0-beta.23408.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.22-servicing.23415.11"
"Microsoft.NET.Sdk.IL": "6.0.22-servicing.23424.25"
},
"native-tools": {
"cmake": "latest"
Expand Down

0 comments on commit 53190af

Please sign in to comment.