Skip to content

Commit 77505cf

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '05aaec6e4478b5c9fdeb19b9102d669e1712cee1' into internal-merge-5.0-2021-11-09-0929
2 parents 85fcf2f + 05aaec6 commit 77505cf

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
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-7211aa0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7211aa01/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-7211aa0" value="true" />
1921
<!-- End: Package sources from dotnet-runtime -->
2022
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2123
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 15 additions & 15 deletions
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.11-servicing.21474.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.12-servicing.21523.10">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>34f7d323c64e93096cf1221b284db44659a24583</Sha>
6+
<Sha>6120af5607760b0daa3530a8cf8f8777c6992631</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.11-servicing.21474.2">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.12-servicing.21523.10">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>34f7d323c64e93096cf1221b284db44659a24583</Sha>
10+
<Sha>6120af5607760b0daa3530a8cf8f8777c6992631</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>
@@ -29,9 +29,9 @@
2929
<Uri>https://github.com/dotnet/runtime</Uri>
3030
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="5.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="System.Drawing.Common" Version="5.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
34+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</Sha>
3535
</Dependency>
3636
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
3737
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -63,7 +63,7 @@
6363
</Dependency>
6464
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
66+
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc6</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.12-servicing.21554.2">
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.11-servicing.21473.8" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.12-servicing.21522.7" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
82+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.11-servicing.21473.8" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.12-servicing.21522.7" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
86-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
86+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</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.11-servicing.21473.8" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.12-servicing.21522.7" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
94-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
94+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</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.11" CoherentParentDependency="Microsoft.Private.Winforms">
100+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
101101
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
102-
<Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
102+
<Sha>7211aa01b34bb55ca67bdddd6e80ce23ee201bd2</Sha>
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
11-
<MicrosoftPrivateWinformsVersion>5.0.11-servicing.21474.2</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>5.0.12-servicing.21523.10</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.11-servicing.21473.8</MicrosoftNETCoreILDAsmVersion>
17-
<MicrosoftNETCoreILAsmVersion>5.0.11-servicing.21473.8</MicrosoftNETCoreILAsmVersion>
16+
<MicrosoftNETCoreILDAsmVersion>5.0.12-servicing.21522.7</MicrosoftNETCoreILDAsmVersion>
17+
<MicrosoftNETCoreILAsmVersion>5.0.12-servicing.21522.7</MicrosoftNETCoreILAsmVersion>
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppInternalVersion>5.0.11-servicing.21473.8</MicrosoftNETCoreAppInternalVersion>
21+
<MicrosoftNETCoreAppInternalVersion>5.0.12-servicing.21522.7</MicrosoftNETCoreAppInternalVersion>
2222
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
23-
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.11</MicrosoftNETCoreAppRuntimewinx64Version>
23+
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
2424
<MicrosoftNETCorePlatformsVersion>5.0.4</MicrosoftNETCorePlatformsVersion>
25-
<SystemDrawingCommonVersion>5.0.2</SystemDrawingCommonVersion>
25+
<SystemDrawingCommonVersion>5.0.3</SystemDrawingCommonVersion>
2626
<SystemDirectoryServicesVersion>5.0.0</SystemDirectoryServicesVersion>
2727
<SystemReflectionMetadataLoadContextVersion>5.0.1</SystemReflectionMetadataLoadContextVersion>
2828
</PropertyGroup>

0 commit comments

Comments
 (0)