Skip to content

Merging internal commits for release/6.0 #8017

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 27 commits into from
Jul 12, 2023
Merged

Merging internal commits for release/6.0 #8017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6c29ef4
Merge in 'release/6.0' changes
dotnet-bot Apr 4, 2023
389429a
Merged PR 30328: WPF MSRC Fix port for CVE-2023-24895
singhashish-wpf Apr 6, 2023
2f3f84c
Merge in 'release/6.0' changes
dotnet-bot Apr 11, 2023
a9378f7
Merge in 'release/6.0' changes
dotnet-bot Apr 12, 2023
e5c139d
Merge in 'release/6.0' changes
dotnet-bot Apr 12, 2023
73865fc
Merged PR 30386: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Apr 13, 2023
0595f2e
Merged PR 30634: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Apr 13, 2023
cf237a0
Merged PR 30768: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Apr 18, 2023
b8c80b1
Merge in 'release/6.0' changes
dotnet-bot May 3, 2023
bd8f52b
Merge in 'release/6.0' changes
dotnet-bot May 9, 2023
4bf4fd5
Merged PR 31016: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 11, 2023
f82a2b2
Merged PR 31347: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 18, 2023
7cd35b1
Merged PR 31380: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 19, 2023
a29a62b
Merged PR 31444: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot May 22, 2023
856646c
Merge in 'release/6.0' changes
dotnet-bot Jun 7, 2023
321b09a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 13, 2023
c758542
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 14, 2023
166d129
Merge in 'release/6.0' changes
dotnet-bot Jun 14, 2023
c981e03
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 14, 2023
80d0a96
Merged PR 31871: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 14, 2023
ad9fd8e
Merged PR 31956: [internal/release/6.0] Merge from public
vseanreesermsft Jun 16, 2023
669314b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 16, 2023
b2fc6c7
Merged PR 31965: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 16, 2023
b38efb9
Merge in 'release/6.0' changes
dotnet-bot Jun 20, 2023
6298294
Merged PR 32051: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 21, 2023
0a2507d
Merged PR 32118: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Jun 21, 2023
190a6a4
Merge commit '0a2507dd214349c40c4f1e9aba2ce6a91e8675a8' into internal…
vseanreesermsft Jul 11, 2023
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-a08d9ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a08d9ce2/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-a08d9ce" 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
32 changes: 16 additions & 16 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.18-servicing.23272.1">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23321.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>865895cec5e8dc357b65c98a4a7af58643d10997</Sha>
<Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.18-servicing.23272.1">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23321.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>865895cec5e8dc357b65c98a4a7af58643d10997</Sha>
<Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</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 @@ -45,9 +45,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23315.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -57,29 +57,29 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</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.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.18-servicing.23272.1</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.20-servicing.23321.4</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.18-servicing.23269.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.18-servicing.23269.7</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.18</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.18</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.10</MicrosoftNETCorePlatformsVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.20</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>
Expand Down