Skip to content

Commit f0442bd

Browse files
dreddy-workdreddy-work
authored
Merge pull request #3848 from vseanreesermsft/internal-merge-6.0-2023-09-12-1023
Merging internal commits for release/6.0
2 parents 40e7b71 + 8aee3f4 commit f0442bd

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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-e40b3ab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e40b3abf/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-4bb6dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4bb6dc19/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,7 +22,7 @@
2222
<clear />
2323
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2424
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-e40b3ab" value="true" />
25+
<add key="darc-int-dotnet-runtime-4bb6dc1" value="true" />
2626
<!-- End: Package sources from dotnet-runtime -->
2727
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2828
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.21-servicing.23363.11" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.22-servicing.23424.25" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
6+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.21-servicing.23364.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.22-servicing.23424.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>052009561f916cf06df82d89297ae3ed66cf5d2f</Sha>
10+
<Sha>53190af510e57c1c146bd8a23725509771a42ae0</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.21-servicing.23364.5">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.22-servicing.23425.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>fa467fd679da61d9e429ce2654ef63766afcd7f5</Sha>
14+
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.21-servicing.23364.5">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.22-servicing.23425.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>fa467fd679da61d9e429ce2654ef63766afcd7f5</Sha>
18+
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.22" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
22+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.21-servicing.23363.11" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.22-servicing.23424.25" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
26+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.22" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>e40b3abf1b41621d4298642a5fd300ebf7cccf6d</Sha>
30+
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.21-servicing.23364.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.22-servicing.23424.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>052009561f916cf06df82d89297ae3ed66cf5d2f</Sha>
34+
<Sha>53190af510e57c1c146bd8a23725509771a42ae0</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.21-servicing.23364.5">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.22-servicing.23425.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>fa467fd679da61d9e429ce2654ef63766afcd7f5</Sha>
38+
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.21-servicing.23364.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.21-servicing.23364.5</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.22-servicing.23424.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.22-servicing.23425.2</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--
2626
@@ -55,14 +55,14 @@
5555
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
5656
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23408.5</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
58-
<MicrosoftNETCoreAppRefVersion>6.0.21</MicrosoftNETCoreAppRefVersion>
59-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.21</MicrosoftNETCoreAppRuntimewinx64Version>
60-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.21-servicing.23363.11</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.21-servicing.23363.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
58+
<MicrosoftNETCoreAppRefVersion>6.0.22</MicrosoftNETCoreAppRefVersion>
59+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
60+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.22-servicing.23424.25</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.22-servicing.23424.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6262
<!-- winforms -->
63-
<MicrosoftPrivateWinformsVersion>6.0.21-servicing.23364.6</MicrosoftPrivateWinformsVersion>
63+
<MicrosoftPrivateWinformsVersion>6.0.22-servicing.23424.7</MicrosoftPrivateWinformsVersion>
6464
<!-- wpf -->
65-
<MicrosoftDotNetWpfGitHubVersion>6.0.21-servicing.23364.5</MicrosoftDotNetWpfGitHubVersion>
65+
<MicrosoftDotNetWpfGitHubVersion>6.0.22-servicing.23425.2</MicrosoftDotNetWpfGitHubVersion>
6666
<!-- Not auto-updated. -->
6767
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
6868
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)