Skip to content

Commit 4e5f5a8

Browse files
ryalanmsryalanms
authored
Merge pull request #4403 from dotnet/merge.internal
5.0.5: Merge internal/release/5.0 into release/5.0
2 parents 15478b5 + 4568227 commit 4e5f5a8

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

‎NuGet.config

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8+
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-runtime -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -16,6 +17,7 @@
1617
<disabledPackageSources>
1718
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1819
<!-- Begin: Package sources from dotnet-runtime -->
20+
<add key="darc-int-dotnet-runtime-2f740ad" value="true" />
1921
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2022
<add key="darc-int-dotnet-runtime-f27d337" value="true" />
2123
<add key="darc-int-dotnet-runtime-c636bbd" value="true" />

‎eng/Version.Details.xml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.4-servicing.21117.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.5-servicing.21167.1">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>3991c2606be14a6faf29eeafe824bd4444e85ea1</Sha>
6+
<Sha>b47cabfdc9c35f9b3305e5e11c2957d81fee26af</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.4-servicing.21117.2">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.5-servicing.21167.1">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>3991c2606be14a6faf29eeafe824bd4444e85ea1</Sha>
10+
<Sha>b47cabfdc9c35f9b3305e5e11c2957d81fee26af</Sha>
1111
</Dependency>
1212
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -37,9 +37,9 @@
3737
<Uri>https://github.com/dotnet/corefx</Uri>
3838
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
41-
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
40+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
41+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
4343
</Dependency>
4444
<Dependency Name="System.Security.AccessControl" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -61,9 +61,9 @@
6161
<Uri>https://github.com/dotnet/runtime</Uri>
6262
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
66+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.6-servicing.21206.6">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -77,29 +77,29 @@
7777
<Uri>https://github.com/dotnet/coreclr</Uri>
7878
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.4-servicing.21116.14" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.5-servicing.21166.9" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
82+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.4-servicing.21116.14" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.5-servicing.21166.9" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
86-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
86+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
8787
</Dependency>
8888
<Dependency Name="System.Resources.Extensions" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
8989
<Uri>https://github.com/dotnet/runtime</Uri>
9090
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.4-servicing.21116.14" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.5-servicing.21166.9" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
94-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
94+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
9595
</Dependency>
9696
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
9797
<Uri>https://github.com/dotnet/runtime</Uri>
9898
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
9999
</Dependency>
100-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
100+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
101101
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
102-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
102+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>

‎eng/Versions.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
11-
<MicrosoftPrivateWinformsVersion>5.0.4-servicing.21117.2</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>5.0.5-servicing.21167.1</MicrosoftPrivateWinformsVersion>
1212
</PropertyGroup>
1313
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1414
<PropertyGroup>
1515
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
16-
<MicrosoftNETCoreILDAsmVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreILDAsmVersion>
17-
<MicrosoftNETCoreILAsmVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreILAsmVersion>
16+
<MicrosoftNETCoreILDAsmVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreILDAsmVersion>
17+
<MicrosoftNETCoreILAsmVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreILAsmVersion>
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppInternalVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreAppInternalVersion>
21+
<MicrosoftNETCoreAppInternalVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreAppInternalVersion>
2222
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
23-
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
24-
<MicrosoftNETCorePlatformsVersion>5.0.1</MicrosoftNETCorePlatformsVersion>
23+
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
24+
<MicrosoftNETCorePlatformsVersion>5.0.2</MicrosoftNETCorePlatformsVersion>
2525
<SystemDrawingCommonVersion>5.0.2</SystemDrawingCommonVersion>
2626
<SystemDirectoryServicesVersion>5.0.0</SystemDirectoryServicesVersion>
27-
<SystemReflectionMetadataLoadContextVersion>5.0.0</SystemReflectionMetadataLoadContextVersion>
27+
<SystemReflectionMetadataLoadContextVersion>5.0.1</SystemReflectionMetadataLoadContextVersion>
2828
</PropertyGroup>
2929
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3030
<PropertyGroup>

0 commit comments

Comments
 (0)