Skip to content

Commit 9ee3b82

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 29716: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-wpf
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.Private.Winforms**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:763b3cc5-38c8-458a-6639-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 763b3cc5-38c8-458a-6639-08da7ef6346a - **Build**: 20230217.2 - **Date Produced**: February 17, 2023 6:35:44 PM UTC - **Commit**: fa6e95d0d2287982dade926f08843e78ecb32e2b - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.4-servicing.23115.2 to 7.0.4-servicing.23117.2][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23115.2 to 7.0.4-servicing.23117.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.4-servicing.23115.2 to 7.0.4-servicing.23117.2][1] - **Microsoft.Private.Winforms**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][2] - **Microsoft.Private.Winforms**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][2] - **Microsoft.Private.Winforms**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][2] - **Microsoft.Private.Winforms**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23107.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC495efad&targetVersion=GCfa6e95d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCcce692f&targetVersion=GC84d909e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:763b3cc5-38c8-458a-6639-08da7ef6346a)
1 parent 9b17045 commit 9ee3b82

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10-3/nuget/v3/index.json" />
1412
<!-- End: Package sources from dotnet-runtime -->
1513
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1614
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,8 +23,6 @@
2523
<clear />
2624
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2725
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="true" />
29-
<add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
3026
<!-- End: Package sources from dotnet-runtime -->
3127
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3228
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.3-servicing.23072.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.4-servicing.23107.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>cce692f665cbefe335ed33369897cea328d5fbcf</Sha>
10+
<Sha>84d909e676d61df36f5c7aa269e5c471fc6530bf</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.4-servicing.23115.2">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.4-servicing.23117.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>495efad606400c499f83d14019065ae029da5c1d</Sha>
14+
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.4-servicing.23115.2">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.4-servicing.23117.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>495efad606400c499f83d14019065ae029da5c1d</Sha>
18+
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -29,13 +29,13 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.3-servicing.23072.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23107.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>cce692f665cbefe335ed33369897cea328d5fbcf</Sha>
34+
<Sha>84d909e676d61df36f5c7aa269e5c471fc6530bf</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.4-servicing.23115.2">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.4-servicing.23117.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>495efad606400c499f83d14019065ae029da5c1d</Sha>
38+
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.3-servicing.23072.1</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.4-servicing.23115.2</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.4-servicing.23107.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.4-servicing.23117.2</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -35,9 +35,9 @@
3535
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.3-servicing.23069.10</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
3636
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.3-servicing.23069.10</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.3-servicing.23072.1</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.4-servicing.23107.7</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.4-servicing.23115.2</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.4-servicing.23117.2</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)