Skip to content

Commit 939d6e0

Browse files
LeafShi1LeafShi1
authored
Merging internal commits for release/8.0 (#13687)
###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/winforms/pull/13687)
2 parents bdcae68 + a25043d commit 939d6e0

File tree

4 files changed

+34
-32
lines changed

4 files changed

+34
-32
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +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-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
78
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
89
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
910
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
@@ -30,6 +31,7 @@
3031
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
3132
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
3233
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
34+
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
3335
<!-- End: Package sources from dotnet-runtime -->
3436
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3537
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ 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.8.0" Version="8.0.17-servicing.25266.2">
10+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.18-servicing.25311.17">
1111
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
12-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
12+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.17-servicing.25266.2">
14+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.18-servicing.25311.17">
1515
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
16-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
16+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
1717
</Dependency>
1818
<Dependency Name="System.Resources.Extensions" Version="8.0.0">
1919
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -23,49 +23,49 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
2323
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
2424
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.17-servicing.25266.2">
26+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.18-servicing.25311.17">
2727
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
28-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
28+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.17-servicing.25266.2">
30+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.18-servicing.25311.17">
3131
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
32-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
32+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
3333
</Dependency>
34-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.17-servicing.25266.2">
34+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.18-servicing.25311.17">
3535
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
36-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
36+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
3737
</Dependency>
38-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.17-servicing.25266.2">
38+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.18-servicing.25311.17">
3939
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
40-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
40+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
4141
</Dependency>
4242
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
4343
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4444
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.17-servicing.25266.2">
46+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.18-servicing.25311.17">
4747
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
48-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
48+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
4949
</Dependency>
5050
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0">
5151
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5252
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Text.Json" Version="8.0.5">
54+
<Dependency Name="System.Text.Json" Version="8.0.6">
5555
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
56-
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
56+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.17">
58+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.18">
5959
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
60-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
60+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.17">
62+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.18">
6363
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
64-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
64+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.17-servicing.25266.2">
66+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.18-servicing.25311.17">
6767
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
68-
<Sha>77545d6fd5ca79bc08198fd6d8037c14843f14ad</Sha>
68+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
6969
</Dependency>
7070
<!-- These dependencies are required by windowsdesktop for coherency. -->
7171
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0">

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@
1616
</PropertyGroup>
1717
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1818
<PropertyGroup>
19-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.17-servicing.25266.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
19+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.18-servicing.25311.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
2020
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
2121
<SystemDirectoryServicesPackageVersion>8.0.0</SystemDirectoryServicesPackageVersion>
2222
<SystemReflectionMetadataLoadContextPackageVersion>8.0.1</SystemReflectionMetadataLoadContextPackageVersion>
2323
<SystemSecurityCryptographyXmlPackageVersion>8.0.2</SystemSecurityCryptographyXmlPackageVersion>
2424
<SystemIOPackagingPackageVersion>8.0.1</SystemIOPackagingPackageVersion>
2525
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
26-
<MicrosoftNETCoreILDAsmPackageVersion>8.0.17-servicing.25266.2</MicrosoftNETCoreILDAsmPackageVersion>
26+
<MicrosoftNETCoreILDAsmPackageVersion>8.0.18-servicing.25311.17</MicrosoftNETCoreILDAsmPackageVersion>
2727
<SystemDiagnosticsPerformanceCounterPackageVersion>8.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
2828
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
2929
<SystemSecurityCryptographyPkcsPackageVersion>8.0.1</SystemSecurityCryptographyPkcsPackageVersion>
3030
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3131
<SystemTextEncodingsWebPackageVersion>8.0.0</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
32+
<SystemTextJsonPackageVersion>8.0.6</SystemTextJsonPackageVersion>
3333
<SystemThreadingAccessControlPackageVersion>8.0.0</SystemThreadingAccessControlPackageVersion>
3434
<MicrosoftWin32RegistryAccessControlPackageVersion>8.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
35-
<MicrosoftNETCoreAppRefPackageVersion>8.0.17</MicrosoftNETCoreAppRefPackageVersion>
36-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
37-
<MicrosoftNETCorePlatformsPackageVersion>8.0.17-servicing.25266.2</MicrosoftNETCorePlatformsPackageVersion>
35+
<MicrosoftNETCoreAppRefPackageVersion>8.0.18</MicrosoftNETCoreAppRefPackageVersion>
36+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
37+
<MicrosoftNETCorePlatformsPackageVersion>8.0.18-servicing.25311.17</MicrosoftNETCorePlatformsPackageVersion>
3838
<MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
3939
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
4040
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
4141
<SystemResourcesExtensionsPackageVersion>8.0.0</SystemResourcesExtensionsPackageVersion>
4242
<SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion>
4343
<SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion>
44-
<MicrosoftNETCoreILAsmPackageVersion>8.0.17-servicing.25266.2</MicrosoftNETCoreILAsmPackageVersion>
45-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.17-servicing.25266.2</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
46-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.17-servicing.25266.2</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
44+
<MicrosoftNETCoreILAsmPackageVersion>8.0.18-servicing.25311.17</MicrosoftNETCoreILAsmPackageVersion>
45+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>8.0.18-servicing.25311.17</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
46+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>8.0.18-servicing.25311.17</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
4747
<!--
4848
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
4949
-->

‎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": "8.0.0-beta.25310.3",
1919
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "8.0.17-servicing.25266.2"
21+
"Microsoft.NET.Sdk.IL": "8.0.18-servicing.25311.17"
2222
},
2323
"native-tools": {
2424
"cmake": "latest"

0 commit comments

Comments
 (0)