Skip to content

Merging internal commits for release/6.0 #9371

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 36 commits into from
Jul 10, 2024
Merged

Merging internal commits for release/6.0 #9371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
817ee2a
Merge in 'release/6.0' changes
dotnet-bot Mar 6, 2024
2eefe1f
[internal/release/6.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Mar 10, 2024
5305ab1
Fixes PenIMC UAF MSRC .NET 6
dipeshmsft Mar 11, 2024
46dcf87
Merged PR 37983: Fixes PenIMC UAF MSRC .NET 6
dipeshmsft Mar 11, 2024
045f0a7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
428120d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
e06aa00
Merge in 'release/6.0' changes
dotnet-bot Mar 13, 2024
c119ee1
Merge in 'release/6.0' changes
dotnet-bot Mar 13, 2024
1d55352
Merged PR 38009: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Mar 13, 2024
294b19a
Merge in 'release/6.0' changes
dotnet-bot Mar 18, 2024
8592ccb
Local dependencies updated based on build with BAR id 217668 (2024031…
vseanreesermsft Mar 18, 2024
90251e6
Merge in 'release/6.0' changes
dotnet-bot Mar 18, 2024
573c73a
Merged PR 38186: Local dependencies updated based on build with BAR i…
vseanreesermsft Mar 18, 2024
60270ca
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
f3f9597
Merged PR 38304: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Mar 20, 2024
f882a67
Merged PR 38439: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Mar 21, 2024
6aec9b9
Merged PR 38452: [internal/release/6.0] Merge from public
vseanreesermsft Mar 22, 2024
517ce07
Merge in 'release/6.0' changes
dotnet-bot Apr 10, 2024
4d95bad
Merge in 'release/6.0' changes
dotnet-bot Apr 10, 2024
dee47a1
Merged PR 38997: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Apr 16, 2024
d635ba5
Merge in 'release/6.0' changes
dotnet-bot May 2, 2024
4d4489f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 16, 2024
9dd26a5
Merged PR 39631: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 16, 2024
b90f1a2
Merged PR 39693: [internal/release/6.0] Merge from public
vseanreesermsft May 17, 2024
66bb6b2
Merged PR 39731: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 18, 2024
cb471c5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 20, 2024
e775ef1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 20, 2024
7e2bc9b
Merged PR 39783: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 20, 2024
c0fec5a
Merged PR 39801: [internal/release/6.0] Merge from public
vseanreesermsft May 20, 2024
1d682d7
[internal/release/6.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot May 21, 2024
cc260c4
Merged PR 40334: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 12, 2024
5c25d8b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 13, 2024
2bc8523
Merged PR 40420: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 13, 2024
a57e034
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 14, 2024
798cc6d
Merged PR 40486: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 14, 2024
334cd3f
Merge commit '798cc6d4922db482f84fb72a8244f0da898bc5d6' into internal…
vseanreesermsft Jul 9, 2024
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
2 changes: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<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-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--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 @@ -18,6 +19,7 @@
<disabledPackageSources>
<!--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-e77011b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>431a1dcb7d4eafa215951499ad374ffde8622e61</Sha>
<Sha>670045968593e524941ef480423796ceb50c5e2f</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>431a1dcb7d4eafa215951499ad374ffde8622e61</Sha>
<Sha>670045968593e524941ef480423796ceb50c5e2f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -57,29 +57,29 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.32-servicing.24314.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.32-servicing.24314.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.30" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.30" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.30-servicing.24216.19</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.32-servicing.24314.5</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.30-servicing.24215.25</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.30-servicing.24215.25</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.32-servicing.24314.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.32-servicing.24314.7</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.30-servicing.24215.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.30</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.30</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24314.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.32</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.32</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
Expand Down