Skip to content

Commit

Permalink
Merged PR 35260: [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**: 20231116.28
- **Date Produced**: November 17, 2023 6:44:39 AM UTC
- **Commit**: 29f88296788f2031e4653b463d8f02d25db82b68
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **Microsoft.NET.Sdk.IL**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.14 to 7.0.15][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.14 to 7.0.15][3]
  - **Microsoft.NETCore.ILAsm**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **Microsoft.NETCore.ILDAsm**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.14-servicing.23519.10 to 7.0.15-servicing.23566.28][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC808851b07a&targetVersion=GC29f8829678&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Nov 20, 2023
2 parents c9ea9ae + 15294f5 commit ce000d3
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 32 deletions.
8 changes: 2 additions & 6 deletions NuGet.config
View file
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-808851b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-808851b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-808851b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-29f8829" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-29f88296/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-808851b-1" value="true" />
<add key="darc-int-dotnet-runtime-808851b-2" value="true" />
<add key="darc-int-dotnet-runtime-808851b" value="true" />
<add key="darc-int-dotnet-runtime-29f8829" 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
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.7.0" Version="7.0.14-servicing.23519.10">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.4">
<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.14-servicing.23519.10">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.14-servicing.23519.10">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.14-servicing.23519.10">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.14-servicing.23519.10">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</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.14-servicing.23519.10">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</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 @@ -115,17 +115,17 @@ 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.App.Ref" Version="7.0.14">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.14">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.14-servicing.23519.10">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.15-servicing.23566.28">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
<Sha>29f88296788f2031e4653b463d8f02d25db82b68</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 @@ -14,23 +14,23 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.14-servicing.23519.10</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.15-servicing.23566.28</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.14-servicing.23519.10</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>7.0.15-servicing.23566.28</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>7.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>7.0.2</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>7.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>7.0.4</SystemTextJsonPackageVersion>
<SystemThreadingAccessControlPackageVersion>7.0.1</SystemThreadingAccessControlPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>7.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.15</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>7.0.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>7.0.0</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
Expand All @@ -39,9 +39,9 @@
<SystemResourcesExtensionsPackageVersion>7.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>7.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>7.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.14-servicing.23519.10</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.14-servicing.23519.10</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.14-servicing.23519.10</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.15-servicing.23566.28</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.15-servicing.23566.28</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.15-servicing.23566.28</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": "7.0.0-beta.23564.5",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.14-servicing.23519.10"
"Microsoft.NET.Sdk.IL": "7.0.15-servicing.23566.28"
},
"native-tools": {
"cmake": "3"
Expand Down

0 comments on commit ce000d3

Please sign in to comment.