Skip to content

Commit 1952109

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 11765: [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.2-servicing.20611.6 to 5.0.2-servicing.20613.2 (parent: Microsoft.WindowsDesktop.App) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.2-servicing.20611.6 to 5.0.2-servicing.20613.2 (parent: Microsoft.WindowsDesktop.App) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.2-servicing.20611.5 to 5.0.2-servicing.20613.1 (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**: 20201213.4 - **Date Produced**: 12/14/2020 5:12 AM - **Commit**: c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 5.0.2 to 5.0.2][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.2-servicing.20611.9 to 5.0.2-servicing.20613.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 5.0.2-servicing.20611.6 to 5.0.2-servicing.20613.2][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 5.0.2-servicing.20611.6 to 5.0.2-servicing.20613.2][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 5.0.2-servicing.20611.5 to 5.0.2-servicing.20613.1][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC3fef65d&targetVersion=GCc0f7184&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCe3c9555&targetVersion=GC89936f5&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCca4b8aa&targetVersion=GC1a7d925&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:6c471e4a-96a6-4437-0085-08d89c6be781)
1 parent bdb0aba commit 1952109

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<add key="darc-pub-dotnet-templating-568c09b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-568c09b9/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-3fef65d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-3fef65d2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-windowsdesktop-c0f7184" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-c0f71846/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" />
@@ -30,6 +30,7 @@
3030
</packageSources>
3131
<disabledPackageSources>
3232
<add key="darc-int-dotnet-windowsdesktop-3fef65d" value="true" />
33+
<add key="darc-int-dotnet-windowsdesktop-c0f7184" value="true" />
3334
<add key="darc-int-dotnet-runtime-0260401" value="true" />
3435
<!-- Begin: Package sources from dotnet-aspnetcore -->
3536
<add key="darc-int-dotnet-aspnetcore-6a87a2d" 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.2">
125125
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
126-
<Sha>3fef65d207e85d8390ea9e3e8bf3d80d8d3fc534</Sha>
126+
<Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.2-servicing.20611.9">
128+
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.2-servicing.20613.4">
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
130-
<Sha>3fef65d207e85d8390ea9e3e8bf3d80d8d3fc534</Sha>
130+
<Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</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.2-servicing.20611.6" CoherentParentDependency="Microsoft.WindowsDesktop.App">
136+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
137137
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
138-
<Sha>e3c9555c44c0d7397b7ef8fae1bcd07557a74f92</Sha>
138+
<Sha>89936f5f8d7ac99e04123f8f48754f252dfd9973</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.2-servicing.20611.6" CoherentParentDependency="Microsoft.WindowsDesktop.App">
140+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
141141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
142-
<Sha>e3c9555c44c0d7397b7ef8fae1bcd07557a74f92</Sha>
142+
<Sha>89936f5f8d7ac99e04123f8f48754f252dfd9973</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.2-servicing.20611.5" CoherentParentDependency="Microsoft.WindowsDesktop.App">
144+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.2-servicing.20613.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
146-
<Sha>ca4b8aa1adf9091576000cb664af903e5172ad16</Sha>
146+
<Sha>1a7d925a270d4eaca6e801de8b88b34b535091de</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.2-servicing.20611.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
129+
<MicrosoftNETSdkWindowsDesktopPackageVersion>5.0.2-servicing.20613.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
133-
<MicrosoftWindowsDesktopAppVersion>5.0.2-servicing.20611.9</MicrosoftWindowsDesktopAppVersion>
133+
<MicrosoftWindowsDesktopAppVersion>5.0.2-servicing.20613.4</MicrosoftWindowsDesktopAppVersion>
134134
</PropertyGroup>
135135
<!-- Get .NET Framework reference assemblies from NuGet packages -->
136136
<PropertyGroup>

0 commit comments

Comments
 (0)