Skip to content

Commit

Permalink
Merged PR 32076: [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**: 20230620.17
- **Date Produced**: June 20, 2023 10:06:09 PM UTC
- **Commit**: a08d9ce2caf02455c0b825bcdc32974bdf769a80
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **Microsoft.NET.Sdk.IL**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][2]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][2]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1746fd8a-3905-4afb-af8a-08d961c59698)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Jun 20, 2023
1 parent 59ed265 commit 2536781
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 31 deletions.
6 changes: 2 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +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-fcf1149" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fcf11495/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e2176df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e2176dfe/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-a08d9ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a08d9ce2/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 @@ -20,8 +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-e2176df" value="true" />
<add key="darc-int-dotnet-runtime-fcf1149" value="true" />
<add key="darc-int-dotnet-runtime-a08d9ce" 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
38 changes: 19 additions & 19 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.6.0" Version="6.0.19-servicing.23313.25">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.1">
<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.19-servicing.23313.25">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.19-servicing.23313.25">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.19-servicing.23313.25">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.19-servicing.23313.25">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</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.19-servicing.23313.25">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</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 @@ -111,17 +111,17 @@ 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.App.Ref" Version="6.0.19">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.19">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.20">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.19-servicing.23313.25">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.20-servicing.23320.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.19-servicing.23313.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</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.19-servicing.23313.25</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>6.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.3</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.8</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>6.0.0</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>6.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.19</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.20</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.20</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.11</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>6.0.1</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
Expand All @@ -37,9 +37,9 @@
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.19-servicing.23313.25</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.19-servicing.23313.25</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.19-servicing.23313.25</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.20-servicing.23320.17</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.20-servicing.23320.17</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.23313.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.19-servicing.23313.25"
"Microsoft.NET.Sdk.IL": "6.0.20-servicing.23320.17"
},
"native-tools": {
"cmake": "latest"
Expand Down

0 comments on commit 2536781

Please sign in to comment.