Skip to content

Commit 1a5db9a

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 38310: [internal/release/7.0] Update dependencies from dnceng/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**: - **Date Produced**: March 20, 2024 2:38:13 AM UTC - **Commit**: 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **Microsoft.NET.Sdk.IL**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.18 to 7.0.18][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][1] - **Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **Microsoft.NETCore.ILDAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe963835596dce0e4258709f53167661b91728a62&targetVersion=GC544c7e6eb3d5525c6f85341f51217d81d7c8ed80&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
2 parents 825dfb8 + 4bc875b commit 1a5db9a

File tree

4 files changed

+24
-32
lines changed

4 files changed

+24
-32
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-e963835" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e9638355/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-dff486f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-3/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-dff486f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-2/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-dff486f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-544c7e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-544c7e6e/nuget/v3/index.json" />
128
<!-- End: Package sources from dotnet-runtime -->
139
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1410
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,11 +19,7 @@
2319
<clear />
2420
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2521
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-dff486f-1" value="true" />
27-
<add key="darc-int-dotnet-runtime-dff486f-2" value="true" />
28-
<add key="darc-int-dotnet-runtime-dff486f-3" value="true" />
29-
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
30-
<add key="darc-int-dotnet-runtime-e963835" value="true" />
22+
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
3123
<!-- End: Package sources from dotnet-runtime -->
3224
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3325
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
77
-->
88
<Dependencies>
99
<ProductDependencies>
10-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24163.20">
10+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.14">
1111
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
12-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
12+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
1313
</Dependency>
1414
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.4">
1515
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -47,21 +47,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
4747
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4848
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.18-servicing.24163.20">
50+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.18-servicing.24169.14">
5151
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
52-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
52+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
54+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
5555
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
56-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
56+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
5757
</Dependency>
58-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
58+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
5959
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
60-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
60+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
6161
</Dependency>
62-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
62+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
6363
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
64-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
64+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
6565
</Dependency>
6666
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0">
6767
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -83,9 +83,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
8383
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
8484
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.18-servicing.24163.20">
86+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.18-servicing.24169.14">
8787
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
88-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
88+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
8989
</Dependency>
9090
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="7.0.0">
9191
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -117,15 +117,15 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
117117
</Dependency>
118118
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.18">
119119
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
120-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
120+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
121121
</Dependency>
122122
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.18">
123123
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
124-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
124+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.18-servicing.24163.20">
126+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.18-servicing.24169.14">
127127
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
128-
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
128+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
129129
</Dependency>
130130
</ProductDependencies>
131131
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
</PropertyGroup>
1515
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1616
<PropertyGroup>
17-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.18-servicing.24163.20</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
17+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.18-servicing.24169.14</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
1818
<SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion>
1919
<SystemDirectoryServicesPackageVersion>7.0.1</SystemDirectoryServicesPackageVersion>
2020
<SystemReflectionMetadataLoadContextPackageVersion>7.0.0</SystemReflectionMetadataLoadContextPackageVersion>
2121
<SystemSecurityCryptographyXmlPackageVersion>7.0.1</SystemSecurityCryptographyXmlPackageVersion>
2222
<SystemIOPackagingPackageVersion>7.0.0</SystemIOPackagingPackageVersion>
2323
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
24-
<MicrosoftNETCoreILDAsmPackageVersion>7.0.18-servicing.24163.20</MicrosoftNETCoreILDAsmPackageVersion>
24+
<MicrosoftNETCoreILDAsmPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETCoreILDAsmPackageVersion>
2525
<SystemDiagnosticsPerformanceCounterPackageVersion>7.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
2626
<SystemSecurityCryptographyPkcsPackageVersion>7.0.2</SystemSecurityCryptographyPkcsPackageVersion>
2727
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
@@ -39,9 +39,9 @@
3939
<SystemResourcesExtensionsPackageVersion>7.0.0</SystemResourcesExtensionsPackageVersion>
4040
<SystemSecurityPermissionsPackageVersion>7.0.0</SystemSecurityPermissionsPackageVersion>
4141
<SystemWindowsExtensionsPackageVersion>7.0.0</SystemWindowsExtensionsPackageVersion>
42-
<MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</MicrosoftNETCoreILAsmPackageVersion>
43-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
44-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
42+
<MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETCoreILAsmPackageVersion>
43+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
44+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
4545
<!--
4646
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
4747
-->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4",
1919
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.4",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "7.0.18-servicing.24163.20"
21+
"Microsoft.NET.Sdk.IL": "7.0.18-servicing.24169.14"
2222
},
2323
"native-tools": {
2424
"cmake": "3"

0 commit comments

Comments
 (0)