From 34816bfcf01b0ddb1cc79b0a2130589a36aae6f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 03:50:22 +0000 Subject: [PATCH 01/24] Update dependencies from https://github.com/dotnet/winforms build 20210817.9 (#5098) [release/6.0-rc1] Update dependencies from dotnet/winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 676c799dc81..948135571d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 02ef8f0eba399925a34aeeb55642871511378e9e + 9e53d86e61ef733f5fd4476965a61709f14f5616 - + https://github.com/dotnet/winforms - 02ef8f0eba399925a34aeeb55642871511378e9e + 9e53d86e61ef733f5fd4476965a61709f14f5616 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a4ad24140fc..d0eb4f1f3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-rc.1.21417.4 + 6.0.0-rc.1.21417.9 From 6d4450be01a1cd6b477bca1799d5d4c92844c598 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:50:04 +0000 Subject: [PATCH 02/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210817.10 (#5102) [release/6.0-rc1] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 948135571d3..175602ab007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://github.com/dotnet/runtime 14b34eb02bc8969b77c0d3a1e39fb38f450625cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 552adb9a860d3e46354669315bbf72aa421ccdc1 + dafe5e0d1387d5531ffa46ba092a0dca79ec71b7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d0eb4f1f3c3..dc9de57f9ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,6 +80,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rc.1.21417.2 + 6.0.0-rc.1.21417.10 From 77039413e3a5a844c85dec251fcd922006fb70f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 22:51:59 +0000 Subject: [PATCH 03/24] Update dependencies from https://github.com/dotnet/winforms build 20210818.7 (#5112) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.1.21418.7 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 175602ab007..3a33dbb4790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 9e53d86e61ef733f5fd4476965a61709f14f5616 + e0a9f4f89dd2a26f2ee96559717d4cfb47343bc5 - + https://github.com/dotnet/winforms - 9e53d86e61ef733f5fd4476965a61709f14f5616 + e0a9f4f89dd2a26f2ee96559717d4cfb47343bc5 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int dafe5e0d1387d5531ffa46ba092a0dca79ec71b7 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 82f7144f791314885c0e4e86f16e579357bfe7e3 diff --git a/eng/Versions.props b/eng/Versions.props index dc9de57f9ec..d83443d545f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21417.9 + 6.0.0-rc.1.21418.7 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.7 From 599109489e6e20bb7beffcd2790eb1f1ee5d03d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 02:53:05 +0000 Subject: [PATCH 04/24] Update dependencies from https://github.com/dotnet/winforms build 20210818.14 (#5116) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21418.7 to 6.0.0-rc.1.21418.17 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a33dbb4790..dc39545572e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - e0a9f4f89dd2a26f2ee96559717d4cfb47343bc5 + 8d255110cd8a9583c84301bb2a2b4244dda77a35 - + https://github.com/dotnet/winforms - e0a9f4f89dd2a26f2ee96559717d4cfb47343bc5 + 8d255110cd8a9583c84301bb2a2b4244dda77a35 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int dafe5e0d1387d5531ffa46ba092a0dca79ec71b7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://github.com/dotnet/runtime - 82f7144f791314885c0e4e86f16e579357bfe7e3 + f2b270cdae0ad927a200cf41e214e21326ff29a7 diff --git a/eng/Versions.props b/eng/Versions.props index d83443d545f..0b55cac84ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.14 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 - 6.0.0-rc.1.21418.7 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21418.17 From 799d80d84a4763a17033201ef1c67909ec34a5de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 17:27:12 +0000 Subject: [PATCH 05/24] Update dependencies from https://github.com/dotnet/arcade build 20210818.12 (#5121) [release/6.0-rc1] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++--------- eng/Versions.props | 6 +++--- eng/common/build.sh | 1 + .../post-build/sourcelink-validation.ps1 | 17 ++++++++++----- eng/common/sdk-task.ps1 | 1 + .../templates/job/source-index-stage1.yml | 21 +++++++------------ eng/common/tools.ps1 | 21 +++++++++++++++++++ eng/common/tools.sh | 7 +++++++ global.json | 4 ++-- 9 files changed, 65 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc39545572e..78bbd43d8c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 diff --git a/eng/Versions.props b/eng/Versions.props index 0b55cac84ea..d0cd756660f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 diff --git a/eng/common/build.sh b/eng/common/build.sh index 55b298f16cc..9d3042a943e 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,6 +187,7 @@ function InitializeCustomToolset { } function Build { + TryLogClientIpAddress InitializeToolset InitializeCustomToolset diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 85c89861719..3b6fc953337 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -17,6 +17,7 @@ $global:RepoFiles = @{} $MaxParallelJobs = 16 $MaxRetries = 5 +$RetryWaitTimeInSeconds = 30 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 @@ -99,9 +100,9 @@ $ValidatePackage = { $Status = 200 $Cache = $using:RepoFiles - $totalRetries = 0 + $attempts = 0 - while ($totalRetries -lt $using:MaxRetries) { + while ($attempts -lt $using:MaxRetries) { if ( !($Cache.ContainsKey($FilePath)) ) { try { $Uri = $Link -as [System.URI] @@ -113,7 +114,7 @@ $ValidatePackage = { else { # If it's not a github link, we want to break out of the loop and not retry. $Status = 0 - $totalRetries = $using:MaxRetries + $attempts = $using:MaxRetries } } catch { @@ -123,9 +124,15 @@ $ValidatePackage = { } if ($Status -ne 200) { - $totalRetries++ + $attempts++ - if ($totalRetries -ge $using:MaxRetries) { + if ($attempts -lt $using:MaxRetries) + { + $attemptsLeft = $using:MaxRetries - $attempts + Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $using:RetryWaitTimeInSeconds + } + else { if ($NumFailedLinks -eq 0) { if ($FailedFiles.Value -eq 0) { Write-Host diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab1d..7ffa3591e9c 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,6 +83,7 @@ try { } if ($restore) { + Try-LogClientIpAddress Build 'Restore' } diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b58d42364b9..1cc0c29e4fd 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -34,29 +34,24 @@ jobs: inputs: packageType: sdk version: 3.1.x - - - task: UseDotNet@2 - displayName: Use .NET Core sdk - inputs: - useGlobalJson: true + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) - script: | - dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - env: - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) displayName: Upload stage1 artifacts to source index env: BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5d526c74d51..e607aa43697 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } + # In case of network error, try to log the current IP for reference + Try-LogClientIpAddress + # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism $env:DOTNET_MULTILEVEL_LOOKUP=0 @@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) { } } } + +function Try-LogClientIpAddress() +{ + Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" + try + { + $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $lines = $result.Content.Split([Environment]::NewLine) + $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" + Write-Host $socketIp + $clientIp = $lines | Select-String -Pattern "^Client IP:.*" + Write-Host $clientIp + } + catch + { + Write-Host "Unable to get this machine's effective IP address for logging: $_" + } +} diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 828119be411..3c5f3a12c0a 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -399,6 +399,13 @@ function StopProcesses { return 0 } +function TryLogClientIpAddress () { + echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' + if command -v curl > /dev/null; then + curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' + fi +} + function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index aa62406866a..923c3c62fb3 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21418.12" }, "sdk": { "version": "6.0.100-rc.1.21416.15" From f68efe75e1f7d5c6b667eeb57b0e79ddc221c397 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:04:35 +0000 Subject: [PATCH 06/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210819.3 (#5122) [release/6.0-rc1] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78bbd43d8c8..9eb3506274c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://github.com/dotnet/runtime f2b270cdae0ad927a200cf41e214e21326ff29a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - dafe5e0d1387d5531ffa46ba092a0dca79ec71b7 + 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d0cd756660f..71db94fa24e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,6 +80,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rc.1.21417.10 + 6.0.0-rc.1.21419.3 From c1f930c36454022d799ff63481e95068d45b37b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 19:05:51 +0000 Subject: [PATCH 07/24] Update dependencies from https://github.com/dotnet/winforms build 20210819.4 (#5124) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21418.17 to 6.0.0-rc.1.21419.3 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eb3506274c..0e66087f645 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 8d255110cd8a9583c84301bb2a2b4244dda77a35 + 553dc3d9098a291ea44c20b56998c45e63fd59a8 - + https://github.com/dotnet/winforms - 8d255110cd8a9583c84301bb2a2b4244dda77a35 + 553dc3d9098a291ea44c20b56998c45e63fd59a8 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 - + https://github.com/dotnet/runtime - f2b270cdae0ad927a200cf41e214e21326ff29a7 + 3d39a3771be62692da95eee12b826530a61e3ca7 diff --git a/eng/Versions.props b/eng/Versions.props index 71db94fa24e..a50bacd80f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21418.14 + 6.0.0-rc.1.21419.4 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 - 6.0.0-rc.1.21418.17 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21419.3 From 4d50cfaa3dd539cc46b272057b55d8e0e95d21f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 18:49:19 +0000 Subject: [PATCH 08/24] Update dependencies from https://github.com/dotnet/winforms build 20210820.2 (#5131) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21419.3 to 6.0.0-rc.1.21420.7 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e66087f645..e05df24013d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 553dc3d9098a291ea44c20b56998c45e63fd59a8 + 18267f1bb8fbe96747187cd1226ff0964c0f36a0 - + https://github.com/dotnet/winforms - 553dc3d9098a291ea44c20b56998c45e63fd59a8 + 18267f1bb8fbe96747187cd1226ff0964c0f36a0 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 - + https://github.com/dotnet/runtime - 3d39a3771be62692da95eee12b826530a61e3ca7 + 27d062a8f09c7246bc0597d9f74d638a17bf3438 diff --git a/eng/Versions.props b/eng/Versions.props index a50bacd80f7..fc89947dbab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21419.4 + 6.0.0-rc.1.21420.2 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 - 6.0.0-rc.1.21419.3 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21420.7 From afd07278b9b8d0912924486a8b9fece70f3fcd18 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Fri, 20 Aug 2021 11:54:25 -0700 Subject: [PATCH 09/24] Accessibility: Port "GetClickablePoint returns error value when the element is offscreen" from main (#5130) --- .../System/Windows/Automation/Peers/AutomationPeer.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs index 2bc28b44fb5..fb7854bc8f8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs @@ -1181,7 +1181,14 @@ public Point GetClickablePoint() try { _publicCallInProgress = true; - result = GetClickablePointCore(); + if (IsOffscreenCore()) + { + result = new Point(double.NaN, double.NaN); + } + else + { + result = GetClickablePointCore(); + } } finally { From 04d5051774f8764742b1879b5283f0b1490db2a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 17:20:14 +0000 Subject: [PATCH 10/24] Update dependencies from https://github.com/dotnet/winforms build 20210823.1 (#5145) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21420.7 to 6.0.0-rc.1.21421.1 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e05df24013d..f03053c6d79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 18267f1bb8fbe96747187cd1226ff0964c0f36a0 + 53822976436199a48ee64dc7f337720ff01a35e1 - + https://github.com/dotnet/winforms - 18267f1bb8fbe96747187cd1226ff0964c0f36a0 + 53822976436199a48ee64dc7f337720ff01a35e1 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 - + https://github.com/dotnet/runtime - 27d062a8f09c7246bc0597d9f74d638a17bf3438 + 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 diff --git a/eng/Versions.props b/eng/Versions.props index fc89947dbab..d2cbb3a2d70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21420.2 + 6.0.0-rc.1.21423.1 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 - 6.0.0-rc.1.21420.7 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21421.1 From b65cdc5df344280ae3cce27aa1930679a0c6fbee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 23:59:01 +0000 Subject: [PATCH 11/24] Update dependencies from https://github.com/dotnet/winforms build 20210823.12 (#5151) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21421.1 to 6.0.0-rc.1.21423.9 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f03053c6d79..20d5707f371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 53822976436199a48ee64dc7f337720ff01a35e1 + 0e9136173a64c3797205f104ffd6259588ccef3f - + https://github.com/dotnet/winforms - 53822976436199a48ee64dc7f337720ff01a35e1 + 0e9136173a64c3797205f104ffd6259588ccef3f - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb - + https://github.com/dotnet/runtime - 0ab239d53742fd806e7b62da2c1f3a0ca9bfc579 + 030f56048074345764576802d8ec0afc27b62ecb diff --git a/eng/Versions.props b/eng/Versions.props index d2cbb3a2d70..c08bab36cf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.1 + 6.0.0-rc.1.21423.12 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 - 6.0.0-rc.1.21421.1 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.9 From 50fb02817cda73e60b7a9f7aac87ad45473c2e5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:22:50 +0000 Subject: [PATCH 12/24] Update dependencies from https://github.com/dotnet/winforms build 20210824.7 (#5157) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21423.9 to 6.0.0-rc.1.21423.21 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20d5707f371..2334448f18b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 0e9136173a64c3797205f104ffd6259588ccef3f + 742746c90a6a9a3d146d3ab46b3120463a1b91b9 - + https://github.com/dotnet/winforms - 0e9136173a64c3797205f104ffd6259588ccef3f + 742746c90a6a9a3d146d3ab46b3120463a1b91b9 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 - + https://github.com/dotnet/runtime - 030f56048074345764576802d8ec0afc27b62ecb + 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 diff --git a/eng/Versions.props b/eng/Versions.props index c08bab36cf7..9bec09628af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.12 + 6.0.0-rc.1.21424.7 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 - 6.0.0-rc.1.21423.9 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21423.21 From d5013fb451135c825a3c9b7bd6e90d9aea043ca5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 19:36:34 +0000 Subject: [PATCH 13/24] Update dependencies from https://github.com/dotnet/winforms build 20210824.8 (#5158) [release/6.0-rc1] Update dependencies from dotnet/winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2334448f18b..9a0349d9ed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 742746c90a6a9a3d146d3ab46b3120463a1b91b9 + 617f74f3eb7631b0e41b728f81c78149f42b918c - + https://github.com/dotnet/winforms - 742746c90a6a9a3d146d3ab46b3120463a1b91b9 + 617f74f3eb7631b0e41b728f81c78149f42b918c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9bec09628af..07d57f17be3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-rc.1.21424.7 + 6.0.0-rc.1.21424.8 From d04fb52d8e6eb11dc5f354c374af08d26c28e6c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 20:43:19 +0000 Subject: [PATCH 14/24] Update dependencies from https://github.com/dotnet/winforms build 20210824.11 (#5159) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21423.21 to 6.0.0-rc.1.21424.10 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a0349d9ed6..af10e476e17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 617f74f3eb7631b0e41b728f81c78149f42b918c + 87f8b720ea746a49ab2f253d7c48b7fdf7b21d5d - + https://github.com/dotnet/winforms - 617f74f3eb7631b0e41b728f81c78149f42b918c + 87f8b720ea746a49ab2f253d7c48b7fdf7b21d5d - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 - + https://github.com/dotnet/runtime - 0e4a871887a7f765c42dbf81512cc1af63d7ccc7 + 2170911873dd5712afa7b9b94b7a43f06722d9e4 diff --git a/eng/Versions.props b/eng/Versions.props index 07d57f17be3..9a31cec6121 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.8 + 6.0.0-rc.1.21424.11 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 - 6.0.0-rc.1.21423.21 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.10 From 0c4d48104afcb950752bfe91d76b78612cb1abcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 19:56:50 +0000 Subject: [PATCH 15/24] Update dependencies from https://github.com/dotnet/winforms build 20210825.7 (#5169) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21424.10 to 6.0.0-rc.1.21424.15 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af10e476e17..dbfd41c6989 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 87f8b720ea746a49ab2f253d7c48b7fdf7b21d5d + a829313fcb56f30864e7e59db368c8df43080a76 - + https://github.com/dotnet/winforms - 87f8b720ea746a49ab2f253d7c48b7fdf7b21d5d + a829313fcb56f30864e7e59db368c8df43080a76 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 - + https://github.com/dotnet/runtime - 2170911873dd5712afa7b9b94b7a43f06722d9e4 + faf0c8f53baf2ab131299563403dd36aaa4ef478 diff --git a/eng/Versions.props b/eng/Versions.props index 9a31cec6121..0d7e97acdc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.11 + 6.0.0-rc.1.21425.7 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 - 6.0.0-rc.1.21424.10 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21424.15 From 7ca62fe9be802cab9915dbde7a5f82827305e658 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 21:01:24 +0000 Subject: [PATCH 16/24] Update dependencies from https://github.com/dotnet/winforms build 20210825.15 (#5175) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21424.15 to 6.0.0-rc.1.21425.7 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbfd41c6989..240dd523ec0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - a829313fcb56f30864e7e59db368c8df43080a76 + 9d2a0b163d3a949c329fcf3c7fc114e008434f21 - + https://github.com/dotnet/winforms - a829313fcb56f30864e7e59db368c8df43080a76 + 9d2a0b163d3a949c329fcf3c7fc114e008434f21 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 - + https://github.com/dotnet/runtime - faf0c8f53baf2ab131299563403dd36aaa4ef478 + 614525189115a83e84e23041f8d5f7bc4cc5cf09 diff --git a/eng/Versions.props b/eng/Versions.props index 0d7e97acdc4..2e64c3a71ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 - 6.0.0-rc.1.21424.15 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.7 From 0e0bf102e18bf6ac5f52738441b13742dea41736 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 22:51:12 +0000 Subject: [PATCH 17/24] Update dependencies from https://github.com/dotnet/winforms build 20210825.16 (#5180) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.7 to 6.0.0-rc.1.21425.15 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240dd523ec0..7af1e1edf75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 9d2a0b163d3a949c329fcf3c7fc114e008434f21 + 622ce053c048212f799b59cadf590092fadcd107 - + https://github.com/dotnet/winforms - 9d2a0b163d3a949c329fcf3c7fc114e008434f21 + 622ce053c048212f799b59cadf590092fadcd107 - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb - + https://github.com/dotnet/runtime - 614525189115a83e84e23041f8d5f7bc4cc5cf09 + 4f0eb12200a7db5030a49f300e458216a88fbcdb diff --git a/eng/Versions.props b/eng/Versions.props index 2e64c3a71ee..612473e83d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.16 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 - 6.0.0-rc.1.21425.7 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21425.15 From fa13a2fd3cb4c93f56e6713af83c1ae01f1fafd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Aug 2021 01:54:15 +0000 Subject: [PATCH 18/24] Update dependencies from https://github.com/dotnet/winforms build 20210825.22 (#5185) [release/6.0-rc1] Update dependencies from dotnet/winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7af1e1edf75..c11368538cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 622ce053c048212f799b59cadf590092fadcd107 + dc6a62a05dee0866db18d56b5522a0a865db28eb - + https://github.com/dotnet/winforms - 622ce053c048212f799b59cadf590092fadcd107 + dc6a62a05dee0866db18d56b5522a0a865db28eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 612473e83d7..a26add9d537 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-rc.1.21425.16 + 6.0.0-rc.1.21425.22 From 0660667381542d4c32a66e12565a6e6554ebeb0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Aug 2021 20:08:55 +0000 Subject: [PATCH 19/24] Update dependencies from https://github.com/dotnet/winforms build 20210826.4 (#5193) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.8 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c11368538cf..459f28b3147 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - dc6a62a05dee0866db18d56b5522a0a865db28eb + 4176c5da70b29edc1f4d1db85508407f3895ca2a - + https://github.com/dotnet/winforms - dc6a62a05dee0866db18d56b5522a0a865db28eb + 4176c5da70b29edc1f4d1db85508407f3895ca2a - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 - + https://github.com/dotnet/runtime - 4f0eb12200a7db5030a49f300e458216a88fbcdb + 476a03e554142c324f05045966d4b9fc28d70bd1 diff --git a/eng/Versions.props b/eng/Versions.props index a26add9d537..336dc1b03d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21425.22 + 6.0.0-rc.1.21426.4 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 - 6.0.0-rc.1.21425.15 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.8 From 7fa466e83407b374cf595c4fa965419b5cd180bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 16:42:47 +0000 Subject: [PATCH 20/24] Update dependencies from https://github.com/dotnet/winforms build 20210826.8 (#5200) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21426.8 to 6.0.0-rc.1.21426.17 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 459f28b3147..28ca2fdbd6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - 4176c5da70b29edc1f4d1db85508407f3895ca2a + ef62cf01879337b5fa4f710a347bc9cab9fb897b - + https://github.com/dotnet/winforms - 4176c5da70b29edc1f4d1db85508407f3895ca2a + ef62cf01879337b5fa4f710a347bc9cab9fb897b - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 diff --git a/eng/Versions.props b/eng/Versions.props index 336dc1b03d5..30b25986cc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.4 + 6.0.0-rc.1.21426.8 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21426.17 From 8fa13be6b0192293393477bdf7011cdd435840d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 20:37:13 +0000 Subject: [PATCH 21/24] [release/6.0-rc1] Update dependencies from dotnet/winforms (#5208) [release/6.0-rc1] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21426.17 to 6.0.0-rc.1.21430.11 (parent: Microsoft.Private.Winforms) - Remove Analyzers coming from net6.0 ref pack These require VS 2022 Roslyn v4.0, but the CI machine is still using VS 2019. --- Directory.Build.targets | 8 +++++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 3 files changed, 64 insertions(+), 56 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 1394a206741..4fcbffbe3ce 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -6,4 +6,12 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28ca2fdbd6f..9d537f34cfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,85 +1,85 @@ - + https://github.com/dotnet/winforms - ef62cf01879337b5fa4f710a347bc9cab9fb897b + bab479fa2de8644d36533ef8c35022ff4d6e0c13 - + https://github.com/dotnet/winforms - ef62cf01879337b5fa4f710a347bc9cab9fb897b + bab479fa2de8644d36533ef8c35022ff4d6e0c13 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4bc1c55c0abcb0ff62bdb534168a51be2224fe3f - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 - + https://github.com/dotnet/runtime - 4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6 + 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549 diff --git a/eng/Versions.props b/eng/Versions.props index 30b25986cc2..0d4a298d132 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 rc 1 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21430.13 5.0.0-alpha1.19562.1 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 4.6.0-preview4.19176.11 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 - 6.0.0-rc.1.21426.17 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 + 6.0.0-rc.1.21430.11 From d26acd0cf4ebdd75304a111e2ce6dac41b7b0add Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 30 Aug 2021 16:54:25 -0500 Subject: [PATCH 22/24] Respond to PR feedback from https://github.com/dotnet/wpf/pull/5208 (#5225) --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 4fcbffbe3ce..4d75fdd84cc 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -11,7 +11,7 @@ https://github.com/dotnet/wpf/issues/5224 --> - + From 3f4f3a242d27f5c81a7de4a2ae9ee695bd14e935 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Wed, 1 Sep 2021 16:26:23 +0530 Subject: [PATCH 23/24] Replace Obsolete APIs --- .../MS/Internal/documents/DocumentSignatureManager.cs | 6 +++--- .../Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs index b29edc11c1a..c98aa7f8fbe 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs @@ -506,9 +506,9 @@ internal void ShowSigningDialog( // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can redisplay the certificate picker - #pragma warning disable SYSLIB0028 - AsymmetricAlgorithm testKey = x509Certificate2.PrivateKey; - #pragma warning restore SYSLIB0028 + + //x509Certificate2.PrivateKey is Obsolete. If we can't retrieve the private key, redisplay the certificate picker to allow user to select different key. + requestAgain = true; } } } diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs index 39a5a32e85b..e5b8b4e5bf8 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs @@ -874,9 +874,9 @@ private static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 cert) // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can revert the changes - #pragma warning disable SYSLIB0028 - return cert.PrivateKey; - #pragma warning restore SYSLIB0028 + + //x509Certificate2.PrivateKey is Obsolete. If we can't retrieve the private key, throw the exception. + throw new ArgumentException(SR.Get(SRID.CertificateKeyTypeNotSupported), "cert"); } /// From b9ae186b43cc69910a9f4e3f5b685d2899049db3 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Thu, 9 Sep 2021 15:34:56 +0530 Subject: [PATCH 24/24] Change to NotSupportedException for Compatibility. --- .../MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs index e5b8b4e5bf8..df90b07ec9c 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs @@ -876,7 +876,7 @@ private static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 cert) // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can revert the changes //x509Certificate2.PrivateKey is Obsolete. If we can't retrieve the private key, throw the exception. - throw new ArgumentException(SR.Get(SRID.CertificateKeyTypeNotSupported), "cert"); + throw new NotSupportedException(SR.Get(SRID.CertificateKeyTypeNotSupported)); } ///