Skip to content

Commit 9530d5a

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '04094d116496e0bd1d376fd346397ec7900141f8' into internal-merge-8.0-2024-04-09-1217
2 parents ad329b2 + 04094d1 commit 9530d5a

File tree

3 files changed

+33
-29
lines changed

3 files changed

+33
-29
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
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-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-runtime -->
1314
<!-- Begin: Package sources from dotnet-winforms -->
15+
<add key="darc-int-dotnet-winforms-41a4bd6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69/nuget/v3/index.json" />
1416
<!-- End: Package sources from dotnet-winforms -->
1517
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1618
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,8 +25,10 @@
2325
<clear />
2426
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2527
<!-- Begin: Package sources from dotnet-runtime -->
28+
<add key="darc-int-dotnet-runtime-2d7eea2" value="true" />
2629
<!-- End: Package sources from dotnet-runtime -->
2730
<!-- Begin: Package sources from dotnet-winforms -->
31+
<add key="darc-int-dotnet-winforms-41a4bd6" value="true" />
2832
<!-- End: Package sources from dotnet-winforms -->
2933
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3034
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 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="8.0.3-servicing.24114.23" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.4-servicing.24169.9" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
6+
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.3-servicing.24116.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.4-servicing.24169.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>bd280bbb5c9699bb93097206f076ad2f330ea8e1</Sha>
10+
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.3-servicing.24116.6">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.4-servicing.24169.10">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>46fb08cfa8160d0885b74c7f28a7b187ab86efed</Sha>
14+
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.3-servicing.24116.6">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24169.10">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>46fb08cfa8160d0885b74c7f28a7b187ab86efed</Sha>
18+
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
22+
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.3-servicing.24114.23" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.9" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
26+
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
30+
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.3-servicing.24116.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.4-servicing.24169.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>bd280bbb5c9699bb93097206f076ad2f330ea8e1</Sha>
34+
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.3-servicing.24116.6">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.4-servicing.24169.10">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>46fb08cfa8160d0885b74c7f28a7b187ab86efed</Sha>
38+
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -145,9 +145,9 @@
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
146146
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
147147
</Dependency>
148-
<Dependency Name="System.Drawing.Common" Version="8.0.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
148+
<Dependency Name="System.Drawing.Common" Version="8.0.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
149149
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
150-
<Sha>bd280bbb5c9699bb93097206f076ad2f330ea8e1</Sha>
150+
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<!-- nuget -->
2626
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
2727
<!-- runtime -->
28-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.3-servicing.24114.23</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29-
<MicrosoftNETCoreAppRefVersion>8.0.3</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
28+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.4-servicing.24169.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29+
<MicrosoftNETCoreAppRefVersion>8.0.4</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
3131
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
3232
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
3333
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
@@ -61,15 +61,15 @@
6161
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
6262
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
6363
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
64-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.3-servicing.24114.23</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
64+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.4-servicing.24169.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
6565
<!-- wcf -->
6666
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
6767
<!-- winforms -->
68-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.3-servicing.24116.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69-
<MicrosoftPrivateWinformsVersion>8.0.3-servicing.24116.3</MicrosoftPrivateWinformsVersion>
70-
<SystemDrawingCommonVersion>8.0.3</SystemDrawingCommonVersion>
68+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.4-servicing.24169.11</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69+
<MicrosoftPrivateWinformsVersion>8.0.4-servicing.24169.11</MicrosoftPrivateWinformsVersion>
70+
<SystemDrawingCommonVersion>8.0.4</SystemDrawingCommonVersion>
7171
<!-- wpf -->
72-
<MicrosoftDotNetWpfGitHubVersion>8.0.3-servicing.24116.6</MicrosoftDotNetWpfGitHubVersion>
73-
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.3-servicing.24116.6</MicrosoftDotNetWpfProjectTemplatesVersion>
72+
<MicrosoftDotNetWpfGitHubVersion>8.0.4-servicing.24169.10</MicrosoftDotNetWpfGitHubVersion>
73+
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.4-servicing.24169.10</MicrosoftDotNetWpfProjectTemplatesVersion>
7474
</PropertyGroup>
7575
</Project>

0 commit comments

Comments
 (0)