Skip to content

Commit 613c028

Browse files
lonitralonitra
authored
Merge pull request #4159 from vseanreesermsft/internal-merge-8.0-2024-02-13-1022
Merging internal commits for release/8.0
2 parents 6cc489d + 9ff8436 commit 613c028

File tree

3 files changed

+33
-41
lines changed

3 files changed

+33
-41
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +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-bf5e279" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-bf5e279-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-2/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
1513
<!-- End: Package sources from dotnet-runtime -->
1614
<!-- Begin: Package sources from dotnet-winforms -->
17-
<add key="darc-int-dotnet-winforms-0b4028e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-winforms-0b4028e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb-2/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-winforms-0b4028e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb-1/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-c58fa00" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-c58fa00b/nuget/v3/index.json" />
2016
<!-- End: Package sources from dotnet-winforms -->
2117
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2218
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -29,14 +25,10 @@
2925
<clear />
3026
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3127
<!-- Begin: Package sources from dotnet-runtime -->
32-
<add key="darc-int-dotnet-runtime-bf5e279-1" value="true" />
33-
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
34-
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
28+
<add key="darc-int-dotnet-runtime-1381d5e" value="true" />
3529
<!-- End: Package sources from dotnet-runtime -->
3630
<!-- Begin: Package sources from dotnet-winforms -->
37-
<add key="darc-int-dotnet-winforms-0b4028e-1" value="true" />
38-
<add key="darc-int-dotnet-winforms-0b4028e-2" value="true" />
39-
<add key="darc-int-dotnet-winforms-0b4028e" value="true" />
31+
<add key="darc-int-dotnet-winforms-c58fa00" value="true" />
4032
<!-- End: Package sources from dotnet-winforms -->
4133
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4234
</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.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.2-servicing.24067.11" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
6+
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.1-servicing.23580.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.2-servicing.24068.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
10+
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.1-servicing.23580.5">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.2-servicing.24068.6">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>ac40bed7a33baf164d3984ca90c2aedba996a7b2</Sha>
14+
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.1-servicing.23580.5">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24068.6">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>ac40bed7a33baf164d3984ca90c2aedba996a7b2</Sha>
18+
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
22+
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.2-servicing.24067.11" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
26+
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
30+
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.1-servicing.23580.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24068.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
34+
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.1-servicing.23580.5">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24068.6">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>ac40bed7a33baf164d3984ca90c2aedba996a7b2</Sha>
38+
<Sha>472140dd926227876848e48f41cfc9acb9275492</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.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
148+
<Dependency Name="System.Drawing.Common" Version="8.0.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
149149
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
150-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
150+
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</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.1-servicing.23580.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29-
<MicrosoftNETCoreAppRefVersion>8.0.1</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
28+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.2-servicing.24067.11</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29+
<MicrosoftNETCoreAppRefVersion>8.0.2</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.2</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.1-servicing.23580.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
64+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.2-servicing.24067.11</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
6565
<!-- wcf -->
6666
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
6767
<!-- winforms -->
68-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.1-servicing.23580.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69-
<MicrosoftPrivateWinformsVersion>8.0.1-servicing.23580.6</MicrosoftPrivateWinformsVersion>
70-
<SystemDrawingCommonVersion>8.0.1</SystemDrawingCommonVersion>
68+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.2-servicing.24068.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69+
<MicrosoftPrivateWinformsVersion>8.0.2-servicing.24068.3</MicrosoftPrivateWinformsVersion>
70+
<SystemDrawingCommonVersion>8.0.2</SystemDrawingCommonVersion>
7171
<!-- wpf -->
72-
<MicrosoftDotNetWpfGitHubVersion>8.0.1-servicing.23580.5</MicrosoftDotNetWpfGitHubVersion>
73-
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.1-servicing.23580.5</MicrosoftDotNetWpfProjectTemplatesVersion>
72+
<MicrosoftDotNetWpfGitHubVersion>8.0.2-servicing.24068.6</MicrosoftDotNetWpfGitHubVersion>
73+
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.2-servicing.24068.6</MicrosoftDotNetWpfProjectTemplatesVersion>
7474
</PropertyGroup>
7575
</Project>

0 commit comments

Comments
 (0)