Skip to content

Commit 6fd84d0

Browse files
wtgodbewtgodbe
authored
Merge pull request #5317 from vseanreesermsft/internal-merge-5.0-2021-09-14-1455
Merging internal commits for release/5.0
2 parents e53ad0a + 4384633 commit 6fd84d0

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
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-e1825b4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-e1825b49/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-e1825b4" 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: 16 additions & 16 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.9-servicing.21363.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.10-servicing.21418.6">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>c352dea1e3b0bb93896c861b439a41a0bb8fd90f</Sha>
6+
<Sha>fe532d7abd074015e1fda901db0d9b87180dcadb</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.9-servicing.21363.2">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.10-servicing.21418.6">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>c352dea1e3b0bb93896c861b439a41a0bb8fd90f</Sha>
10+
<Sha>fe532d7abd074015e1fda901db0d9b87180dcadb</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>
@@ -61,13 +61,13 @@
6161
<Uri>https://github.com/dotnet/runtime</Uri>
6262
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
66+
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.10-servicing.21458.4">
68+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.10-servicing.21416.3">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
70-
<Sha>cce22a3d0a9475f53006615c064d348189aab273</Sha>
70+
<Sha>6f905b6b5d75f2a7157a5c362268aadd24df7773</Sha>
7171
</Dependency>
7272
<Dependency Name="System.IO.Packaging" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://github.com/dotnet/runtime</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.9-servicing.21359.8" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.10-servicing.21412.14" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
82+
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.9-servicing.21359.8" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.10-servicing.21412.14" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
86-
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
86+
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</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.9-servicing.21359.8" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.10-servicing.21412.14" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
94-
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
94+
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</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.9" CoherentParentDependency="Microsoft.Private.Winforms">
100+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
101101
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
102-
<Sha>208e377a5329ad6eb1db5e5fb9d4590fa50beadd</Sha>
102+
<Sha>e1825b4928afa9455cc51e1de2b2e66c8be3018d</Sha>
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
11-
<MicrosoftPrivateWinformsVersion>5.0.9-servicing.21363.2</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>5.0.10-servicing.21418.6</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.9-servicing.21359.8</MicrosoftNETCoreILDAsmVersion>
17-
<MicrosoftNETCoreILAsmVersion>5.0.9-servicing.21359.8</MicrosoftNETCoreILAsmVersion>
16+
<MicrosoftNETCoreILDAsmVersion>5.0.10-servicing.21412.14</MicrosoftNETCoreILDAsmVersion>
17+
<MicrosoftNETCoreILAsmVersion>5.0.10-servicing.21412.14</MicrosoftNETCoreILAsmVersion>
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppInternalVersion>5.0.9-servicing.21359.8</MicrosoftNETCoreAppInternalVersion>
21+
<MicrosoftNETCoreAppInternalVersion>5.0.10-servicing.21412.14</MicrosoftNETCoreAppInternalVersion>
2222
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
23-
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
24-
<MicrosoftNETCorePlatformsVersion>5.0.2</MicrosoftNETCorePlatformsVersion>
23+
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
24+
<MicrosoftNETCorePlatformsVersion>5.0.3</MicrosoftNETCorePlatformsVersion>
2525
<SystemDrawingCommonVersion>5.0.2</SystemDrawingCommonVersion>
2626
<SystemDirectoryServicesVersion>5.0.0</SystemDirectoryServicesVersion>
2727
<SystemReflectionMetadataLoadContextVersion>5.0.1</SystemReflectionMetadataLoadContextVersion>
@@ -88,6 +88,6 @@
8888
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
8989
</PropertyGroup>
9090
<PropertyGroup>
91-
<MicrosoftDotNetWpfDncEngVersion>5.0.10-servicing.21458.4</MicrosoftDotNetWpfDncEngVersion>
91+
<MicrosoftDotNetWpfDncEngVersion>5.0.10-servicing.21416.3</MicrosoftDotNetWpfDncEngVersion>
9292
</PropertyGroup>
9393
</Project>

0 commit comments

Comments
 (0)