Skip to content

Merging internal commits for release/8.0 #4926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 12, 2025
Merged

Merging internal commits for release/8.0 #4926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c5e9b0
Merge commit '954691667cdc23a2919a2e1556ad567c16e80ebb'
Jan 7, 2025
a5458a3
Merge remote-tracking branch 'origin/release/8.0' into internal/relea…
Tanya-Solyanik Jan 14, 2025
903af08
Merged PR 46700: Manual merge from AzDO release/8.0 to AzDO internal/…
Jan 14, 2025
303b798
Merge commit 'ebb928971a5ca7dc9f4de3f5e85d57665f4d479f'
Jan 14, 2025
2fd9e6b
Merge commit '7d66bf3b75a90ff774c75fa56a325f97898b56db'
Jan 15, 2025
e43b37d
Merged PR 46824: [internal/release/8.0] Update dependencies from dnce…
Jan 17, 2025
7d40515
Merge commit 'e43b37de7d5916352702dda1b65d98dd66f5f9f4' into internal…
vseanreesermsft Feb 11, 2025
524c336
Merge branch 'release/8.0' into internal-merge-8.0-2025-02-11-1225
mmitche Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-44b9411" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-44b9411e/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-44b9411-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-44b9411e-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-44b9411-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-44b9411e-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-ffd0879" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -28,13 +25,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-44b9411-2" value="true" />
<add key="darc-int-dotnet-winforms-44b9411-3" value="true" />
<add key="darc-int-dotnet-winforms-44b9411" value="true" />
<add key="darc-int-dotnet-winforms-ffd0879" value="true" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.12-servicing.24603.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.13-servicing.25066.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.12-servicing.24603.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.13-servicing.25066.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>44b9411eeca123dd8b2c9d47afe46f9e537f1714</Sha>
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.12-servicing.24603.5">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.13-servicing.25066.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</Sha>
<Sha>b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.12-servicing.24603.5">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.13-servicing.25066.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</Sha>
<Sha>b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.13-servicing.25066.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.12-servicing.24603.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.13-servicing.25066.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>44b9411eeca123dd8b2c9d47afe46f9e537f1714</Sha>
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.12-servicing.24603.5">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.13-servicing.25066.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</Sha>
<Sha>b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -145,9 +145,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.12" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="System.Drawing.Common" Version="8.0.13" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>44b9411eeca123dd8b2c9d47afe46f9e537f1714</Sha>
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<!-- nuget -->
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
<!-- runtime -->
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.12-servicing.24603.5</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.12</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.13-servicing.25066.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.13</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.13</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
Expand Down Expand Up @@ -61,15 +61,15 @@
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.12-servicing.24603.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.13-servicing.25066.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.12-servicing.24603.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.12-servicing.24603.6</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.12</SystemDrawingCommonVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.13-servicing.25066.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.13-servicing.25066.3</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.13</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.12-servicing.24603.5</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.12-servicing.24603.5</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotNetWpfGitHubVersion>8.0.13-servicing.25066.5</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.13-servicing.25066.5</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
</Project>