Skip to content

Commit b814108

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 12346: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-winforms
This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **System.Diagnostics.EventLog**: from 5.0.1 to 5.0.1 (parent: Microsoft.Private.Winforms) - **System.Drawing.Common**: from 5.0.0 to 5.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.Platforms**: from 5.0.1 to 5.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Internal**: from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.3 to 5.0.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b53d5ac5-e69b-4dd1-4585-08d89c6b4107) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: b53d5ac5-e69b-4dd1-4585-08d89c6b4107 - **Build**: 20210121.6 - **Date Produced**: 1/21/2021 11:29 PM - **Commit**: 26c548f65d776b577e82c02b8ffb80bc86bbbaa9 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 5.0.3-servicing.21071.2 to 5.0.3-servicing.21071.6][1] - **Microsoft.Private.Winforms**: [from 5.0.3-servicing.21071.2 to 5.0.3-servicing.21071.6][1] - **System.Diagnostics.EventLog**: [from 5.0.1 to 5.0.1][2] - **System.Drawing.Common**: [from 5.0.0 to 5.0.1][3] - **Microsoft.NETCore.Platforms**: [from 5.0.1 to 5.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][2] - **Microsoft.NETCore.ILAsm**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][2] - **Microsoft.NETCore.App.Internal**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.3 to 5.0.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCc735d1f&targetVersion=GC26c548f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC44db96a&targetVersion=GCfe8a2d0&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCfe8a2d0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b53d5ac5-e69b-4dd1-4585-0...
1 parent e0da4c3 commit b814108

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

NuGet.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +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-44db96a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-44db96a6/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-fe8a2d0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-fe8a2d0a/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-runtime -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,8 +24,9 @@
2424
<add key="darc-int-dotnet-runtime-c37365f" value="true" />
2525
<add key="darc-int-dotnet-runtime-75b9165" value="true" />
2626
<add key="darc-int-dotnet-runtime-8552839" value="true" />
27-
<!-- Begin: Package sources from dotnet-runtime -->
2827
<add key="darc-int-dotnet-runtime-44db96a" value="true" />
28+
<!-- Begin: Package sources from dotnet-runtime -->
29+
<add key="darc-int-dotnet-runtime-fe8a2d0" value="true" />
2930
<!-- End: Package sources from dotnet-runtime -->
3031
</disabledPackageSources>
3132
</configuration>

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.3-servicing.21071.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.3-servicing.21071.6">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>c735d1f5fbadbe53c764b78c19036b3be23470c8</Sha>
6+
<Sha>26c548f65d776b577e82c02b8ffb80bc86bbbaa9</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.3-servicing.21071.2">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.3-servicing.21071.6">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>c735d1f5fbadbe53c764b78c19036b3be23470c8</Sha>
10+
<Sha>26c548f65d776b577e82c02b8ffb80bc86bbbaa9</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>
@@ -23,15 +23,15 @@
2323
</Dependency>
2424
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
26+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</Sha>
2727
</Dependency>
2828
<Dependency Name="System.DirectoryServices" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
3030
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
33-
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
32+
<Dependency Name="System.Drawing.Common" Version="5.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
33+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</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.1" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
66+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.2-servicing.21065.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.3-servicing.21070.15" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.3-servicing.21071.10" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
82+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.3-servicing.21070.15" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.3-servicing.21071.10" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
86-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
86+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</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.3-servicing.21070.15" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21071.10" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
94-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
94+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</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>
100100
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
101101
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
102-
<Sha>44db96a62877a4056d28134c00e9228c12a03e7f</Sha>
102+
<Sha>fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4</Sha>
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>

eng/Versions.props

Lines changed: 5 additions & 5 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.3-servicing.21071.2</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>5.0.3-servicing.21071.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.3-servicing.21070.15</MicrosoftNETCoreILDAsmVersion>
17-
<MicrosoftNETCoreILAsmVersion>5.0.3-servicing.21070.15</MicrosoftNETCoreILAsmVersion>
16+
<MicrosoftNETCoreILDAsmVersion>5.0.3-servicing.21071.10</MicrosoftNETCoreILDAsmVersion>
17+
<MicrosoftNETCoreILAsmVersion>5.0.3-servicing.21071.10</MicrosoftNETCoreILAsmVersion>
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppInternalVersion>5.0.3-servicing.21070.15</MicrosoftNETCoreAppInternalVersion>
21+
<MicrosoftNETCoreAppInternalVersion>5.0.3-servicing.21071.10</MicrosoftNETCoreAppInternalVersion>
2222
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
2323
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
2424
<MicrosoftNETCorePlatformsVersion>5.0.1</MicrosoftNETCorePlatformsVersion>
25-
<SystemDrawingCommonVersion>5.0.0</SystemDrawingCommonVersion>
25+
<SystemDrawingCommonVersion>5.0.1</SystemDrawingCommonVersion>
2626
<SystemDirectoryServicesVersion>5.0.0</SystemDirectoryServicesVersion>
2727
<SystemReflectionMetadataLoadContextVersion>5.0.0</SystemReflectionMetadataLoadContextVersion>
2828
</PropertyGroup>

0 commit comments

Comments
 (0)