Skip to content

Commit 7f954a3

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '1217354ca79000178dca5bca83fe6ec490e1d2d6' into internal-merge-6.0-2022-03-08-1138
2 parents ceeebd3 + 1217354 commit 7f954a3

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +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-c24d9a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c24d9a9c/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-runtime -->
1314
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1415
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,6 +24,7 @@
2324
<clear />
2425
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2526
<!-- Begin: Package sources from dotnet-runtime -->
27+
<add key="darc-int-dotnet-runtime-c24d9a9" value="true" />
2628
<!-- End: Package sources from dotnet-runtime -->
2729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2830
</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.2-servicing.22064.6" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
6+
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.2-servicing.22064.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.3-servicing.22123.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>5ad241b9633924db40503de19cb502bb0aca7718</Sha>
10+
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.2-servicing.22064.8">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.3-servicing.22124.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>fb76229895cae74c1adc62c2411a0730a2f3759b</Sha>
14+
<Sha>560f243910f407df33fd5cdf06e2a857684f4bc7</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.2-servicing.22064.8">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.3-servicing.22124.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>fb76229895cae74c1adc62c2411a0730a2f3759b</Sha>
18+
<Sha>560f243910f407df33fd5cdf06e2a857684f4bc7</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
22+
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.2-servicing.22064.6" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
26+
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
30+
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.2-servicing.22064.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22123.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>5ad241b9633924db40503de19cb502bb0aca7718</Sha>
34+
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.2-servicing.22064.8">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.3-servicing.22124.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>fb76229895cae74c1adc62c2411a0730a2f3759b</Sha>
38+
<Sha>560f243910f407df33fd5cdf06e2a857684f4bc7</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.2-servicing.22064.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.2-servicing.22064.8</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.3-servicing.22123.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.3-servicing.22124.2</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--
2626
@@ -55,14 +55,14 @@
5555
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksInstallersVersion>
5656
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22122.7</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
58-
<MicrosoftNETCoreAppRefVersion>6.0.2</MicrosoftNETCoreAppRefVersion>
59-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
60-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.2-servicing.22064.6</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.2-servicing.22064.6</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
58+
<MicrosoftNETCoreAppRefVersion>6.0.3</MicrosoftNETCoreAppRefVersion>
59+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
60+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.3-servicing.22123.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.3-servicing.22123.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6262
<!-- winforms -->
63-
<MicrosoftPrivateWinformsVersion>6.0.2-servicing.22064.7</MicrosoftPrivateWinformsVersion>
63+
<MicrosoftPrivateWinformsVersion>6.0.3-servicing.22123.7</MicrosoftPrivateWinformsVersion>
6464
<!-- wpf -->
65-
<MicrosoftDotNetWpfGitHubVersion>6.0.2-servicing.22064.8</MicrosoftDotNetWpfGitHubVersion>
65+
<MicrosoftDotNetWpfGitHubVersion>6.0.3-servicing.22124.2</MicrosoftDotNetWpfGitHubVersion>
6666
<!-- Not auto-updated. -->
6767
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
6868
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)