Skip to content

Commit

Permalink
Merged PR 29711: [internal/release/7.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:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 25f6e48a-ea28-4cf9-40e5-08da7ef5fc68
- **Build**: 20230215.8
- **Date Produced**: February 17, 2023 5:30:27 PM UTC
- **Commit**: 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **Microsoft.NET.Sdk.IL**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.4 to 7.0.4][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][1]
  - **Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **Microsoft.NETCore.ILDAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **Microsoft.NETCore.Platforms**: [from 7.0.0 to 7.0.1][2]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
  • Loading branch information
dotnet-bot authored and mmitche committed Feb 17, 2023
1 parent 67e991a commit 2f3cabf
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 31 deletions.
8 changes: 2 additions & 6 deletions NuGet.config
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-dcb489a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcb489a4/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/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 @@ -21,9 +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-0a2bda1-3" value="true" />
<add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
<add key="darc-int-dotnet-runtime-dcb489a" value="true" />
<add key="darc-int-dotnet-runtime-0a396ac" 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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
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.7.0" Version="7.0.4-servicing.23114.5">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -47,21 +47,21 @@ 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>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.4-servicing.23114.5">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23114.5">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23114.5">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23114.5">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -83,9 +83,9 @@ 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>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.4-servicing.23114.5">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -117,15 +117,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="7.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.4-servicing.23114.5">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.4-servicing.23115.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>dcb489a49c7b4a229e3e6d02d393a48105742c06</Sha>
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.4-servicing.23114.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.4-servicing.23115.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>7.0.1</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>7.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>7.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>7.0.0</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>7.0.4-servicing.23114.5</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>7.0.4-servicing.23115.8</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>7.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>7.0.1</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
Expand All @@ -31,17 +31,17 @@
<MicrosoftWin32RegistryAccessControlPackageVersion>7.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>7.0.0</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>7.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>7.0.0</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>7.0.0</SystemDrawingCommonPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>7.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>7.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23114.5</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23114.5</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23114.5</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23115.8</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23115.8</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.4-servicing.23115.8</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.4-servicing.23114.5"
"Microsoft.NET.Sdk.IL": "7.0.4-servicing.23115.8"
},
"native-tools": {
"cmake": "3"
Expand Down

0 comments on commit 2f3cabf

Please sign in to comment.