Skip to content

Commit 3ca43f0

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 12412: [internal/release/5.0.1xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop
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**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:6c471e4a-96a6-4437-0085-08d89c6be781) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 6c471e4a-96a6-4437-0085-08d89c6be781 - **Build**: 20210123.2 - **Date Produced**: 1/23/2021 2:17 PM - **Commit**: f8d26ae79a212ae4e64f2fac177a013f4e82307e - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 5.0.3 to 5.0.3][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 5.0.3-servicing.21072.2 to 5.0.3-servicing.21073.2][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC80832ca&targetVersion=GCf8d26ae&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCedb5cf8&targetVersion=GC3a3d1e5&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCfb796c5&targetVersion=GCea25334&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:6c471e4a-96a6-4437-0085-08d89c6be781)
1 parent 63ec95e commit 3ca43f0

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

NuGet.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<add key="darc-pub-dotnet-templating-5a9a6d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5a9a6d5f/nuget/v3/index.json" />
1717
<!-- End: Package sources from dotnet-templating -->
1818
<!-- Begin: Package sources from dotnet-windowsdesktop -->
19-
<add key="darc-int-dotnet-windowsdesktop-80832ca" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-80832cac/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-windowsdesktop-f8d26ae" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-f8d26ae7/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-windowsdesktop -->
2121
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2222
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
@@ -43,8 +43,9 @@
4343
<add key="darc-int-dotnet-runtime-75b9165" value="true" />
4444
<add key="darc-int-dotnet-aspnetcore-c414be3" value="true" />
4545
<add key="darc-int-dotnet-runtime-eae88cc" value="true" />
46-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4746
<add key="darc-int-dotnet-windowsdesktop-80832ca" value="true" />
47+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
48+
<add key="darc-int-dotnet-windowsdesktop-f8d26ae" value="true" />
4849
<!-- End: Package sources from dotnet-windowsdesktop -->
4950
<!-- Begin: Package sources from dotnet-runtime -->
5051
<add key="darc-int-dotnet-runtime-c636bbd" value="true" />

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,27 @@
123123
</Dependency>
124124
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.3">
125125
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
126-
<Sha>80832cacc440a9b9c888c3e2d520dc988a6dc01f</Sha>
126+
<Sha>f8d26ae79a212ae4e64f2fac177a013f4e82307e</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.3-servicing.21072.2">
128+
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.3-servicing.21073.2">
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
130-
<Sha>80832cacc440a9b9c888c3e2d520dc988a6dc01f</Sha>
130+
<Sha>f8d26ae79a212ae4e64f2fac177a013f4e82307e</Sha>
131131
</Dependency>
132132
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0">
133133
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
134134
<Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="5.0.3-servicing.21072.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
136+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
137137
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
138-
<Sha>edb5cf8e0969f2ca4de1c21f23263553e8c316c6</Sha>
138+
<Sha>3a3d1e582344146190e9815e79cd5c8a29361b3d</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.3-servicing.21072.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
140+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
141141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
142-
<Sha>edb5cf8e0969f2ca4de1c21f23263553e8c316c6</Sha>
142+
<Sha>3a3d1e582344146190e9815e79cd5c8a29361b3d</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.3-servicing.21072.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
144+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
146-
<Sha>fb796c502c88d484ad4fa50bec2dadb8b5323094</Sha>
146+
<Sha>ea25334307fb11be0b03c56ce767f25faf5259c1</Sha>
147147
</Dependency>
148148
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0">
149149
<Uri>https://github.com/dotnet/aspnetcore</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/dotnet/wpf -->
129-
<MicrosoftNETSdkWindowsDesktopPackageVersion>5.0.3-servicing.21072.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
129+
<MicrosoftNETSdkWindowsDesktopPackageVersion>5.0.3-servicing.21073.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
133-
<MicrosoftWindowsDesktopAppVersion>5.0.3-servicing.21072.2</MicrosoftWindowsDesktopAppVersion>
133+
<MicrosoftWindowsDesktopAppVersion>5.0.3-servicing.21073.2</MicrosoftWindowsDesktopAppVersion>
134134
</PropertyGroup>
135135
<!-- Get .NET Framework reference assemblies from NuGet packages -->
136136
<PropertyGroup>

0 commit comments

Comments
 (0)