Skip to content

Merging internal commits for release/6.0 #8656

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 19 commits into from
Jan 10, 2024
Merged

Merging internal commits for release/6.0 #8656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a06ec16
Merge in 'release/6.0' changes
dotnet-bot Nov 8, 2023
d804d12
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 9, 2023
0dd66fd
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 9, 2023
e8874bc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 9, 2023
3009d38
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 9, 2023
410a885
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 14, 2023
19304f1
Merge in 'release/6.0' changes
dotnet-bot Nov 15, 2023
e3687e6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 20, 2023
4f06cba
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 20, 2023
ef76857
Merged PR 35172: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Nov 21, 2023
4d838ed
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Nov 22, 2023
41b7234
Merged PR 35478: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Nov 22, 2023
551792a
Merged PR 35490: Fixing VerifyCertificate NET 6.0
Kuldeep-MS Nov 23, 2023
ef39dad
Merge remote-tracking branch 'upstream/release/6.0' into internal/rel…
dkurepa Nov 23, 2023
2239b62
Merged PR 35518: Update Wpf-int
dkurepa Nov 23, 2023
981ef80
[internal/release/6.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Nov 23, 2023
9006dbc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Dec 5, 2023
e5b72d0
Merged PR 35827: [internal/release/6.0] Update dependencies from dnce…
dotnet-bot Dec 5, 2023
e05c402
Merge commit 'e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7' into internal…
vseanreesermsft Jan 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-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/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-dc45e96" 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.25-servicing.23519.16">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.26-servicing.23605.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>d4ee94199afb6c67ed448c252a07c0747c089e41</Sha>
<Sha>c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23605.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>d4ee94199afb6c67ed448c252a07c0747c089e41</Sha>
<Sha>c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b</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.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</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.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</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.25-servicing.23519.16</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.26-servicing.23605.5</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.25-servicing.23519.12</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.25-servicing.23519.12</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.26-servicing.23605.8</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.26-servicing.23605.8</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.25</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.25</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.26</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.26</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
Expand Down
8 changes: 8 additions & 0 deletions ...icrosoft.DotNet.Wpf/src/WindowsBase/System/IO/Packaging/PackageDigitalSignatureManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,14 @@ public static X509ChainStatusFlags VerifyCertificate(X509Certificate certificate
if (!valid)
{
X509ChainStatus[] chainStatus = chain.ChainStatus;

//check if build has experienced any internal failure
if (chainStatus.Length == 0)
{
//Internal failure has occurred while building
return X509ChainStatusFlags.NotValidForUsage;
}

for (int i = 0; i < chainStatus.Length; i++)
{
status |= chainStatus[i].Status;
Expand Down