Skip to content

Merging internal commits for release/8.0 #9370

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

Merging internal commits for release/8.0 #9370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a95d451
Merge in 'release/8.0' changes
dotnet-bot Mar 5, 2024
9b8d615
[internal/release/8.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Mar 10, 2024
c15b5c6
Fixes PenIMC UAF MSRC .NET 8
dipeshmsft Mar 11, 2024
8537295
Merged PR 37981: Fixing PenIMC UAF MSRC .NET 8
dipeshmsft Mar 11, 2024
e4c631a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
5b4289d
Merge in 'release/8.0' changes
dotnet-bot Mar 13, 2024
58b2b1e
Merged PR 38010: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Mar 13, 2024
fa1c16b
Local dependencies updated based on build with BAR id 217426 (2024031…
vseanreesermsft Mar 18, 2024
3e809dd
Merged PR 38189: Local dependencies updated based on build with BAR i…
vseanreesermsft Mar 18, 2024
98cf51b
Merged PR 38220: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Mar 19, 2024
cb0cdd8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 19, 2024
29ccbec
Merged PR 38248: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Mar 19, 2024
b18e956
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
ebbf01f
Merged PR 38285: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Mar 20, 2024
abd8857
Merge in 'release/8.0' changes
dotnet-bot Apr 10, 2024
d8bb445
Merge in 'release/8.0' changes
dotnet-bot Apr 10, 2024
cc1110e
Merged PR 38977: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Apr 16, 2024
b5af29a
Merged PR 39044: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Apr 17, 2024
ba2617a
Merge in 'release/8.0' changes
dotnet-bot May 2, 2024
f167a02
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 16, 2024
c7a8451
Merged PR 39630: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot May 16, 2024
eea757d
Merged PR 39696: [internal/release/8.0] Merge from public
vseanreesermsft May 17, 2024
adccabf
Merged PR 39729: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot May 18, 2024
3e6e28e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 20, 2024
b69c3c2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 20, 2024
fa1c8aa
Merged PR 39780: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot May 20, 2024
6c96e5e
Merged PR 39797: [internal/release/8.0] Merge from public
vseanreesermsft May 20, 2024
5b4792e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot May 21, 2024
7db8d5b
Merged PR 39864: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot May 21, 2024
b10cd0c
Merged PR 40284: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Jun 12, 2024
0b9370c
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 13, 2024
28dd904
Merged PR 40388: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Jun 13, 2024
d0f04b1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 14, 2024
43bb8cc
Merged PR 40442: [internal/release/8.0] Update dependencies from dnce…
dotnet-bot Jun 14, 2024
6a1948f
Merge commit '43bb8cc831c2658e1117415019264bfe6f644f94' 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
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,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-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-fdc2007" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074/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 @@ -20,8 +22,10 @@
<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-2aade6b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-fdc2007" 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
30 changes: 15 additions & 15 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="8.0.5-servicing.24217.4">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.7-servicing.24313.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>6c37c986b6c8fc0669b38a03a03445a75b8227a6</Sha>
<Sha>fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.5-servicing.24217.4">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.7-servicing.24313.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>6c37c986b6c8fc0669b38a03a03445a75b8227a6</Sha>
<Sha>fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -17,9 +17,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.5-servicing.24216.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.7-servicing.24313.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.24321.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -29,17 +29,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.5-servicing.24216.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.7-servicing.24313.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<!-- These dependencies are required by windowsdesktop for coherency. -->
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
Expand Down Expand Up @@ -120,7 +120,7 @@
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -150,9 +150,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.5">
<Dependency Name="System.Drawing.Common" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>6c37c986b6c8fc0669b38a03a03445a75b8227a6</Sha>
<Sha>fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611</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 @@ -22,18 +22,18 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>8.0.5-servicing.24217.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>8.0.7-servicing.24313.8</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.5-servicing.24216.15</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.5</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.5-servicing.24216.15</MicrosoftNETCorePlatformsVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.7-servicing.24313.11</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.7-servicing.24313.11</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonVersion>8.0.5</SystemDrawingCommonVersion>
<SystemDrawingCommonVersion>8.0.7</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
<SystemIOPackagingVersion>8.0.0</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0</SystemReflectionMetadataLoadContextVersion>
Expand Down