Skip to content

Commit

Permalink
Merged PR 29448: [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**: 20230215.7
- **Date Produced**: February 16, 2023 3:54:41 AM UTC
- **Commit**: 5edef4b20babd4c3ddac7460e536f86fd0f2d724
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **Microsoft.NET.Sdk.IL**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.15][16]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.15][16]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.8][17]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][16]

[16]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2a90daa&targetVersion=GC5edef4b&_a=files
[17]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC943474c&targetVersion=GC5edef4b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1746fd8a-3905-4afb-af8a-08d961c59698)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Feb 17, 2023
1 parent 56544e3 commit 1808f3a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 29 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-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2a90daa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
Expand All @@ -22,6 +23,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2a90daa-1" value="true" />
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
<add key="darc-int-dotnet-runtime-5edef4b" 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
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.14-servicing.23073.9">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.7">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.14-servicing.23073.9">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.14-servicing.23073.9">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.14-servicing.23073.9">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.14-servicing.23073.9">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.14-servicing.23073.9">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.14">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.14-servicing.23073.9">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.15-servicing.23115.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,34 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23073.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.15-servicing.23115.7</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.14-servicing.23073.9</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>6.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.2</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>6.0.7</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>6.0.0</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>6.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.7</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.15</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.8</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>6.0.1</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>6.0.0</SystemDrawingCommonPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.14-servicing.23073.9</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.14-servicing.23073.9</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.14-servicing.23073.9</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>6.0.15-servicing.23115.7</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>6.0.15-servicing.23115.7</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.23114.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23114.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.14-servicing.23073.9"
"Microsoft.NET.Sdk.IL": "6.0.15-servicing.23115.7"
},
"native-tools": {
"cmake": "latest"
Expand Down

0 comments on commit 1808f3a

Please sign in to comment.