From dac1c5c05b1132843c4b5ffe4ecce0f6adf05f21 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:22:47 +0000
Subject: [PATCH 001/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210817.6
(#5094)
[release/6.0] 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 676c799dc81..03f927ddff8 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 a4ad24140fc..44af819a6f9 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.6
From 180f9bad2c6e31327817bb2277ca2ea2cd684f86 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:27:37 +0000
Subject: [PATCH 002/223] Update dependencies from
https://github.com/dotnet/winforms build 20210817.5 (#5096)
[release/6.0] Update dependencies from dotnet/winforms
---
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 03f927ddff8..3dd16e8c3a2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,11 +1,11 @@
-
+
https://github.com/dotnet/winforms
02ef8f0eba399925a34aeeb55642871511378e9e
-
+
https://github.com/dotnet/winforms
02ef8f0eba399925a34aeeb55642871511378e9e
diff --git a/eng/Versions.props b/eng/Versions.props
index 44af819a6f9..090cb3d4cd8 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.5
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 003/223] 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 029a80322bc72b2984a82497584344d121dd621b 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:55:34 +0000
Subject: [PATCH 004/223] Update dependencies from
https://github.com/dotnet/winforms build 20210817.7 (#5099)
[release/6.0] 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 3dd16e8c3a2..a93c87777ea 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 090cb3d4cd8..d14bc0d73a6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.1.21417.5
+ 6.0.0-rc.1.21417.7
From 88568eca63ad9ea33e4843d4df133cdb31303f8c 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:26:26 +0000
Subject: [PATCH 005/223] Update dependencies from
https://github.com/dotnet/winforms build 20210817.12 (#5100)
[release/6.0] 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 a93c87777ea..46e404b9983 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 9e53d86e61ef733f5fd4476965a61709f14f5616
+ 871fda6a779a7ff12049914c4df3b6271a71d62e
-
+
https://github.com/dotnet/winforms
- 9e53d86e61ef733f5fd4476965a61709f14f5616
+ 871fda6a779a7ff12049914c4df3b6271a71d62e
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index d14bc0d73a6..5b839385ff0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.1.21417.7
+ 6.0.0-rc.2.21417.12
From f0bdde4ee66b2a6259ac6488199e06d59bea06ed 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:39:41 +0000
Subject: [PATCH 006/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210817.8
(#5101)
[release/6.0] 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 46e404b9983..9dd85bb064f 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
- dafe5e0d1387d5531ffa46ba092a0dca79ec71b7
+ c2525a6e26b57acbf5c48e34e49febbb6c1dcb27
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5b839385ff0..741e16a69cb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rc.1.21417.6
+ 7.0.0-alpha.1.21417.8
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 007/223] 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 16dfdcf877f729d65d54049db4d50aa447510a9b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Aug 2021 13:16:47 +0000
Subject: [PATCH 008/223] [release/6.0] Update dependencies from
dnceng/internal/dotnet-wpf-int (#5103)
[release/6.0] 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 9dd85bb064f..3fa011aef19 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
- c2525a6e26b57acbf5c48e34e49febbb6c1dcb27
+ e7299b0204e213eed914072ce6c8714be3cbcee3
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 741e16a69cb..9ffd44aeeaa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 7.0.0-alpha.1.21417.8
+ 7.0.0-alpha.1.21418.2
From 671cf8b863c277ff0553618ff98aee74bd0e0a83 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 18 Aug 2021 09:40:41 -0700
Subject: [PATCH 009/223] Update release/6.0 branding to rc2 (#5105)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 9ffd44aeeaa..e4ebf7d6d57 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
6.0.0
rc
- 1
+ 2
6.0.0-rc.1.21417.1
6.0.0-rc.1.21417.1
From 01565086c678a6f5807f8a533f1fa7c8eba3fe8b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Aug 2021 17:29:11 +0000
Subject: [PATCH 010/223] Update dependencies from
https://github.com/dotnet/winforms build 20210818.1 (#5106)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.1 to 6.0.0-rc.2.21417.16 (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.2.21417.16 (parent: Microsoft.Private.Winforms)
- Merge branch 'release/6.0' into darc-release/6.0-4a1938a6-3959-419f-ab65-c1700b62b23e
---
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 3fa011aef19..891e8ed694e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 871fda6a779a7ff12049914c4df3b6271a71d62e
+ 55ac4dd054482c13a45bac2983d7049e30dba18e
-
+
https://github.com/dotnet/winforms
- 871fda6a779a7ff12049914c4df3b6271a71d62e
+ 55ac4dd054482c13a45bac2983d7049e30dba18e
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
e7299b0204e213eed914072ce6c8714be3cbcee3
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://github.com/dotnet/runtime
- 14b34eb02bc8969b77c0d3a1e39fb38f450625cf
+ 5a5d7f0518b564e7f840c6c939bb6618c778b21b
diff --git a/eng/Versions.props b/eng/Versions.props
index e4ebf7d6d57..e6e44ceb6d1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.1.21417.1
- 6.0.0-rc.1.21417.1
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.12
+ 6.0.0-rc.2.21418.1
5.0.0-alpha1.19562.1
- 6.0.0-rc.1.21417.1
- 6.0.0-rc.1.21417.1
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
- 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.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
- 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.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
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.2.21417.16
+ 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21417.16
From dc020cceb4eefa2542533e38ceeee16e055417b1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Aug 2021 10:38:02 -0700
Subject: [PATCH 011/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210818.6
(#5108)
Microsoft.DotNet.Wpf.DncEng
From Version 7.0.0-alpha.1.21418.2 -> To Version 6.0.0-rc.2.21418.6
Co-authored-by: dotnet-maestro[bot]
---
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 891e8ed694e..319d8e76588 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- e7299b0204e213eed914072ce6c8714be3cbcee3
+ ae89dd52d768a5419941430aeb2fa0594e89e97d
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index e6e44ceb6d1..f1fc6dd54e9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 7.0.0-alpha.1.21418.2
+ 6.0.0-rc.2.21418.6
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 012/223] 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 013/223] 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 417d26b3067c97a224edef2e84f8be522be230e1 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:18:10 +0000
Subject: [PATCH 014/223] Update dependencies from
https://github.com/dotnet/arcade build 20210818.12 (#5120)
[release/6.0] 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 319d8e76588..829c916f5e6 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 f1fc6dd54e9..511d7765a8e 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 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 015/223] 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 016/223] 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 aa45875d7868696c7d4453ebfc3ee6301827dccd 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:17:58 +0000
Subject: [PATCH 017/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210819.4
(#5123)
[release/6.0] 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 829c916f5e6..c49acac5b0d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
5a5d7f0518b564e7f840c6c939bb6618c778b21b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- ae89dd52d768a5419941430aeb2fa0594e89e97d
+ 33e5e96f9f0138f39235a3d283b51e71b215a767
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 511d7765a8e..87027b2344e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rc.2.21418.6
+ 6.0.0-rc.2.21419.4
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 018/223] 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 019/223] 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 020/223] 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 021/223] 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 b90153bf624cb725bf4f8aa9f579e57f3c8d90be 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:23:27 +0000
Subject: [PATCH 022/223] Update dependencies from
https://github.com/dotnet/winforms build 20210823.3 (#5146)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21417.16 to 6.0.0-rc.2.21423.2 (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 c49acac5b0d..a2e3b690cf7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 55ac4dd054482c13a45bac2983d7049e30dba18e
+ 10ffde0dcb4222b46a996de38c8c92bc3bdd0a5a
-
+
https://github.com/dotnet/winforms
- 55ac4dd054482c13a45bac2983d7049e30dba18e
+ 10ffde0dcb4222b46a996de38c8c92bc3bdd0a5a
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
-
+
https://github.com/dotnet/runtime
- 5a5d7f0518b564e7f840c6c939bb6618c778b21b
+ c451224d7590556a720949d290164bd14aaa5f2f
diff --git a/eng/Versions.props b/eng/Versions.props
index 87027b2344e..163a5af3283 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21418.1
+ 6.0.0-rc.2.21423.3
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
- 6.0.0-rc.2.21417.16
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.2
From 5960b8ad88707bce35eadf3d0286132267ac3d0b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 19:52:54 +0000
Subject: [PATCH 023/223] Update dependencies from
https://github.com/dotnet/winforms build 20210823.7 (#5148)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.2 to 6.0.0-rc.2.21423.6 (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 a2e3b690cf7..454bb2d2344 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 10ffde0dcb4222b46a996de38c8c92bc3bdd0a5a
+ 0c2192400601872cbeee3f0b54a709b410bf68f1
-
+
https://github.com/dotnet/winforms
- 10ffde0dcb4222b46a996de38c8c92bc3bdd0a5a
+ 0c2192400601872cbeee3f0b54a709b410bf68f1
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
-
+
https://github.com/dotnet/runtime
- c451224d7590556a720949d290164bd14aaa5f2f
+ 8ddb6335236416562dca5e00eddc812d1d0f3340
diff --git a/eng/Versions.props b/eng/Versions.props
index 163a5af3283..0890bd66487 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.3
+ 6.0.0-rc.2.21423.7
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
- 6.0.0-rc.2.21423.2
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.6
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 024/223] 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 42acda294b8b8673a8b42a3d992767877a0c5b42 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 03:18:46 +0000
Subject: [PATCH 025/223] Update dependencies from
https://github.com/dotnet/winforms build 20210823.14 (#5152)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21423.14 (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 454bb2d2344..3e5d2660789 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 0c2192400601872cbeee3f0b54a709b410bf68f1
+ d91cb6313c66c0895d6a8cf56824ab39a842d02a
-
+
https://github.com/dotnet/winforms
- 0c2192400601872cbeee3f0b54a709b410bf68f1
+ d91cb6313c66c0895d6a8cf56824ab39a842d02a
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
-
+
https://github.com/dotnet/runtime
- 8ddb6335236416562dca5e00eddc812d1d0f3340
+ b7df9ff170c2276899456460cf494e2c3ba41940
diff --git a/eng/Versions.props b/eng/Versions.props
index 0890bd66487..652182ccbce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.7
+ 6.0.0-rc.2.21423.14
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
- 6.0.0-rc.2.21423.6
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.14
From d8a49c0e58a9dcfb76153f20d383e853d9252783 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 10:28:59 +0000
Subject: [PATCH 026/223] Update dependencies from
https://github.com/dotnet/winforms build 20210824.1 (#5153)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.14 to 6.0.0-rc.2.21423.19 (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 3e5d2660789..71b0636081b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- d91cb6313c66c0895d6a8cf56824ab39a842d02a
+ e39a0398ad99eab7d870cf22b3d8b8dc75383856
-
+
https://github.com/dotnet/winforms
- d91cb6313c66c0895d6a8cf56824ab39a842d02a
+ e39a0398ad99eab7d870cf22b3d8b8dc75383856
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
-
+
https://github.com/dotnet/runtime
- b7df9ff170c2276899456460cf494e2c3ba41940
+ 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
diff --git a/eng/Versions.props b/eng/Versions.props
index 652182ccbce..4d814ca08b5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21424.1
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
- 6.0.0-rc.2.21423.14
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21423.19
From d6302100a5ca3d6bb2f8b5e66b55c5adada5feb5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 16:06:54 +0000
Subject: [PATCH 027/223] Update dependencies from
https://github.com/dotnet/winforms build 20210824.4 (#5155)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.7 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.19 to 6.0.0-rc.2.21424.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 71b0636081b..181d22da8e4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e39a0398ad99eab7d870cf22b3d8b8dc75383856
+ cea72d07874f2ed64766946529055e35adbbe57a
-
+
https://github.com/dotnet/winforms
- e39a0398ad99eab7d870cf22b3d8b8dc75383856
+ cea72d07874f2ed64766946529055e35adbbe57a
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
-
+
https://github.com/dotnet/runtime
- 4b2107f40ddbc735bbb2c71fafecfe8656e2a3d5
+ bce9f6c2e724f087c7b6c835820f0e216e48adec
diff --git a/eng/Versions.props b/eng/Versions.props
index 4d814ca08b5..9c7db621b30 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.1
+ 6.0.0-rc.2.21424.4
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
- 6.0.0-rc.2.21423.19
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.7
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 028/223] 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 029/223] 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 030/223] 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 142416c9262aabecdd0ae2107f69c3c2307a3dd7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 03:36:12 +0000
Subject: [PATCH 031/223] Update dependencies from
https://github.com/dotnet/winforms build 20210824.17 (#5161)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21424.7 to 6.0.0-rc.2.21424.25 (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 181d22da8e4..a82889d47f7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- cea72d07874f2ed64766946529055e35adbbe57a
+ 3dbf9722c8ced420e63bf0717a9044deb73677aa
-
+
https://github.com/dotnet/winforms
- cea72d07874f2ed64766946529055e35adbbe57a
+ 3dbf9722c8ced420e63bf0717a9044deb73677aa
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
33e5e96f9f0138f39235a3d283b51e71b215a767
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://github.com/dotnet/runtime
- bce9f6c2e724f087c7b6c835820f0e216e48adec
+ ae5737eccef97eea01211599a5ef87cf89c99842
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c7db621b30..270b8fd8ec9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.4
+ 6.0.0-rc.2.21424.17
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
- 6.0.0-rc.2.21424.7
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21424.25
From 671ffdbfdc56d6865ce43123cb143551ea9afc21 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 18:41:45 +0000
Subject: [PATCH 032/223] Update dependencies from
https://github.com/dotnet/arcade build 20210825.1 (#5165)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/build.sh | 5 ++++-
eng/common/init-tools-native.sh | 2 +-
eng/common/native/common-library.sh | 8 ++++++--
eng/common/sdk-task.ps1 | 4 +++-
eng/common/tools.ps1 | 6 +++---
eng/common/tools.sh | 2 +-
global.json | 4 ++--
9 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a82889d47f7..a6afdafb01a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
-
+
https://github.com/dotnet/arcade
- ac8b7514ca8bcac1d071a16b7a92cb52f7058871
+ 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
diff --git a/eng/Versions.props b/eng/Versions.props
index 270b8fd8ec9..2876e7b66a4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,9 +39,9 @@
- 6.0.0-beta.21418.12
- 6.0.0-beta.21418.12
- 6.0.0-beta.21418.12
+ 6.0.0-beta.21425.1
+ 6.0.0-beta.21425.1
+ 6.0.0-beta.21425.1
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 9d3042a943e..bc07a1c6848 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,7 +187,10 @@ function InitializeCustomToolset {
}
function Build {
- TryLogClientIpAddress
+
+ if [[ "$ci" == true ]]; then
+ TryLogClientIpAddress
+ fi
InitializeToolset
InitializeCustomToolset
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index 5bd205b5da3..3e6a8d6acf2 100755
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -10,7 +10,7 @@ force=false
download_retries=5
retry_wait_time_seconds=30
global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
-declare -A native_assets
+declare -a native_assets
. $scriptroot/pipeline-logging-functions.sh
. $scriptroot/native/common-library.sh
diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh
index bf272dcf55a..080c2c283ae 100755
--- a/eng/common/native/common-library.sh
+++ b/eng/common/native/common-library.sh
@@ -148,8 +148,12 @@ function NewScriptShim {
fi
if [[ ! -f $tool_file_path ]]; then
- Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
- return 1
+ # try to see if the path is lower cased
+ tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")"
+ if [[ ! -f $tool_file_path ]]; then
+ Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
+ return 1
+ fi
fi
local shim_contents=$'#!/usr/bin/env bash\n'
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 7ffa3591e9c..7ab9baac5c8 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -83,7 +83,9 @@ try {
}
if ($restore) {
- Try-LogClientIpAddress
+ if ($ci) {
+ Try-LogClientIpAddress
+ }
Build 'Restore'
}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index e607aa43697..56ee4a577ac 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -154,9 +154,6 @@ 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
@@ -166,6 +163,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+ # In case of network error, try to log the current IP for reference
+ Try-LogClientIpAddress
}
# Source Build uses DotNetCoreSdkDir variable
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 3c5f3a12c0a..41e323104df 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -402,7 +402,7 @@ function StopProcesses {
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: '
+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi
}
diff --git a/global.json b/global.json
index 923c3c62fb3..577a64d066b 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21418.12"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21425.1"
},
"sdk": {
"version": "6.0.100-rc.1.21416.15"
From 9a76c3139ab7eae8529f5228f80b08ac023b4886 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:52:48 +0000
Subject: [PATCH 033/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210825.2
(#5167)
[release/6.0] 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 a6afdafb01a..32f1d971c14 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
ae5737eccef97eea01211599a5ef87cf89c99842
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- 33e5e96f9f0138f39235a3d283b51e71b215a767
+ a163d8a9b683056c3334d13f0513bbb2c371f3e9
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 2876e7b66a4..4ab688ecd46 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rc.2.21419.4
+ 6.0.0-rc.2.21425.2
From 364214f63c633f165de0faba92089e248191ef53 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:55:13 +0000
Subject: [PATCH 034/223] Update dependencies from
https://github.com/dotnet/winforms build 20210825.5 (#5168)
[release/6.0] 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 32f1d971c14..6b91ec8fd6d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 3dbf9722c8ced420e63bf0717a9044deb73677aa
+ bbc4c3c4cc4132f860b8c305808741f0fd127da1
-
+
https://github.com/dotnet/winforms
- 3dbf9722c8ced420e63bf0717a9044deb73677aa
+ bbc4c3c4cc4132f860b8c305808741f0fd127da1
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 4ab688ecd46..943a4a33caf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21424.17
+ 6.0.0-rc.2.21425.5
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 035/223] 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 548ab9ede247291a5fbc701b27e80e98ef789e51 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 20:32:32 +0000
Subject: [PATCH 036/223] Update dependencies from
https://github.com/dotnet/winforms build 20210825.10 (#5171)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21424.25 to 6.0.0-rc.2.21425.6 (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 6b91ec8fd6d..586fb9b2b65 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- bbc4c3c4cc4132f860b8c305808741f0fd127da1
+ b3a1fa2b9da670716d0986abacaeeaac9540d18c
-
+
https://github.com/dotnet/winforms
- bbc4c3c4cc4132f860b8c305808741f0fd127da1
+ b3a1fa2b9da670716d0986abacaeeaac9540d18c
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
-
+
https://github.com/dotnet/runtime
- ae5737eccef97eea01211599a5ef87cf89c99842
+ ba336a27669420d291df7f69aa2a11eba73147b7
diff --git a/eng/Versions.props b/eng/Versions.props
index 943a4a33caf..5f2263ead09 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.5
+ 6.0.0-rc.2.21425.10
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
- 6.0.0-rc.2.21424.25
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21425.6
From 6955ffa926646ad5c2bdec7e54e5bf21945cf579 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 20:53:11 +0000
Subject: [PATCH 037/223] Update dependencies from
https://github.com/dotnet/winforms build 20210825.11 (#5173)
[release/6.0] 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 586fb9b2b65..23129a23252 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- b3a1fa2b9da670716d0986abacaeeaac9540d18c
+ 9279791165e81dfac6625632b40fb773e3929c52
-
+
https://github.com/dotnet/winforms
- b3a1fa2b9da670716d0986abacaeeaac9540d18c
+ 9279791165e81dfac6625632b40fb773e3929c52
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5f2263ead09..ecb929e479b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21425.10
+ 6.0.0-rc.2.21425.11
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 038/223] 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 039/223] 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 040/223] 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 291e6be31470d9a2769bb08bfc9d4913112280d2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 26 Aug 2021 17:42:54 +0000
Subject: [PATCH 041/223] Update dependencies from
https://github.com/dotnet/winforms build 20210826.2 (#5192)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21425.6 to 6.0.0-rc.2.21426.5 (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 23129a23252..4224bfdceec 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 9279791165e81dfac6625632b40fb773e3929c52
+ 3cec3aecd1632d7f272df11b24c79d613c77f8d2
-
+
https://github.com/dotnet/winforms
- 9279791165e81dfac6625632b40fb773e3929c52
+ 3cec3aecd1632d7f272df11b24c79d613c77f8d2
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
-
+
https://github.com/dotnet/runtime
- ba336a27669420d291df7f69aa2a11eba73147b7
+ 155a334005294dbac979851a97783476a8b15517
diff --git a/eng/Versions.props b/eng/Versions.props
index ecb929e479b..fab065d5cb0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21425.11
+ 6.0.0-rc.2.21426.2
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
- 6.0.0-rc.2.21425.6
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21426.5
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 042/223] 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 717c48b5a333f46d22c48b0a6387c14f3201ba78 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 11:57:21 +0000
Subject: [PATCH 043/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.1 (#5195)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21426.5 to 6.0.0-rc.2.21427.2 (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 4224bfdceec..7c66603736c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 3cec3aecd1632d7f272df11b24c79d613c77f8d2
+ 6c405f44186b9f7d7cbbc6a7be85134b8ad3c96c
-
+
https://github.com/dotnet/winforms
- 3cec3aecd1632d7f272df11b24c79d613c77f8d2
+ 6c405f44186b9f7d7cbbc6a7be85134b8ad3c96c
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
-
+
https://github.com/dotnet/runtime
- 155a334005294dbac979851a97783476a8b15517
+ 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
diff --git a/eng/Versions.props b/eng/Versions.props
index fab065d5cb0..f54897f8fe8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21426.2
+ 6.0.0-rc.2.21427.1
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
- 6.0.0-rc.2.21426.5
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.2
From 548ee43f252a13e9bdcd50ee86041cd2a02d77b2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 14:13:54 +0000
Subject: [PATCH 044/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.5 (#5199)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21427.2 to 6.0.0-rc.2.21427.5 (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 7c66603736c..97efee62841 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 6c405f44186b9f7d7cbbc6a7be85134b8ad3c96c
+ 35aa82e682df9d61bb11645e0234157184adbb56
-
+
https://github.com/dotnet/winforms
- 6c405f44186b9f7d7cbbc6a7be85134b8ad3c96c
+ 35aa82e682df9d61bb11645e0234157184adbb56
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
-
+
https://github.com/dotnet/runtime
- 8148c0ca5afb91ef6f0aaa02f3195173779d8d68
+ efe56d6f973b1b42425de0e36d691e0e8a4446cd
diff --git a/eng/Versions.props b/eng/Versions.props
index f54897f8fe8..58a37392342 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.1
+ 6.0.0-rc.2.21427.5
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
- 6.0.0-rc.2.21427.2
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.5
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 045/223] 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 c3440bf45ce506a3487faa26c7d38c3f857ac75b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 17:22:59 +0000
Subject: [PATCH 046/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.8 (#5201)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21427.5 to 6.0.0-rc.2.21427.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 97efee62841..b405cef4a1f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 35aa82e682df9d61bb11645e0234157184adbb56
+ 5803395199a6f54569b11f220727dc8bae00eb93
-
+
https://github.com/dotnet/winforms
- 35aa82e682df9d61bb11645e0234157184adbb56
+ 5803395199a6f54569b11f220727dc8bae00eb93
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
-
+
https://github.com/dotnet/runtime
- efe56d6f973b1b42425de0e36d691e0e8a4446cd
+ 824368bb974f36c02bde63bc90710c0c11ee1437
diff --git a/eng/Versions.props b/eng/Versions.props
index 58a37392342..89ad8492f30 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.8
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
- 6.0.0-rc.2.21427.5
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.9
From 3bbd902a73e3ea0ebbad2d81492230311fb0edc8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:31:29 +0000
Subject: [PATCH 047/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.11 (#5203)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21427.9 to 6.0.0-rc.2.21427.12 (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 b405cef4a1f..b0b56d5a7c8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 5803395199a6f54569b11f220727dc8bae00eb93
+ d441fbb3e98f0d98138dab88fe813467c471b558
-
+
https://github.com/dotnet/winforms
- 5803395199a6f54569b11f220727dc8bae00eb93
+ d441fbb3e98f0d98138dab88fe813467c471b558
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
-
+
https://github.com/dotnet/runtime
- 824368bb974f36c02bde63bc90710c0c11ee1437
+ 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
diff --git a/eng/Versions.props b/eng/Versions.props
index 89ad8492f30..5bd5e196383 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.8
+ 6.0.0-rc.2.21427.11
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
- 6.0.0-rc.2.21427.9
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.12
From 6da54b149128f18711c8549772e30ac43e30c309 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 20:18:53 +0000
Subject: [PATCH 048/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.12 (#5204)
[release/6.0] 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 b0b56d5a7c8..4bc867c2c28 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- d441fbb3e98f0d98138dab88fe813467c471b558
+ aef27e544e82fc19d95bbd376c0280ae0c28583a
-
+
https://github.com/dotnet/winforms
- d441fbb3e98f0d98138dab88fe813467c471b558
+ aef27e544e82fc19d95bbd376c0280ae0c28583a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5bd5e196383..ee13a089ec5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21427.11
+ 6.0.0-rc.2.21427.12
From da3a33cd26bb54f91856b3a53f5f7217ee605d12 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 23:40:34 +0000
Subject: [PATCH 049/223] Update dependencies from
https://github.com/dotnet/winforms build 20210827.19 (#5207)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21427.12 to 6.0.0-rc.2.21427.20 (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 4bc867c2c28..6870bea05e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- aef27e544e82fc19d95bbd376c0280ae0c28583a
+ 89b01d70cac007bad66531f6bd7a50e643b3099e
-
+
https://github.com/dotnet/winforms
- aef27e544e82fc19d95bbd376c0280ae0c28583a
+ 89b01d70cac007bad66531f6bd7a50e643b3099e
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
-
+
https://github.com/dotnet/runtime
- 4cf2af26d05a72138e2c0e9f5306c1b86f4da467
+ 30a3aa244041ebf074ace0052f323e7c4eb48219
diff --git a/eng/Versions.props b/eng/Versions.props
index ee13a089ec5..d0b0aa63714 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.19
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
- 6.0.0-rc.2.21427.12
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21427.20
From 9b3b6f87932cfa540741cafc456f2a3e2d607b2d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 28 Aug 2021 11:31:03 +0000
Subject: [PATCH 050/223] Update dependencies from
https://github.com/dotnet/winforms build 20210828.1 (#5209)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.1 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21427.20 to 6.0.0-rc.2.21428.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 6870bea05e5..26848c6a375 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 89b01d70cac007bad66531f6bd7a50e643b3099e
+ 124f89bc0cde3657f6bf358dcde6e61118b5e052
-
+
https://github.com/dotnet/winforms
- 89b01d70cac007bad66531f6bd7a50e643b3099e
+ 124f89bc0cde3657f6bf358dcde6e61118b5e052
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
a163d8a9b683056c3334d13f0513bbb2c371f3e9
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://github.com/dotnet/runtime
- 30a3aa244041ebf074ace0052f323e7c4eb48219
+ fedf1bf8db1197925fd04a8534c6dae006fe7114
diff --git a/eng/Versions.props b/eng/Versions.props
index d0b0aa63714..46aa85c21c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21427.19
+ 6.0.0-rc.2.21428.1
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
- 6.0.0-rc.2.21427.20
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21428.1
From b089fc7c3d8c27e60b3baf8cc86a34a960e89237 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 28 Aug 2021 16:35:22 +0000
Subject: [PATCH 051/223] Update dependencies from
https://github.com/dotnet/arcade build 20210827.6 (#5213)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 +++++++++----------
eng/Versions.props | 6 +++---
.../post-build/sourcelink-validation.ps1 | 8 ++++++--
eng/common/templates/job/job.yml | 2 +-
global.json | 4 ++--
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 26848c6a375..52bdd1d4d1e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
+ 474307e526160c813c9fd58060eb8356ccca6099
-
+
https://github.com/dotnet/arcade
- 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
+ 474307e526160c813c9fd58060eb8356ccca6099
-
+
https://github.com/dotnet/arcade
- 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
+ 474307e526160c813c9fd58060eb8356ccca6099
-
+
https://github.com/dotnet/arcade
- 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
+ 474307e526160c813c9fd58060eb8356ccca6099
-
+
https://github.com/dotnet/arcade
- 65c6d2fae35c9e7166b3d50aa7061115ebe26cdb
+ 474307e526160c813c9fd58060eb8356ccca6099
diff --git a/eng/Versions.props b/eng/Versions.props
index 46aa85c21c7..c8f5cd6eba6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,9 +39,9 @@
- 6.0.0-beta.21425.1
- 6.0.0-beta.21425.1
- 6.0.0-beta.21425.1
+ 6.0.0-beta.21427.6
+ 6.0.0-beta.21427.6
+ 6.0.0-beta.21427.6
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 3b6fc953337..e8ab29afeb3 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -107,8 +107,12 @@ $ValidatePackage = {
try {
$Uri = $Link -as [System.URI]
- # Only GitHub links are valid
- if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+ if ($Link -match "submodules") {
+ # Skip submodule links until sourcelink properly handles submodules
+ $Status = 200
+ }
+ elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+ # Only GitHub links are valid
$Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
}
else {
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 86696793480..37dceb1bab0 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -103,7 +103,7 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- - task: MicroBuildSigningPlugin@2
+ - task: MicroBuildSigningPlugin@3
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
diff --git a/global.json b/global.json
index 577a64d066b..03422258c0e 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21425.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6"
},
"sdk": {
"version": "6.0.100-rc.1.21416.15"
From b8f129d36d16cdecf63b60af3bf30fd0c238bf86 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 28 Aug 2021 17:42:19 +0000
Subject: [PATCH 052/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210828.2
(#5214)
[release/6.0] 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 52bdd1d4d1e..3dda488ce86 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
fedf1bf8db1197925fd04a8534c6dae006fe7114
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- a163d8a9b683056c3334d13f0513bbb2c371f3e9
+ 39b3aeccd1bea6b158e239db301ab23e365740d3
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c8f5cd6eba6..80746b28f51 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,6 +80,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rc.2.21425.2
+ 6.0.0-rc.2.21428.2
From b1d958a35a69ea3e9eb6ca7f78b1c1d83ae4610e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 04:37:22 +0000
Subject: [PATCH 053/223] Update dependencies from
https://github.com/dotnet/winforms build 20210829.2 (#5219)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21428.1 to 6.0.0-rc.2.21429.5 (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 3dda488ce86..df989bba5dc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 124f89bc0cde3657f6bf358dcde6e61118b5e052
+ 3ed8de0997151299e968ba3b326bab3f89aa745b
-
+
https://github.com/dotnet/winforms
- 124f89bc0cde3657f6bf358dcde6e61118b5e052
+ 3ed8de0997151299e968ba3b326bab3f89aa745b
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
-
+
https://github.com/dotnet/runtime
- fedf1bf8db1197925fd04a8534c6dae006fe7114
+ 6493e838ed517d06a14a9130990020c35c7bbd54
diff --git a/eng/Versions.props b/eng/Versions.props
index 80746b28f51..296b2ce3a38 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.2
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
- 6.0.0-rc.2.21428.1
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.5
From d400eaef1e11de2a5f288647367464962236078d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 10:40:45 +0000
Subject: [PATCH 054/223] Update dependencies from
https://github.com/dotnet/winforms build 20210830.3 (#5220)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21429.5 to 6.0.0-rc.2.21429.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 df989bba5dc..c7ad9e864af 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 3ed8de0997151299e968ba3b326bab3f89aa745b
+ e552031ba0be471a2aa254ad99228e7400f8aaf1
-
+
https://github.com/dotnet/winforms
- 3ed8de0997151299e968ba3b326bab3f89aa745b
+ e552031ba0be471a2aa254ad99228e7400f8aaf1
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
-
+
https://github.com/dotnet/runtime
- 6493e838ed517d06a14a9130990020c35c7bbd54
+ f4e10ed452a25b0e31eaa7b3235d797d80953870
diff --git a/eng/Versions.props b/eng/Versions.props
index 296b2ce3a38..727cf467d0e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.2
+ 6.0.0-rc.2.21430.3
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
- 6.0.0-rc.2.21429.5
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21429.8
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 055/223] [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 056/223] 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 1dc7216102edb876af4793d41d15aac81d2c9b44 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 20:55:01 +0000
Subject: [PATCH 057/223] Update dependencies from
https://github.com/dotnet/winforms build 20210901.12 (#5235)
[release/6.0-rc1] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21430.11 to 6.0.0-rc.1.21451.13 (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 9d537f34cfa..0b04d5415f4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- bab479fa2de8644d36533ef8c35022ff4d6e0c13
+ 938972a23963d20b19298f05e53c6fd27ac2e57f
-
+
https://github.com/dotnet/winforms
- bab479fa2de8644d36533ef8c35022ff4d6e0c13
+ 938972a23963d20b19298f05e53c6fd27ac2e57f
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
4bc1c55c0abcb0ff62bdb534168a51be2224fe3f
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
-
+
https://github.com/dotnet/runtime
- 0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549
+ d7619cd4b165c13430484e381042f055d4c5a9c7
diff --git a/eng/Versions.props b/eng/Versions.props
index 0d4a298d132..994d17f703f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
1
- 6.0.0-rc.1.21430.11
- 6.0.0-rc.1.21430.11
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
- 6.0.0-rc.1.21430.13
+ 6.0.0-rc.1.21451.12
5.0.0-alpha1.19562.1
- 6.0.0-rc.1.21430.11
- 6.0.0-rc.1.21430.11
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
- 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.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
- 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.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
4.6.0-preview4.19176.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.21451.13
+ 6.0.0-rc.1.21451.13
+ 6.0.0-rc.1.21451.13
From d62caf8a5fb9bc507457b6925cbf621720e268c7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 21:21:30 +0000
Subject: [PATCH 058/223] Update dependencies from
https://github.com/dotnet/winforms build 20210901.15 (#5236)
[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 0b04d5415f4..6b08f71675d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 938972a23963d20b19298f05e53c6fd27ac2e57f
+ 546b5c1f0451e855121c02f8d9f8b12788e6c8f8
-
+
https://github.com/dotnet/winforms
- 938972a23963d20b19298f05e53c6fd27ac2e57f
+ 546b5c1f0451e855121c02f8d9f8b12788e6c8f8
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 994d17f703f..7cbce72c2c8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.1.21451.12
+ 6.0.0-rc.1.21451.15
From a5b84642be1225949ed93a10bd08e93101fe2ec8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 3 Sep 2021 21:08:42 +0000
Subject: [PATCH 059/223] [release/6.0] Update dependencies from
dotnet/winforms (#5223)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21429.8 to 6.0.0-rc.2.21453.6 (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.
- Respond to PR feedback from https://github.com/dotnet/wpf/pull/5208 (#5225)
---
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..4d75fdd84cc 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 c7ad9e864af..39d7c7a7257 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e552031ba0be471a2aa254ad99228e7400f8aaf1
+ 246972d9ee5f11cf9878723f36fe648503cbef5e
-
+
https://github.com/dotnet/winforms
- e552031ba0be471a2aa254ad99228e7400f8aaf1
+ 246972d9ee5f11cf9878723f36fe648503cbef5e
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
-
+
https://github.com/dotnet/runtime
- f4e10ed452a25b0e31eaa7b3235d797d80953870
+ 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
diff --git a/eng/Versions.props b/eng/Versions.props
index 727cf467d0e..f4f74e2e6f1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21430.3
+ 6.0.0-rc.2.21453.13
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
- 6.0.0-rc.2.21429.8
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.6
From 654cf5c9565076f0de929d72514519fe9c53cc5d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 3 Sep 2021 21:26:24 +0000
Subject: [PATCH 060/223] Update dependencies from
https://github.com/dotnet/winforms build 20210903.15 (#5243)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21453.6 to 6.0.0-rc.2.21453.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 39d7c7a7257..260010d9239 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 246972d9ee5f11cf9878723f36fe648503cbef5e
+ 4a9967aaa69cf5163c3912c567e26277d6089aa1
-
+
https://github.com/dotnet/winforms
- 246972d9ee5f11cf9878723f36fe648503cbef5e
+ 4a9967aaa69cf5163c3912c567e26277d6089aa1
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
-
+
https://github.com/dotnet/runtime
- 693e2f3479e4a17f5f8d91b7c6dc4e11baba5de1
+ da89cc752bbedfdbc9d42f2f4b1098f388892709
diff --git a/eng/Versions.props b/eng/Versions.props
index f4f74e2e6f1..79e3b0249ec 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.15
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
- 6.0.0-rc.2.21453.6
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.9
From dba1de9c30227d004b50e9719887301a610f4188 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 3 Sep 2021 23:08:49 +0000
Subject: [PATCH 061/223] Update dependencies from
https://github.com/dotnet/winforms build 20210903.17 (#5244)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21453.9 to 6.0.0-rc.2.21453.13 (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 260010d9239..e0f71b51f60 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 4a9967aaa69cf5163c3912c567e26277d6089aa1
+ 0d3cdf0dd9b844fe80592b1d64d6e2256af60d73
-
+
https://github.com/dotnet/winforms
- 4a9967aaa69cf5163c3912c567e26277d6089aa1
+ 0d3cdf0dd9b844fe80592b1d64d6e2256af60d73
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
-
+
https://github.com/dotnet/runtime
- da89cc752bbedfdbc9d42f2f4b1098f388892709
+ ea48ccc279461d29698b91697cafe46398e87178
diff --git a/eng/Versions.props b/eng/Versions.props
index 79e3b0249ec..de493489f5b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.15
+ 6.0.0-rc.2.21453.17
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
- 6.0.0-rc.2.21453.9
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21453.13
From ed3d2df04c83ab66733508afaf50ccfaee71c9d5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 01:40:10 +0000
Subject: [PATCH 062/223] Update dependencies from
https://github.com/dotnet/winforms build 20210905.3 (#5248)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.1 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21453.13 to 6.0.0-rc.2.21454.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 e0f71b51f60..5826cc8cbb7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 0d3cdf0dd9b844fe80592b1d64d6e2256af60d73
+ 1ef360a3ba3a1f57c9f05f2f2c0bf281c9904e72
-
+
https://github.com/dotnet/winforms
- 0d3cdf0dd9b844fe80592b1d64d6e2256af60d73
+ 1ef360a3ba3a1f57c9f05f2f2c0bf281c9904e72
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
-
+
https://github.com/dotnet/runtime
- ea48ccc279461d29698b91697cafe46398e87178
+ b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
diff --git a/eng/Versions.props b/eng/Versions.props
index de493489f5b..c0610157d38 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21453.17
+ 6.0.0-rc.2.21455.3
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
- 6.0.0-rc.2.21453.13
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21454.1
From bac0c76aea572505a3bc71ebf4c955b35723af17 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 7 Sep 2021 13:14:40 +0000
Subject: [PATCH 063/223] Update dependencies from
https://github.com/dotnet/winforms build 20210907.2 (#5252)
[release/6.0] 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 5826cc8cbb7..7527b570670 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 1ef360a3ba3a1f57c9f05f2f2c0bf281c9904e72
+ 89ecf20a8f4131d7fe0c2a852e726f0746d3451e
-
+
https://github.com/dotnet/winforms
- 1ef360a3ba3a1f57c9f05f2f2c0bf281c9904e72
+ 89ecf20a8f4131d7fe0c2a852e726f0746d3451e
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c0610157d38..bcb34b68898 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21455.3
+ 6.0.0-rc.2.21457.2
From badb771fcfe196be8ed1d1ffe11360da0e65e708 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 00:16:07 +0000
Subject: [PATCH 064/223] [release/6.0] Update dependencies from
dotnet/winforms (#5261)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21454.1 to 6.0.0-rc.2.21457.14 (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 7527b570670..5cf5f453057 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 89ecf20a8f4131d7fe0c2a852e726f0746d3451e
+ cd663f7c371a66c413e4d5c067c21d679aef4f3e
-
+
https://github.com/dotnet/winforms
- 89ecf20a8f4131d7fe0c2a852e726f0746d3451e
+ cd663f7c371a66c413e4d5c067c21d679aef4f3e
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
-
+
https://github.com/dotnet/runtime
- b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b
+ 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
diff --git a/eng/Versions.props b/eng/Versions.props
index bcb34b68898..9f681488706 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.2
+ 6.0.0-rc.2.21457.12
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
- 6.0.0-rc.2.21454.1
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.14
From 06fcbec5364bccbe1d59b1a00e1cd77564bdb714 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 02:53:16 +0000
Subject: [PATCH 065/223] Update dependencies from
https://github.com/dotnet/winforms build 20210907.14 (#5265)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21457.14 to 6.0.0-rc.2.21457.19 (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 5cf5f453057..eb621ab0281 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- cd663f7c371a66c413e4d5c067c21d679aef4f3e
+ c72649aeae1fda85561943737ee44eadfdf18949
-
+
https://github.com/dotnet/winforms
- cd663f7c371a66c413e4d5c067c21d679aef4f3e
+ c72649aeae1fda85561943737ee44eadfdf18949
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
-
+
https://github.com/dotnet/runtime
- 3b6f9c6f4ec621cf2e7e5c5ddf80f20187b30fb4
+ 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
diff --git a/eng/Versions.props b/eng/Versions.props
index 9f681488706..ceb0ea6c198 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.12
+ 6.0.0-rc.2.21457.14
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21457.19
From 9b470805b9020537d3e4b1c95a393d1b1e9d1d2a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 17:55:49 +0000
Subject: [PATCH 066/223] Update dependencies from
https://github.com/dotnet/winforms build 20210908.1 (#5267)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21457.19 to 6.0.0-rc.2.21458.5 (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 eb621ab0281..3adbfa01ca2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- c72649aeae1fda85561943737ee44eadfdf18949
+ b1b0efa9d82b0c73958cd390e6209b8c518ea466
-
+
https://github.com/dotnet/winforms
- c72649aeae1fda85561943737ee44eadfdf18949
+ b1b0efa9d82b0c73958cd390e6209b8c518ea466
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
-
+
https://github.com/dotnet/runtime
- 6eca241bcc6b60d9815e2566bb661a14c2eeccfb
+ a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
diff --git a/eng/Versions.props b/eng/Versions.props
index ceb0ea6c198..32a9f774ae0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21457.14
+ 6.0.0-rc.2.21458.1
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
- 6.0.0-rc.2.21457.19
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.5
From 18a4ca166c7a87571989baa73e7b2faf8bb75cee Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 22:49:20 +0000
Subject: [PATCH 067/223] Update dependencies from
https://github.com/dotnet/winforms build 20210908.3 (#5270)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.10 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21458.5 to 6.0.0-rc.2.21458.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 3adbfa01ca2..17086fe6fda 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- b1b0efa9d82b0c73958cd390e6209b8c518ea466
+ 3a47014d9620cca8f85fd46ded1041f887b46c9b
-
+
https://github.com/dotnet/winforms
- b1b0efa9d82b0c73958cd390e6209b8c518ea466
+ 3a47014d9620cca8f85fd46ded1041f887b46c9b
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
-
+
https://github.com/dotnet/runtime
- a77b3910e11cd1000f9efb0e1f3e4ea5cca85266
+ f037ca5bc40148550dbd9af6b2749bd5ab494a56
diff --git a/eng/Versions.props b/eng/Versions.props
index 32a9f774ae0..b1c53dc2250 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.1
+ 6.0.0-rc.2.21458.3
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
- 6.0.0-rc.2.21458.5
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.10
From 805ab76085245f695d05ce8d961aab5730a56ea0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 00:59:29 +0000
Subject: [PATCH 068/223] Update dependencies from
https://github.com/dotnet/winforms build 20210908.12 (#5275)
[release/6.0] 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 17086fe6fda..8df6b09d192 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 3a47014d9620cca8f85fd46ded1041f887b46c9b
+ 332d0b41215e7828d68f8a89b46dc6219b6d8aeb
-
+
https://github.com/dotnet/winforms
- 3a47014d9620cca8f85fd46ded1041f887b46c9b
+ 332d0b41215e7828d68f8a89b46dc6219b6d8aeb
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index b1c53dc2250..9d9269444fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21458.3
+ 6.0.0-rc.2.21458.12
From 83f90374135e6effba21d4dcea877759c58b6622 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 01:14:57 +0000
Subject: [PATCH 069/223] Update dependencies from
https://github.com/dotnet/winforms build 20210908.13 (#5276)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21458.10 to 6.0.0-rc.2.21458.16 (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 8df6b09d192..0feaf6bdd31 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 332d0b41215e7828d68f8a89b46dc6219b6d8aeb
+ 3f19038bc695ad3be3a7650176cf85bb09f6f8aa
-
+
https://github.com/dotnet/winforms
- 332d0b41215e7828d68f8a89b46dc6219b6d8aeb
+ 3f19038bc695ad3be3a7650176cf85bb09f6f8aa
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
-
+
https://github.com/dotnet/runtime
- f037ca5bc40148550dbd9af6b2749bd5ab494a56
+ 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d9269444fa..b998fc50c62 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.12
+ 6.0.0-rc.2.21458.13
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
- 6.0.0-rc.2.21458.10
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21458.16
From e8b2be03a21b239fa6cd8107cbe9510e1fb48496 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 18:33:20 +0000
Subject: [PATCH 070/223] Update dependencies from
https://github.com/dotnet/winforms build 20210909.4 (#5280)
[release/6.0] 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 0feaf6bdd31..b5277297350 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 3f19038bc695ad3be3a7650176cf85bb09f6f8aa
+ 9161ba35d6f56e0e7224620811f2afe5d0e64255
-
+
https://github.com/dotnet/winforms
- 3f19038bc695ad3be3a7650176cf85bb09f6f8aa
+ 9161ba35d6f56e0e7224620811f2afe5d0e64255
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index b998fc50c62..04fc7b666a8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21458.13
+ 6.0.0-rc.2.21459.4
From e2a50f0820a3fe5820590d692f8cb2a1429b0a81 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 19:12:39 +0000
Subject: [PATCH 071/223] Update dependencies from
https://github.com/dotnet/winforms build 20210909.6 (#5281)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21458.16 to 6.0.0-rc.2.21459.6 (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 b5277297350..078d75b26ad 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 9161ba35d6f56e0e7224620811f2afe5d0e64255
+ 57cd6ce941e695906d561716786e66c0ed22373c
-
+
https://github.com/dotnet/winforms
- 9161ba35d6f56e0e7224620811f2afe5d0e64255
+ 57cd6ce941e695906d561716786e66c0ed22373c
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
-
+
https://github.com/dotnet/runtime
- 4cf387b5af7dfba77c4a6f9b8e30bad46fc735fc
+ 06b23ba6edae9c1eeef4df5e84b33433617c22d1
diff --git a/eng/Versions.props b/eng/Versions.props
index 04fc7b666a8..27bdd3cbca9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.4
+ 6.0.0-rc.2.21459.6
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
- 6.0.0-rc.2.21458.16
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.6
From 0e9cf5b6c744fc5b02db738dfc66a43fb3f79b77 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 21:20:52 +0000
Subject: [PATCH 072/223] Update dependencies from
https://github.com/dotnet/winforms build 20210909.9 (#5283)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.10 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.6 to 6.0.0-rc.2.21459.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 078d75b26ad..974dd9ffcf2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 57cd6ce941e695906d561716786e66c0ed22373c
+ cd98a8c4d79bef1cb02de7890cd3f7d020ac713c
-
+
https://github.com/dotnet/winforms
- 57cd6ce941e695906d561716786e66c0ed22373c
+ cd98a8c4d79bef1cb02de7890cd3f7d020ac713c
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
-
+
https://github.com/dotnet/runtime
- 06b23ba6edae9c1eeef4df5e84b33433617c22d1
+ 0933d9a1d3c09fdae125831bd165f983825f77c9
diff --git a/eng/Versions.props b/eng/Versions.props
index 27bdd3cbca9..143c59f973d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.9
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
- 6.0.0-rc.2.21459.6
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.10
From 30dd8ba04cbfec6f0949a9c3ca60268163ab47f7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 23:44:13 +0000
Subject: [PATCH 073/223] Update dependencies from
https://github.com/dotnet/winforms build 20210909.10 (#5284)
[release/6.0] 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 974dd9ffcf2..9025005b283 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- cd98a8c4d79bef1cb02de7890cd3f7d020ac713c
+ a12fe0b98b002d8bd63de15bddaee4b449445ae7
-
+
https://github.com/dotnet/winforms
- cd98a8c4d79bef1cb02de7890cd3f7d020ac713c
+ a12fe0b98b002d8bd63de15bddaee4b449445ae7
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 143c59f973d..20fa9cc7d16 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21459.9
+ 6.0.0-rc.2.21459.10
From 0336b71d5a9c2036e0edbbbe5831453e4d242701 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 00:04:44 +0000
Subject: [PATCH 074/223] Update dependencies from
https://github.com/dotnet/winforms build 20210909.12 (#5285)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.10 to 6.0.0-rc.2.21459.18 (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 9025005b283..c48330571cf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- a12fe0b98b002d8bd63de15bddaee4b449445ae7
+ 08b8359d86475f6c5caf2e13b66fb9706e225acf
-
+
https://github.com/dotnet/winforms
- a12fe0b98b002d8bd63de15bddaee4b449445ae7
+ 08b8359d86475f6c5caf2e13b66fb9706e225acf
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
-
+
https://github.com/dotnet/runtime
- 0933d9a1d3c09fdae125831bd165f983825f77c9
+ 614c782790eceb2f4247e6e380db548a58b55a69
diff --git a/eng/Versions.props b/eng/Versions.props
index 20fa9cc7d16..87fadafe6b4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.12
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
- 6.0.0-rc.2.21459.10
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21459.18
From 5b76e9ba6cc9656372bb93868792c89e71f48b9f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 18:41:38 +0000
Subject: [PATCH 075/223] Update dependencies from
https://github.com/dotnet/winforms build 20210910.4 (#5291)
[release/6.0] 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 c48330571cf..616762e0b2e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 08b8359d86475f6c5caf2e13b66fb9706e225acf
+ a4d34be51fbaf679b59daa9b3fe3938ae68681dd
-
+
https://github.com/dotnet/winforms
- 08b8359d86475f6c5caf2e13b66fb9706e225acf
+ a4d34be51fbaf679b59daa9b3fe3938ae68681dd
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 87fadafe6b4..76a0b80a42c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21459.12
+ 6.0.0-rc.2.21460.4
From a59f7e05c1e1d0fcdb08c97413dded92fea3104c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 19:43:33 +0000
Subject: [PATCH 076/223] Update dependencies from
https://github.com/dotnet/winforms build 20210910.8 (#5292)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.18 to 6.0.0-rc.2.21460.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 616762e0b2e..d4b6f83bc27 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- a4d34be51fbaf679b59daa9b3fe3938ae68681dd
+ e005510ae66d213d4b81013ea40a2f3123f830b8
-
+
https://github.com/dotnet/winforms
- a4d34be51fbaf679b59daa9b3fe3938ae68681dd
+ e005510ae66d213d4b81013ea40a2f3123f830b8
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
-
+
https://github.com/dotnet/runtime
- 614c782790eceb2f4247e6e380db548a58b55a69
+ 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
diff --git a/eng/Versions.props b/eng/Versions.props
index 76a0b80a42c..b8bfe85973e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.4
+ 6.0.0-rc.2.21460.8
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
- 6.0.0-rc.2.21459.18
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.8
From 1f4ef7d003b35462d4b0a56e474c40e28ffa0657 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 11 Sep 2021 00:46:03 +0000
Subject: [PATCH 077/223] Update dependencies from
https://github.com/dotnet/winforms build 20210910.10 (#5293)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21460.14 (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 d4b6f83bc27..902fa1a9d0a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e005510ae66d213d4b81013ea40a2f3123f830b8
+ e927bb52744f7cc035bfccd86fdb5e383407fdc0
-
+
https://github.com/dotnet/winforms
- e005510ae66d213d4b81013ea40a2f3123f830b8
+ e927bb52744f7cc035bfccd86fdb5e383407fdc0
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
-
+
https://github.com/dotnet/runtime
- 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee
+ 46c7023a3de4d6df7f9b001ce46f22f482168dfa
diff --git a/eng/Versions.props b/eng/Versions.props
index b8bfe85973e..877ca55bf03 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.10
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
- 6.0.0-rc.2.21460.8
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21460.14
From 61634fd9e064574c69a05cbab63e8df3c522f1bd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 11 Sep 2021 13:36:58 +0000
Subject: [PATCH 078/223] Update dependencies from
https://github.com/dotnet/winforms build 20210911.3 (#5295)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.1 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.14 to 6.0.0-rc.2.21461.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 902fa1a9d0a..0735bbb34d4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e927bb52744f7cc035bfccd86fdb5e383407fdc0
+ fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f
-
+
https://github.com/dotnet/winforms
- e927bb52744f7cc035bfccd86fdb5e383407fdc0
+ fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
-
+
https://github.com/dotnet/runtime
- 46c7023a3de4d6df7f9b001ce46f22f482168dfa
+ 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
diff --git a/eng/Versions.props b/eng/Versions.props
index 877ca55bf03..f8bebe1acc2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21460.10
+ 6.0.0-rc.2.21461.3
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
- 6.0.0-rc.2.21460.14
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21461.1
From 5b57012f8842e7ebc673a3b9e992f0648fb9ac31 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:05:28 +0000
Subject: [PATCH 079/223] Update dependencies from
https://github.com/dotnet/winforms build 20210913.1 (#5302)
[release/6.0] 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 0735bbb34d4..afb80f61428 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f
+ e6669a3cdead8e524526eaacb41854e115bda911
-
+
https://github.com/dotnet/winforms
- fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f
+ e6669a3cdead8e524526eaacb41854e115bda911
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index f8bebe1acc2..5026a9673c9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21461.3
+ 6.0.0-rc.2.21463.1
From b5203a004166ff46dad9cbea716f93d4a4dfe0cd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 18:31:44 +0000
Subject: [PATCH 080/223] Update dependencies from
https://github.com/dotnet/winforms build 20210913.4 (#5304)
[release/6.0] 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 afb80f61428..40df10f1841 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- e6669a3cdead8e524526eaacb41854e115bda911
+ 53c27e75d17e4ca4289d5041340b60f36313c285
-
+
https://github.com/dotnet/winforms
- e6669a3cdead8e524526eaacb41854e115bda911
+ 53c27e75d17e4ca4289d5041340b60f36313c285
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5026a9673c9..8125b1c060d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21463.1
+ 6.0.0-rc.2.21463.4
From 057bdc41f1ceff02772a37c23f385cf582bf40f6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 23:36:50 +0000
Subject: [PATCH 081/223] Update dependencies from
https://github.com/dotnet/winforms build 20210913.10 (#5306)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rc.2.21463.13 (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 40df10f1841..a602a5da7ad 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 53c27e75d17e4ca4289d5041340b60f36313c285
+ 32f35be5bb83506f8463bc0c7a1e1060305c6f78
-
+
https://github.com/dotnet/winforms
- 53c27e75d17e4ca4289d5041340b60f36313c285
+ 32f35be5bb83506f8463bc0c7a1e1060305c6f78
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
-
+
https://github.com/dotnet/runtime
- 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c
+ 74d62c268a9fbdfcf5d2c6b2446d639095483b86
diff --git a/eng/Versions.props b/eng/Versions.props
index 8125b1c060d..7e9d88207ec 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.4
+ 6.0.0-rc.2.21463.10
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
- 6.0.0-rc.2.21461.1
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.13
From 8f40d1484811e56140e1dfecff1feb6529c4da84 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 00:46:36 +0000
Subject: [PATCH 082/223] Update dependencies from
https://github.com/dotnet/winforms build 20210913.14 (#5308)
[release/6.0] 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 a602a5da7ad..659b8c7b488 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 32f35be5bb83506f8463bc0c7a1e1060305c6f78
+ 49646b88c0dd15864fc91b9d2e1ec5f2a74dbcd7
-
+
https://github.com/dotnet/winforms
- 32f35be5bb83506f8463bc0c7a1e1060305c6f78
+ 49646b88c0dd15864fc91b9d2e1ec5f2a74dbcd7
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7e9d88207ec..19dbe3479f7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21463.10
+ 6.0.0-rc.2.21463.14
From f7768ec667914a80d45b3db9b616a7851bf108a1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 04:41:13 +0000
Subject: [PATCH 083/223] Update dependencies from
https://github.com/dotnet/winforms build 20210913.17 (#5311)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21463.13 to 6.0.0-rc.2.21463.19 (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 659b8c7b488..dfc8ce8458f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 49646b88c0dd15864fc91b9d2e1ec5f2a74dbcd7
+ cc5550d041204db00113524167c77b155aa8548e
-
+
https://github.com/dotnet/winforms
- 49646b88c0dd15864fc91b9d2e1ec5f2a74dbcd7
+ cc5550d041204db00113524167c77b155aa8548e
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
-
+
https://github.com/dotnet/runtime
- 74d62c268a9fbdfcf5d2c6b2446d639095483b86
+ 9e5a932d51537930cba10bb9edf0185276f5669a
diff --git a/eng/Versions.props b/eng/Versions.props
index 19dbe3479f7..85abe7798b8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.14
+ 6.0.0-rc.2.21463.17
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
- 6.0.0-rc.2.21463.13
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.19
From d70c2d20c7c9657e963c5684def9166cda091546 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Tue, 14 Sep 2021 09:02:08 -0700
Subject: [PATCH 084/223] Localized file check-in by OneLocBuild Task: Build
definition ID 217: Build ID 1331085 (#5229) (#5282)
* Localized file check-in by OneLocBuild Task
Co-authored-by: dotnet bot
---
.../localize/templatestrings.cs.json | 28 ++++++++---------
.../localize/templatestrings.de.json | 28 ++++++++---------
.../localize/templatestrings.es.json | 28 ++++++++---------
.../localize/templatestrings.fr.json | 28 ++++++++---------
.../localize/templatestrings.it.json | 28 ++++++++---------
.../localize/templatestrings.ja.json | 28 ++++++++---------
.../localize/templatestrings.ko.json | 28 ++++++++---------
.../localize/templatestrings.pl.json | 28 ++++++++---------
.../localize/templatestrings.pt-BR.json | 28 ++++++++---------
.../localize/templatestrings.ru.json | 30 +++++++++----------
.../localize/templatestrings.tr.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hans.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hant.json | 28 ++++++++---------
.../localize/templatestrings.cs.json | 26 ++++++++--------
.../localize/templatestrings.de.json | 26 ++++++++--------
.../localize/templatestrings.es.json | 26 ++++++++--------
.../localize/templatestrings.fr.json | 26 ++++++++--------
.../localize/templatestrings.it.json | 26 ++++++++--------
.../localize/templatestrings.ja.json | 26 ++++++++--------
.../localize/templatestrings.ko.json | 26 ++++++++--------
.../localize/templatestrings.pl.json | 26 ++++++++--------
.../localize/templatestrings.pt-BR.json | 26 ++++++++--------
.../localize/templatestrings.ru.json | 28 ++++++++---------
.../localize/templatestrings.tr.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hans.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hant.json | 26 ++++++++--------
.../localize/templatestrings.cs.json | 28 ++++++++---------
.../localize/templatestrings.de.json | 28 ++++++++---------
.../localize/templatestrings.es.json | 28 ++++++++---------
.../localize/templatestrings.fr.json | 28 ++++++++---------
.../localize/templatestrings.it.json | 28 ++++++++---------
.../localize/templatestrings.ja.json | 28 ++++++++---------
.../localize/templatestrings.ko.json | 28 ++++++++---------
.../localize/templatestrings.pl.json | 28 ++++++++---------
.../localize/templatestrings.pt-BR.json | 28 ++++++++---------
.../localize/templatestrings.ru.json | 30 +++++++++----------
.../localize/templatestrings.tr.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hans.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hant.json | 28 ++++++++---------
.../localize/templatestrings.cs.json | 26 ++++++++--------
.../localize/templatestrings.de.json | 26 ++++++++--------
.../localize/templatestrings.es.json | 26 ++++++++--------
.../localize/templatestrings.fr.json | 26 ++++++++--------
.../localize/templatestrings.it.json | 26 ++++++++--------
.../localize/templatestrings.ja.json | 26 ++++++++--------
.../localize/templatestrings.ko.json | 26 ++++++++--------
.../localize/templatestrings.pl.json | 26 ++++++++--------
.../localize/templatestrings.pt-BR.json | 26 ++++++++--------
.../localize/templatestrings.ru.json | 28 ++++++++---------
.../localize/templatestrings.tr.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hans.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hant.json | 26 ++++++++--------
.../localize/templatestrings.cs.json | 28 ++++++++---------
.../localize/templatestrings.de.json | 28 ++++++++---------
.../localize/templatestrings.es.json | 28 ++++++++---------
.../localize/templatestrings.fr.json | 28 ++++++++---------
.../localize/templatestrings.it.json | 28 ++++++++---------
.../localize/templatestrings.ja.json | 28 ++++++++---------
.../localize/templatestrings.ko.json | 28 ++++++++---------
.../localize/templatestrings.pl.json | 28 ++++++++---------
.../localize/templatestrings.pt-BR.json | 28 ++++++++---------
.../localize/templatestrings.ru.json | 30 +++++++++----------
.../localize/templatestrings.tr.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hans.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hant.json | 28 ++++++++---------
.../localize/templatestrings.cs.json | 26 ++++++++--------
.../localize/templatestrings.de.json | 26 ++++++++--------
.../localize/templatestrings.es.json | 26 ++++++++--------
.../localize/templatestrings.fr.json | 26 ++++++++--------
.../localize/templatestrings.it.json | 26 ++++++++--------
.../localize/templatestrings.ja.json | 26 ++++++++--------
.../localize/templatestrings.ko.json | 26 ++++++++--------
.../localize/templatestrings.pl.json | 26 ++++++++--------
.../localize/templatestrings.pt-BR.json | 26 ++++++++--------
.../localize/templatestrings.ru.json | 28 ++++++++---------
.../localize/templatestrings.tr.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hans.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hant.json | 26 ++++++++--------
.../localize/templatestrings.cs.json | 28 ++++++++---------
.../localize/templatestrings.de.json | 28 ++++++++---------
.../localize/templatestrings.es.json | 28 ++++++++---------
.../localize/templatestrings.fr.json | 28 ++++++++---------
.../localize/templatestrings.it.json | 28 ++++++++---------
.../localize/templatestrings.ja.json | 28 ++++++++---------
.../localize/templatestrings.ko.json | 28 ++++++++---------
.../localize/templatestrings.pl.json | 28 ++++++++---------
.../localize/templatestrings.pt-BR.json | 28 ++++++++---------
.../localize/templatestrings.ru.json | 30 +++++++++----------
.../localize/templatestrings.tr.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hans.json | 28 ++++++++---------
.../localize/templatestrings.zh-Hant.json | 28 ++++++++---------
.../localize/templatestrings.cs.json | 26 ++++++++--------
.../localize/templatestrings.de.json | 26 ++++++++--------
.../localize/templatestrings.es.json | 26 ++++++++--------
.../localize/templatestrings.fr.json | 26 ++++++++--------
.../localize/templatestrings.it.json | 26 ++++++++--------
.../localize/templatestrings.ja.json | 26 ++++++++--------
.../localize/templatestrings.ko.json | 26 ++++++++--------
.../localize/templatestrings.pl.json | 26 ++++++++--------
.../localize/templatestrings.pt-BR.json | 26 ++++++++--------
.../localize/templatestrings.ru.json | 28 ++++++++---------
.../localize/templatestrings.tr.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hans.json | 26 ++++++++--------
.../localize/templatestrings.zh-Hant.json | 26 ++++++++--------
104 files changed, 1412 insertions(+), 1412 deletions(-)
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.cs.json
index edc6b1ef5e6..d44b9cfdf03 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplikace WPF",
+ "description": "Projekt pro vytvoření aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "symbols/Nullable/description": "Určuje, zda se mají pro tento projekt povolit odkazové typy s možnou hodnotou null.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře MainWindow.xaml v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.de.json
index edc6b1ef5e6..38aec73cc15 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF-Anwendung",
+ "description": "Ein Projekt zum Erstellen einer .NET WPF-Anwendung",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "symbols/Nullable/description": "Gibt an, ob Nullable-Verweistypen für dieses Projekt aktiviert werden sollen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet MainWindow.xaml im Editor."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.es.json
index edc6b1ef5e6..62b6d49de58 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplicación WPF",
+ "description": "Proyecto para crear una aplicación WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "symbols/Nullable/description": "Indica si se deben habilitar tipos de referencia que aceptan valores NULL para este proyecto.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre MainWindow.xaml en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.fr.json
index edc6b1ef5e6..9b42056f16a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Application WPF",
+ "description": "Projet de création d'une application WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "symbols/Nullable/description": "Indique s’il faut activer les types référence Nullable pour ce projet.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre MainWindow. xaml dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.it.json
index edc6b1ef5e6..a66613263fc 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Applicazione WPF",
+ "description": "Progetto per la creazione di un'applicazione WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "symbols/Nullable/description": "Indica se abilitare i tipi di riferimento che ammettono i valori Null per questo progetto.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre MainWindow. XAML nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ja.json
index edc6b1ef5e6..af6976c0212 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF アプリケーション",
+ "description": ".NET WPF アプリケーションを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで MainWindow.xaml を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ko.json
index edc6b1ef5e6..d2ef430f4f8 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 애플리케이션",
+ "description": ".NET WPF 애플리케이션 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 MainWindow.xaml을 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pl.json
index edc6b1ef5e6..d65f14667d1 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplikacja WPF",
+ "description": "Projekt służący do tworzenia aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "symbols/Nullable/description": "Określa, czy w przypadku tego projektu mają być włączane typy pustych referencji.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik MainWindow.xaml w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pt-BR.json
index edc6b1ef5e6..4f35820f5ad 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplicativo WPF",
+ "description": "Um projeto para a criação de um aplicativo .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "symbols/Nullable/description": "Se permitir tipos de referência anuláveis para este projeto.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abrir o MainWindow.xaml no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ru.json
index edc6b1ef5e6..394f4610fd7 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,17 +1,17 @@
{
- "author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "author": "Майкрософт",
+ "name": "Приложение WPF",
+ "description": "Проект для создания приложения WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открывает MainWindow.xaml в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.tr.json
index edc6b1ef5e6..3cc1fc6f14d 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF Uygulaması",
+ "description": ".NET WPF Uygulaması oluşturmaya yönelik proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "symbols/Nullable/description": "Bu proje için null atanabilir başvuru türlerinin etkinleştirilip etkinleştirilmeyeceğini belirtir.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide MainWindow.xaml açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index edc6b1ef5e6..a37572a5da8 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 应用程序",
+ "description": "用于创建 .NET WPF 应用程序的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 MainWindow.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index edc6b1ef5e6..58abaee40d4 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 應用程式",
+ "description": "此專案可用於建立 .NET WPF 應用程式",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 MainWindow.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.cs.json
index df226778df3..50fb33b11d3 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.cs.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplikace WPF",
+ "description": "Projekt pro vytvoření aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře MainWindow.xaml v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.de.json
index df226778df3..11e4dc10174 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.de.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF-Anwendung",
+ "description": "Ein Projekt zum Erstellen einer .NET WPF-Anwendung",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet MainWindow.xaml im Editor."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.es.json
index df226778df3..ea278617570 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.es.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplicación WPF",
+ "description": "Proyecto para crear una aplicación WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre MainWindow.xaml en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.fr.json
index df226778df3..bc789624e9e 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.fr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Application WPF",
+ "description": "Projet de création d'une application WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre MainWindow. xaml dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.it.json
index df226778df3..dd239432a28 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.it.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Applicazione WPF",
+ "description": "Progetto per la creazione di un'applicazione WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre MainWindow. XAML nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ja.json
index df226778df3..af688c0ec8a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ja.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF アプリケーション",
+ "description": ".NET WPF アプリケーションを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで MainWindow.xaml を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ko.json
index df226778df3..34a71612f8f 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ko.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 애플리케이션",
+ "description": ".NET WPF 애플리케이션 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 MainWindow.xaml을 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pl.json
index df226778df3..35ac204b5e1 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pl.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplikacja WPF",
+ "description": "Projekt służący do tworzenia aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik MainWindow.xaml w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
index df226778df3..3b5c261b3c1 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "Aplicativo WPF",
+ "description": "Um projeto para a criação de um aplicativo .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abrir o MainWindow.xaml no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ru.json
index df226778df3..96bc53bf7f9 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.ru.json
@@ -1,16 +1,16 @@
{
- "author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "author": "Майкрософт",
+ "name": "Приложение WPF",
+ "description": "Проект для создания приложения WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открывает MainWindow.xaml в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.tr.json
index df226778df3..55ed8e20469 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.tr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF Uygulaması",
+ "description": ".NET WPF Uygulaması oluşturmaya yönelik proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide MainWindow.xaml açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
index df226778df3..cc9152c5b1d 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 应用程序",
+ "description": "用于创建 .NET WPF 应用程序的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 MainWindow.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
index df226778df3..a27039c8b2d 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Application",
- "description": "A project for creating a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens MainWindow.xaml in the editor"
+ "name": "WPF 應用程式",
+ "description": "此專案可用於建立 .NET WPF 應用程式",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 MainWindow.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
index 6e96122a84d..d30bb96bc07 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Knihovna tříd WPF",
+ "description": "Projekt pro vytvoření knihovny tříd určené pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "symbols/Nullable/description": "Určuje, zda se mají pro tento projekt povolit odkazové typy s možnou hodnotou null.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře Class1.cs v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
index 6e96122a84d..f9eaa6dcee3 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF-Klassenbibliothek",
+ "description": "Ein Projekt zum Erstellen einer Klassenbibliothek für eine .NET WPF-Anwendung",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "symbols/Nullable/description": "Gibt an, ob Nullable-Verweistypen für dieses Projekt aktiviert werden sollen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet „Class1.cs“ im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
index 6e96122a84d..950d14e1f13 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Biblioteca de clases de WPF",
+ "description": "Proyecto para crear una biblioteca de clases destinada a una aplicación WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "symbols/Nullable/description": "Indica si se deben habilitar tipos de referencia que aceptan valores NULL para este proyecto.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre Class1.cs en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
index 6e96122a84d..c18c096b828 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Bibliothèque de classes WPF",
+ "description": "Projet de création d'une bibliothèque de classes qui cible une application WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "symbols/Nullable/description": "Indique s’il faut activer les types référence Nullable pour ce projet.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre Class1.cs dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
index 6e96122a84d..2500baff10a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Libreria di classi WPF",
+ "description": "Progetto per la creazione di una libreria di classi destinata a un'applicazione WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "symbols/Nullable/description": "Indica se abilitare i tipi di riferimento che ammettono i valori Null per questo progetto.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre Class1.cs nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
index 6e96122a84d..de2c6a82f51 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF クラス ライブラリ",
+ "description": ".NET WPF アプリケーションを対象とするクラス ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで Class1.cs を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
index 6e96122a84d..7f7f98d6ee0 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF 클래스 라이브러리",
+ "description": ".NET Core WPF 애플리케이션을 대상으로 하는 클래스 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 Class1.cs를 엽니다"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
index 6e96122a84d..35345e07e61 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Biblioteka klas WPF",
+ "description": "Projekt służący do tworzenia biblioteki klas przeznaczonej dla aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "symbols/Nullable/description": "Określa, czy w przypadku tego projektu mają być włączane typy pustych referencji.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik Class1.cs w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 6e96122a84d..2b2bad9cae6 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "Biblioteca de Classes WPF",
+ "description": "Um projeto para a criação de uma biblioteca de classes voltada para um aplicativo .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "symbols/Nullable/description": "Se permitir tipos de referência anuláveis para este projeto.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abrir Class1.cs no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
index 6e96122a84d..0669f0a5c84 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,17 +1,17 @@
{
- "author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека классов WPF",
+ "description": "Проект для создания библиотеки классов, использующей приложение WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открывает файл Class1.cs в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
index 6e96122a84d..3d7c6de2de0 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF Sınıf Kitaplığı",
+ "description": "Bir .NET WPF Uygulamasını hedefleyen bir sınıf kitaplığı oluşturmaya yönelik bir proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "symbols/Nullable/description": "Bu proje için null atanabilir başvuru türlerinin etkinleştirilip etkinleştirilmeyeceğini belirtir.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide Class1.cs dosyasını açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 6e96122a84d..57eafeebdeb 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF 类库",
+ "description": "用于创建目标为 .NET WPF 应用程序的类库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 Class1.cs"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 6e96122a84d..125e7506603 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.cs in the editor"
+ "name": "WPF 類別庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的類別庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 Class1.cs"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
index 1b9f8c23258..f88f69a24c6 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Knihovna tříd WPF",
+ "description": "Projekt pro vytvoření knihovny tříd určené pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře Class1.vb v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
index 1b9f8c23258..a4c2ba3ba8a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF-Klassenbibliothek",
+ "description": "Ein Projekt zum Erstellen einer Klassenbibliothek für eine .NET WPF-Anwendung",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet „Class1.vb“ im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
index 1b9f8c23258..5a2ad9fdf18 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Biblioteca de clases de WPF",
+ "description": "Proyecto para crear una biblioteca de clases destinada a una aplicación WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre Class1.vb en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
index 1b9f8c23258..75c81f80985 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Bibliothèque de classes WPF",
+ "description": "Projet de création d'une bibliothèque de classes qui cible une application WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre Class1.vb dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
index 1b9f8c23258..da1d78e63e5 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Libreria di classi WPF",
+ "description": "Progetto per la creazione di una libreria di classi destinata a un'applicazione WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre Class1.vb nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
index 1b9f8c23258..aaf8f5358b3 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF クラス ライブラリ",
+ "description": ".NET WPF アプリケーションを対象とするクラス ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで Class1.vb を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
index 1b9f8c23258..15d33a9312d 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF 클래스 라이브러리",
+ "description": ".NET Core WPF 애플리케이션을 대상으로 하는 클래스 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 Class1.vb를 엽니다"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
index 1b9f8c23258..b12e946c1db 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Biblioteka klas WPF",
+ "description": "Projekt służący do tworzenia biblioteki klas przeznaczonej dla aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik Class1.vb w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
index 1b9f8c23258..828d193d0d2 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "Biblioteca de Classes WPF",
+ "description": "Um projeto para a criação de uma biblioteca de classes voltada para um aplicativo .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abre Class1.vb no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
index 1b9f8c23258..0439bfd3966 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
@@ -1,16 +1,16 @@
{
- "author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека классов WPF",
+ "description": "Проект для создания библиотеки классов, использующей приложение WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открывает файл Class1.vb в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
index 1b9f8c23258..625539c951c 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF Sınıf Kitaplığı",
+ "description": "Bir .NET WPF Uygulamasını hedefleyen bir sınıf kitaplığı oluşturmaya yönelik bir proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide Class1.vb dosyasını açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
index 1b9f8c23258..b4fe71ff3df 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF 类库",
+ "description": "用于创建目标为 .NET WPF 应用程序的类库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 Class1.vb"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
index 1b9f8c23258..81c0f684fbf 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Class Library",
- "description": "A project for creating a class library that targets a .NET WPF Application",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens Class1.vb in the editor"
+ "name": "WPF 類別庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的類別庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 Class1.vb"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
index b8332cd8780..08a278f911b 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Knihovna vlastních ovládacích prvků WPF",
+ "description": "Projekt pro vytvoření knihovny vlastních ovládacích prvků pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "symbols/Nullable/description": "Určuje, zda se mají pro tento projekt povolit odkazové typy s možnou hodnotou null.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře CustomControl1.cs v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
index b8332cd8780..f4312053230 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Bibliothek benutzerdefinierter WPF-Steuerelemente",
+ "description": "Ein Projekt zum Erstellen einer Bibliothek benutzerdefinierter Steuerelemente für .NET WPF-Anwendungen",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "symbols/Nullable/description": "Gibt an, ob Nullable-Verweistypen für dieses Projekt aktiviert werden sollen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet \"CustomControl1.cs\" im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
index b8332cd8780..7629030af9d 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Biblioteca de control personalizada de WPF",
+ "description": "Proyecto para crear una biblioteca de control personalizada para aplicaciones WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "symbols/Nullable/description": "Indica si se deben habilitar tipos de referencia que aceptan valores NULL para este proyecto.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre CustomControl1.cs en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
index b8332cd8780..56811e3cdaa 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Bibliothèque de contrôles personnalisés WPF",
+ "description": "Projet de création d'une bibliothèque de contrôles personnalisés pour les applications WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "symbols/Nullable/description": "Indique s’il faut activer les types référence Nullable pour ce projet.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre CustomControl1.cs dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
index b8332cd8780..cf0e30afab2 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Libreria di controlli personalizzati WPF",
+ "description": "Progetto per la creazione di una libreria di controlli personalizzati per applicazioni WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "symbols/Nullable/description": "Indica se abilitare i tipi di riferimento che ammettono i valori Null per questo progetto.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre CustomControl1.cs nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
index b8332cd8780..25389c31f4c 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "WPF カスタム コントロール ライブラリ",
+ "description": ".NET WPF アプリケーション用のカスタム コントロール ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで CustomControl1.cs を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
index b8332cd8780..9cd2220e375 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "WPF 사용자 지정 컨트롤 라이브러리",
+ "description": ".NET Core WPF 애플리케이션용 사용자 지정 컨트롤 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 CustomControl1.cs를 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
index b8332cd8780..d611338b945 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Biblioteka niestandardowych kontrolek WPF",
+ "description": "Projekt służący do tworzenia niestandardowej biblioteki kontrolek na potrzeby aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "symbols/Nullable/description": "Określa, czy w przypadku tego projektu mają być włączane typy pustych referencji.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik CustomControl1.cs w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
index b8332cd8780..2660bf79efd 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "Biblioteca de Controles Personalizados do WPF",
+ "description": "Um projeto para a criação de uma biblioteca de controles personalizada para aplicativos .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "symbols/Nullable/description": "Se permitir tipos de referência anuláveis para este projeto.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abre o CustomControl1.cs no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
index b8332cd8780..c52b3fef14a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,17 +1,17 @@
{
- "author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека настраиваемых элементов управления WPF",
+ "description": "Проект для создания библиотеки настраиваемых элементов управления для приложений WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открытие CustomControl1.cs в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
index b8332cd8780..20c748c007b 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "WPF Özel Denetim Kitaplığı",
+ "description": ".NET WPF Uygulamaları için özel bir denetim kitaplığı oluşturmaya yönelik bir proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "symbols/Nullable/description": "Bu proje için null atanabilir başvuru türlerinin etkinleştirilip etkinleştirilmeyeceğini belirtir.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide CustomControl1.cs'i açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index b8332cd8780..cd693d6f4c2 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "WPF 自定义控件库",
+ "description": "用于为 .NET WPF 应用程序创建自定义控件库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 CustomControl1.cs"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index b8332cd8780..37fd60107d4 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.cs in the editor"
+ "name": "WPF 自訂控制項程式庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的自訂控制項程式庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 CustomControl1.cs"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
index 0b6a31ab3ba..d46d6029b7c 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Knihovna vlastních ovládacích prvků WPF",
+ "description": "Projekt pro vytvoření knihovny vlastních ovládacích prvků pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře CustomControl1.vb v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
index 0b6a31ab3ba..691d9ac77cf 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Bibliothek benutzerdefinierter WPF-Steuerelemente",
+ "description": "Ein Projekt zum Erstellen einer Bibliothek benutzerdefinierter Steuerelemente für .NET WPF-Anwendungen",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet \"CustomControl1.vb\" im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
index 0b6a31ab3ba..a2a6194fc90 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Biblioteca de control personalizada de WPF",
+ "description": "Proyecto para crear una biblioteca de control personalizada para aplicaciones WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre CustomControl1.vb en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
index 0b6a31ab3ba..bdbba6d5056 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Bibliothèque de contrôles personnalisés WPF",
+ "description": "Projet de création d'une bibliothèque de contrôles personnalisés pour les applications WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre CustomControl1.vb dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
index 0b6a31ab3ba..142cd92c815 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Libreria di controlli personalizzati WPF",
+ "description": "Progetto per la creazione di una libreria di controlli personalizzati per applicazioni WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre CustomControl1.vb nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
index 0b6a31ab3ba..73877e0df83 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "WPF カスタム コントロール ライブラリ",
+ "description": ".NET WPF アプリケーション用のカスタム コントロール ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで CustomControl1.vb を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
index 0b6a31ab3ba..4e5d048b9cc 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "WPF 사용자 지정 컨트롤 라이브러리",
+ "description": ".NET Core WPF 애플리케이션용 사용자 지정 컨트롤 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 CustomControl1.vb를 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
index 0b6a31ab3ba..954b9addd15 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Biblioteka niestandardowych kontrolek WPF",
+ "description": "Projekt służący do tworzenia niestandardowej biblioteki kontrolek na potrzeby aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik CustomControl1.vb w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
index 0b6a31ab3ba..79ce7a47508 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "Biblioteca de Controles Personalizados do WPF",
+ "description": "Um projeto para a criação de uma biblioteca de controles personalizada para aplicativos .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abre o CustomControl1.vb no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
index 0b6a31ab3ba..6e203177328 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
@@ -1,16 +1,16 @@
{
- "author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека настраиваемых элементов управления WPF",
+ "description": "Проект для создания библиотеки настраиваемых элементов управления для приложений WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открытие CustomControl1.vb в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
index 0b6a31ab3ba..229d37f45d3 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "WPF Özel Denetim Kitaplığı",
+ "description": ".NET WPF Uygulamaları için özel bir denetim kitaplığı oluşturmaya yönelik bir proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide CustomControl1.vb’si açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
index 0b6a31ab3ba..5af786354a5 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "WPF 自定义控件库",
+ "description": "用于为 .NET WPF 应用程序创建自定义控件库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 CustomControl1.vb"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
index 0b6a31ab3ba..c17df0cdbcf 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF Custom Control Library",
- "description": "A project for creating a custom control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens CustomControl1.vb in the editor"
+ "name": "WPF 自訂控制項程式庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的自訂控制項程式庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 CustomControl1.vb"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
index c14f0cc232d..bf52be35de3 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Knihovna uživatelských ovládacích prvků WPF",
+ "description": "Projekt pro vytvoření knihovny uživatelských ovládacích prvků pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "symbols/Nullable/description": "Určuje, zda se mají pro tento projekt povolit odkazové typy s možnou hodnotou null.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře UserControl1.xaml v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
index c14f0cc232d..3ae510a71a4 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Bibliothek von WPF-Benutzersteuerelementen",
+ "description": "Ein Projekt zum Erstellen einer Bibliothek von Benutzersteuerelementen für .NET WPF-Anwendungen",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "symbols/Nullable/description": "Gibt an, ob Nullable-Verweistypen für dieses Projekt aktiviert werden sollen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet UserControl1.xmal im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
index c14f0cc232d..291a01df97c 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteca de controles de usuario de WPF",
+ "description": "Proyecto para crear una biblioteca de controles de usuario para aplicaciones WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "symbols/Nullable/description": "Indica si se deben habilitar tipos de referencia que aceptan valores NULL para este proyecto.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre UserControl1.xaml en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
index c14f0cc232d..5bb327acb66 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Bibliothèque de contrôles utilisateur WPF",
+ "description": "Projet de création d'une bibliothèque de contrôles utilisateur pour les applications WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "symbols/Nullable/description": "Indique s’il faut activer les types référence Nullable pour ce projet.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre UserControl1.xaml dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
index c14f0cc232d..7901b6ce4fb 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Libreria di controlli utente WPF",
+ "description": "Progetto per la creazione di una libreria di controlli utente per applicazioni WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "symbols/Nullable/description": "Indica se abilitare i tipi di riferimento che ammettono i valori Null per questo progetto.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre UserControl1.xaml nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
index c14f0cc232d..ad49b1405b6 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF ユーザー コントロール ライブラリ",
+ "description": ".NET Core WPF アプリケーション用のユーザー コントロール ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで UserControl1.xaml を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
index c14f0cc232d..598d39e19f1 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 사용자 정의 컨트롤 라이브러리",
+ "description": ".NET WPF 애플리케이션용 사용자 정의 컨트롤 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 UserControl1.xaml을 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
index c14f0cc232d..28bee750f15 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteka kontrolek użytkownika WPF",
+ "description": "Projekt służący do tworzenia biblioteki kontrolek użytkownika na potrzeby aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "symbols/Nullable/description": "Określa, czy w przypadku tego projektu mają być włączane typy pustych referencji.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik UserControl1.xaml w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
index c14f0cc232d..e5326c759b7 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteca de Controles de Usuário do WPF",
+ "description": "Um projeto para criar uma biblioteca de controles de usuário para aplicativos .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "symbols/Nullable/description": "Se permitir tipos de referência anuláveis para este projeto.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abre o UserControl1.xaml no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
index c14f0cc232d..96e523b1760 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,17 +1,17 @@
{
- "author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека пользовательских элементов управления WPF",
+ "description": "Проект для создания библиотеки пользовательских элементов управления для приложений WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открытие UserControl1.xaml в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
index c14f0cc232d..d8e10171600 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF Kullanıcı Denetimi Kitaplığı",
+ "description": ".NET WPF Uygulamaları için kullanıcı kontrolü kitaplığı oluşturmaya yönelik proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "symbols/Nullable/description": "Bu proje için null atanabilir başvuru türlerinin etkinleştirilip etkinleştirilmeyeceğini belirtir.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide UserControl1.xaml'i açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index c14f0cc232d..a84a4c8d3ce 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 用户控件库",
+ "description": "用于为 .NET WPF 应用程序创建用户控件库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 UserControl1.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index c14f0cc232d..1494b32da7f 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,17 +1,17 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "symbols/Nullable/description": "Whether to enable nullable reference types for this project.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 使用者控制項程式庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的使用者控制項程式庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 UserControl1.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
index 579a5c1b6fd..6b64a7df5ed 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.cs.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Knihovna uživatelských ovládacích prvků WPF",
+ "description": "Projekt pro vytvoření knihovny uživatelských ovládacích prvků pro aplikace WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
+ "symbols/Framework/description": "Cílová architektura pro projekt",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Cílit na netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Cílit na netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Cílit na net5.0",
+ "symbols/Framework/choices/net6.0/description": "Cílit na net6.0",
+ "symbols/langVersion/description": "Nastaví langVersion ve vytvořeném souboru projektu.",
+ "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+ "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+ "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore",
+ "postActions/editor/description": "Otevře UserControl1.xaml v editoru."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
index 579a5c1b6fd..fa06d879f9a 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.de.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Bibliothek von WPF-Benutzersteuerelementen",
+ "description": "Ein Projekt zum Erstellen einer Bibliothek von Benutzersteuerelementen für .NET WPF-Anwendungen",
+ "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
+ "symbols/Framework/description": "Das Zielframework für das Projekt.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Auf „netcoreapp3.0“ abzielen",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Auf „netcoreapp3.1“ abzielen",
+ "symbols/Framework/choices/net5.0/description": "Auf „net5.0“ abzielen",
+ "symbols/Framework/choices/net6.0/description": "Auf „net6.0“ abzielen",
+ "symbols/langVersion/description": "Legt „langVersion“ in der erstellten Projektdatei fest",
+ "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+ "postActions/restore/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
+ "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen",
+ "postActions/editor/description": "Öffnet UserControl1.xmal im Editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
index 579a5c1b6fd..c0005a097cd 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.es.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteca de controles de usuario de WPF",
+ "description": "Proyecto para crear una biblioteca de controles de usuario para aplicaciones WPF de .NET.",
+ "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
+ "symbols/Framework/description": "Marco de destino del proyecto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Objetivo netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Objetivo netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Objetivo net5.0",
+ "symbols/Framework/choices/net6.0/description": "Objetivo net6.0",
+ "symbols/langVersion/description": "Establece langVersion en el archivo de proyecto creado.",
+ "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+ "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+ "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
+ "postActions/editor/description": "Abre UserControl1.xaml en el editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
index 579a5c1b6fd..0153608aabb 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.fr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Bibliothèque de contrôles utilisateur WPF",
+ "description": "Projet de création d'une bibliothèque de contrôles utilisateur pour les applications WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
+ "symbols/Framework/description": "Framework cible du projet.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "netcoreapp3.0 cible",
+ "symbols/Framework/choices/netcoreapp3.1/description": "netcoreapp3.1 cible",
+ "symbols/Framework/choices/net5.0/description": "net5.0 cible",
+ "symbols/Framework/choices/net6.0/description": "net6.0 cible",
+ "symbols/langVersion/description": "Définit langVersion dans le fichier projet créé",
+ "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+ "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+ "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »",
+ "postActions/editor/description": "Ouvre UserControl1.xaml dans l’éditeur"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
index 579a5c1b6fd..518e03cac0e 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.it.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Libreria di controlli utente WPF",
+ "description": "Progetto per la creazione di una libreria di controlli utente per applicazioni WPF .NET",
+ "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
+ "symbols/Framework/description": "Il framework di destinazione per il progetto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 di destinazione",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 di destinazione",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 di destinazione",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 di destinazione",
+ "symbols/langVersion/description": "Imposta langVersion nel file di progetto creato",
+ "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
+ "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
+ "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'",
+ "postActions/editor/description": "Apre UserControl1.xaml nell'editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
index 579a5c1b6fd..9780fcfd06b 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ja.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF ユーザー コントロール ライブラリ",
+ "description": ".NET Core WPF アプリケーション用のユーザー コントロール ライブラリを作成するためのプロジェクト",
+ "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします",
+ "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "ターゲット netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "ターゲット netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "ターゲット net5.0",
+ "symbols/Framework/choices/net6.0/description": "ターゲット net6.0",
+ "symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
+ "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
+ "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する",
+ "postActions/editor/description": "エディターで UserControl1.xaml を開きます"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
index 579a5c1b6fd..695e099d465 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ko.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 사용자 정의 컨트롤 라이브러리",
+ "description": ".NET WPF 애플리케이션용 사용자 정의 컨트롤 라이브러리 만들기 프로젝트",
+ "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
+ "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "대상 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "대상 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "대상 net5.0",
+ "symbols/Framework/choices/net6.0/description": "대상 net6.0",
+ "symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
+ "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
+ "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행",
+ "postActions/editor/description": "편집기에서 UserControl1.xaml을 엽니다."
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
index 579a5c1b6fd..bc87a3f451e 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pl.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteka kontrolek użytkownika WPF",
+ "description": "Projekt służący do tworzenia biblioteki kontrolek użytkownika na potrzeby aplikacji WPF w środowisku .NET",
+ "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
+ "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Docelowy netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Docelowy netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Docelowy net5.0",
+ "symbols/Framework/choices/net6.0/description": "Docelowy net6.0",
+ "symbols/langVersion/description": "Ustawia langVersion w utworzonym pliku projektu",
+ "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
+ "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
+ "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"",
+ "postActions/editor/description": "Otwiera plik UserControl1.xaml w edytorze"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
index 579a5c1b6fd..c291f840cd2 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "Biblioteca de Controles de Usuário do WPF",
+ "description": "Um projeto para criar uma biblioteca de controles de usuário para aplicativos .NET WPF",
+ "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
+ "symbols/Framework/description": "A estrutura de destino do projeto.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Netcoreapp3.0 de destino",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Netcoreapp3.1 de destino",
+ "symbols/Framework/choices/net5.0/description": "Net5.0 de destino",
+ "symbols/Framework/choices/net6.0/description": "Net6.0 de destino",
+ "symbols/langVersion/description": "Define a langVersion no arquivo do projeto criado",
+ "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
+ "postActions/restore/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
+ "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'",
+ "postActions/editor/description": "Abre o UserControl1.xaml no editor"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
index 579a5c1b6fd..ab38f4d270e 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.ru.json
@@ -1,16 +1,16 @@
{
- "author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "author": "Майкрософт",
+ "name": "Библиотека пользовательских элементов управления WPF",
+ "description": "Проект для создания библиотеки пользовательских элементов управления для приложений WPF .NET.",
+ "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
+ "symbols/Framework/description": "Целевая платформа для проекта.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Целевая платформа: netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Целевая платформа: netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Целевая платформа: net5.0",
+ "symbols/Framework/choices/net6.0/description": "Целевая платформа: net6.0",
+ "symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
+ "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
+ "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
+ "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
+ "postActions/editor/description": "Открытие UserControl1.xaml в редакторе"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
index 579a5c1b6fd..65191a71ae6 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.tr.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF Kullanıcı Denetimi Kitaplığı",
+ "description": ".NET WPF Uygulamaları için kullanıcı kontrolü kitaplığı oluşturmaya yönelik proje",
+ "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
+ "symbols/Framework/description": "Projenin hedef çerçevesi.",
+ "symbols/Framework/choices/netcoreapp3.0/description": "Hedef netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "Hedef netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "Hedef net5.0",
+ "symbols/Framework/choices/net6.0/description": "Hedef net6.0",
+ "symbols/langVersion/description": "Oluşturulan proje dosyasında langVersion'ı ayarlar",
+ "symbols/skipRestore/description": "Belirtilmişse, oluşturulmakta olan projenin otomatik geri yüklenmesini atlar.",
+ "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
+ "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır",
+ "postActions/editor/description": "Düzenleyicide UserControl1.xaml'i açar"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
index 579a5c1b6fd..d6d2821098f 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 用户控件库",
+ "description": "用于为 .NET WPF 应用程序创建用户控件库的项目",
+ "symbols/TargetFrameworkOverride/description": "替代目标框架",
+ "symbols/Framework/description": "项目的目标框架。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目标 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目标 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目标 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目标 net6.0",
+ "symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
+ "symbols/skipRestore/description": "如果指定,则在创建时跳过项目的自动还原。",
+ "postActions/restore/description": "还原此项目所需的 NuGet 包。",
+ "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"",
+ "postActions/editor/description": "在编辑器中打开 UserControl1.xaml"
}
\ No newline at end of file
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
index 579a5c1b6fd..095b248ecb8 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,16 +1,16 @@
{
"author": "Microsoft",
- "name": "WPF User Control Library",
- "description": "A project for creating a user control library for .NET WPF Applications",
- "symbols/TargetFrameworkOverride/description": "Overrides the target framework",
- "symbols/Framework/description": "The target framework for the project.",
- "symbols/Framework/choices/netcoreapp3.0/description": "Target netcoreapp3.0",
- "symbols/Framework/choices/netcoreapp3.1/description": "Target netcoreapp3.1",
- "symbols/Framework/choices/net5.0/description": "Target net5.0",
- "symbols/Framework/choices/net6.0/description": "Target net6.0",
- "symbols/langVersion/description": "Sets langVersion in the created project file",
- "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
- "postActions/restore/description": "Restore NuGet packages required by this project.",
- "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'",
- "postActions/editor/description": "Opens UserControl1.xaml in the editor"
+ "name": "WPF 使用者控制項程式庫",
+ "description": "此專案可用於建立適用於 .NET WPF 應用程式的使用者控制項程式庫",
+ "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
+ "symbols/Framework/description": "專案的目標 Framework。",
+ "symbols/Framework/choices/netcoreapp3.0/description": "目標 netcoreapp3.0",
+ "symbols/Framework/choices/netcoreapp3.1/description": "目標 netcoreapp3.1",
+ "symbols/Framework/choices/net5.0/description": "目標 net5.0",
+ "symbols/Framework/choices/net6.0/description": "目標 net6.0",
+ "symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
+ "symbols/skipRestore/description": "若指定,會在建立時跳過專案的自動還原。",
+ "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
+ "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'",
+ "postActions/editor/description": "在編輯器中開啟 UserControl1.xaml"
}
\ No newline at end of file
From 3e72421c9d19d2f39d1ae49b1c26ea918a070512 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 01:26:44 +0000
Subject: [PATCH 085/223] Update dependencies from
https://github.com/dotnet/winforms build 20210914.7 (#5320)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.21 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21463.19 to 6.0.0-rc.2.21463.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 dfc8ce8458f..70bde52b086 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- cc5550d041204db00113524167c77b155aa8548e
+ d7dd5e158d49780fcd93f0a36437ac5cd412d78d
-
+
https://github.com/dotnet/winforms
- cc5550d041204db00113524167c77b155aa8548e
+ d7dd5e158d49780fcd93f0a36437ac5cd412d78d
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
-
+
https://github.com/dotnet/runtime
- 9e5a932d51537930cba10bb9edf0185276f5669a
+ f860bcef1808fb1e5a1d7471fe1926436c8a6148
diff --git a/eng/Versions.props b/eng/Versions.props
index 85abe7798b8..7ab21d81d48 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.17
+ 6.0.0-rc.2.21464.7
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
- 6.0.0-rc.2.21463.19
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21463.21
From 75ef89cad22a5c30845ae9464542e5be4e3ac1c2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 03:55:00 +0000
Subject: [PATCH 086/223] Update dependencies from
https://github.com/dotnet/winforms build 20210914.12 (#5322)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.21 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21463.21 to 6.0.0-rc.2.21464.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 70bde52b086..19b5f18d043 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- d7dd5e158d49780fcd93f0a36437ac5cd412d78d
+ 52ae6ce0283e485d666e03c189e3641199a934eb
-
+
https://github.com/dotnet/winforms
- d7dd5e158d49780fcd93f0a36437ac5cd412d78d
+ 52ae6ce0283e485d666e03c189e3641199a934eb
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
39b3aeccd1bea6b158e239db301ab23e365740d3
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://github.com/dotnet/runtime
- f860bcef1808fb1e5a1d7471fe1926436c8a6148
+ b3a9b0b740cce9322b03200db0b4ab736d7cd12d
diff --git a/eng/Versions.props b/eng/Versions.props
index 7ab21d81d48..51da41b8f5e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,38 +4,38 @@
6.0.0
rc
2
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.7
+ 6.0.0-rc.2.21464.12
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
- 6.0.0-rc.2.21463.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
+ 6.0.0-rc.2.21464.21
From 24d7f58552d09d50b44017553e93d0a9d143c932 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 05:43:39 +0000
Subject: [PATCH 087/223] Update dependencies from
https://github.com/dotnet/winforms build 20210914.16 (#5326)
[release/6.0] 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 19b5f18d043..038448c4c7e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 52ae6ce0283e485d666e03c189e3641199a934eb
+ f7daead08c7d1f7d15712844d3ad8ff630cfa6f1
-
+
https://github.com/dotnet/winforms
- 52ae6ce0283e485d666e03c189e3641199a934eb
+ f7daead08c7d1f7d15712844d3ad8ff630cfa6f1
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 51da41b8f5e..a557c232372 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21464.12
+ 6.0.0-rc.2.21464.16
From e006a2b2c06a99ec1cef18379c697d9e3a65171d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 05:57:17 +0000
Subject: [PATCH 088/223] Update dependencies from
https://github.com/dotnet/winforms build 20210914.18 (#5327)
[release/6.0] 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 038448c4c7e..b332d642949 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- f7daead08c7d1f7d15712844d3ad8ff630cfa6f1
+ 66889940e6dd576e0a34f8fb87b6994c9d30fa9e
-
+
https://github.com/dotnet/winforms
- f7daead08c7d1f7d15712844d3ad8ff630cfa6f1
+ 66889940e6dd576e0a34f8fb87b6994c9d30fa9e
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index a557c232372..4b96f3db097 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
- 6.0.0-rc.2.21464.16
+ 6.0.0-rtm.21464.18
From 8d901b581073bde84dd6f793774b2362637428cf Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 15 Sep 2021 16:27:28 -0700
Subject: [PATCH 089/223] Update Intellisense files for 6.0 RC2 (#5329)
Consume the WPF Intellisense files with .NET 6.0 API updates:
dotnet-api-docs_net6.0-0.0.0.4-win32-x86
dotnet-api-docs_net6.0-0.0.0.4-win64-x64
---
eng/WpfArcadeSdk/tools/ReferenceAssembly.targets | 4 ++--
global.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
index db2755f3ddb..f2698c7da32 100644
--- a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
+++ b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
@@ -46,13 +46,13 @@
Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
- 0.0.0.3
+ 0.0.0.4
- $(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net5.0\$(DotNetApiDocsNet50)\_intellisense\net-5.0\
+ $(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net6.0\$(DotNetApiDocsNet60)\_intellisense\net-6.0\
Date: Wed, 15 Sep 2021 18:21:19 -0700
Subject: [PATCH 090/223] Update release/6.0 branding to GA (#5332)
* Update release/6.0 branding to GA
* Use LangVersion 9 until build pool machines are updated.
---
eng/Versions.props | 4 ++--
eng/WpfArcadeSdk/Sdk/Sdk.props | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 4b96f3db097..515978e5d05 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,8 +2,8 @@
6.0.0
- rc
- 2
+ rtm
+
6.0.0-rc.2.21464.21
6.0.0-rc.2.21464.21
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index f4bd71bf1ef..a49b035320b 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -15,7 +15,10 @@
$(WpfArcadeSdkToolsDir)GenXmlStringTable.pl
preview
- 10
+
+ 9
true
true
From a54c6f6dbd582f172f009d48a31f19e2f49f8f38 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Sep 2021 01:43:32 +0000
Subject: [PATCH 091/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210915.4
(#5334)
[release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int
---
eng/Version.Details.xml | 4 ++--
eng/Versions.props | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b332d642949..a8834f31ef8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
b3a9b0b740cce9322b03200db0b4ab736d7cd12d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- 39b3aeccd1bea6b158e239db301ab23e365740d3
+ b932e7bae15e4f874f99c33b37036b321fd0cb33
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 515978e5d05..c7ae7dd725d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,8 @@
6.0.0
rtm
-
+
+
6.0.0-rc.2.21464.21
6.0.0-rc.2.21464.21
@@ -80,6 +81,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rc.2.21428.2
+ 6.0.0-rtm.21465.4
From 004bd018c45002ccc60a06433d5bf1c47bc24187 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 06:00:51 +0000
Subject: [PATCH 092/223] Update dependencies from
https://github.com/dotnet/winforms build 20210916.9 (#5340)
[release/6.0] 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 a8834f31ef8..c24c74455fb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 66889940e6dd576e0a34f8fb87b6994c9d30fa9e
+ 5f525932becdb8846d29136db1e832e27645e7db
-
+
https://github.com/dotnet/winforms
- 66889940e6dd576e0a34f8fb87b6994c9d30fa9e
+ 5f525932becdb8846d29136db1e832e27645e7db
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c7ae7dd725d..d63588b1dce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21464.18
+ 6.0.0-rtm.21466.9
From d0e5c8c8d200702b53d29ef4564f9b0c187d4cf2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 21 Sep 2021 17:51:56 +0000
Subject: [PATCH 093/223] Update dependencies from
https://github.com/dotnet/winforms build 20210921.4 (#5364)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21464.21 to 6.0.0-rtm.21470.22 (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 c24c74455fb..d038d506010 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 5f525932becdb8846d29136db1e832e27645e7db
+ f8841f133107ea2473c185d2b4f438dde598ed7f
-
+
https://github.com/dotnet/winforms
- 5f525932becdb8846d29136db1e832e27645e7db
+ f8841f133107ea2473c185d2b4f438dde598ed7f
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
-
+
https://github.com/dotnet/runtime
- b3a9b0b740cce9322b03200db0b4ab736d7cd12d
+ da9d3777afe61bbcfd16ff70ca150433370b4139
diff --git a/eng/Versions.props b/eng/Versions.props
index d63588b1dce..cd1ba7ea653 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
- 6.0.0-rtm.21466.9
+ 6.0.0-rtm.21471.4
5.0.0-alpha1.19562.1
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
4.6.0-preview4.19176.11
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
- 6.0.0-rc.2.21464.21
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21470.22
From cc2017f8fc9f23a4740ca0142b092c2a3f17efa2 Mon Sep 17 00:00:00 2001
From: Jon Fortescue
Date: Wed, 22 Sep 2021 10:55:04 -0700
Subject: [PATCH 094/223] Switch to 1ES servicing pools on release/6.0
---
azure-pipelines.yml | 4 ++--
eng/pipeline.yml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 435a6259549..ed87a495ae5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,8 +72,8 @@ stages:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
pool:
- name: NetCoreInternal-Pool
- queue: buildpool.windows.10.amd64.vs2019.pre
+ name: NetCore1ESPool-Svc-Internal
+ demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
# runAsPublic is used in expressions, which can't read from user-defined variables
runAsPublic: false
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index c6bc7f43ecd..ac0fa9d302b 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -34,11 +34,11 @@ jobs:
# Will eventually change this to two BYOC pools.
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCorePublic-Pool
- queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
+ name: NetCore1ESPool-Svc-Public
+ demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCoreInternal-Pool
- queue: buildpool.windows.10.amd64.vs2019.pre
+ name: NetCore1ESPool-Svc-Internal
+ demands: ImageOverride -equals Build.windows.10.amd64.vs2019.pre
variables:
# needed for signing
- name: _TeamName
From be9cba3c1dcf989bb4a2a5aeb04db79dbac4e760 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 18:07:26 +0000
Subject: [PATCH 095/223] Update dependencies from
https://github.com/dotnet/winforms build 20210922.5 (#5371)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21470.22 to 6.0.0-rtm.21471.19 (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 d038d506010..c83435ad91d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- f8841f133107ea2473c185d2b4f438dde598ed7f
+ bf25338146edbcc0daef079ecb061215a4cfd6c2
-
+
https://github.com/dotnet/winforms
- f8841f133107ea2473c185d2b4f438dde598ed7f
+ bf25338146edbcc0daef079ecb061215a4cfd6c2
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
-
+
https://github.com/dotnet/runtime
- da9d3777afe61bbcfd16ff70ca150433370b4139
+ 036cb862a4e99b1fa035f654debad7091646fbe4
diff --git a/eng/Versions.props b/eng/Versions.props
index cd1ba7ea653..fc7e1c7b8b0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.4
+ 6.0.0-rtm.21472.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
4.6.0-preview4.19176.11
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
- 6.0.0-rtm.21470.22
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21471.19
From 60c089160dfac4790702682dd18892594e9b43c7 Mon Sep 17 00:00:00 2001
From: Jon Fortescue
Date: Wed, 22 Sep 2021 11:49:27 -0700
Subject: [PATCH 096/223] Lowercase
---
eng/pipeline.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index ac0fa9d302b..8ebe3d7ef47 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -38,7 +38,7 @@ jobs:
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals Build.windows.10.amd64.vs2019.pre
+ demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
variables:
# needed for signing
- name: _TeamName
From 0b49b900f50f8793c29c08b55b8bbf6fd45f652f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 23 Sep 2021 01:05:50 +0000
Subject: [PATCH 097/223] Update dependencies from
https://github.com/dotnet/winforms build 20210922.8 (#5373)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21471.19 to 6.0.0-rtm.21472.13 (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 c83435ad91d..91108728561 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- bf25338146edbcc0daef079ecb061215a4cfd6c2
+ 406fc6353f173c3f4a95645405b8df058203a9ae
-
+
https://github.com/dotnet/winforms
- bf25338146edbcc0daef079ecb061215a4cfd6c2
+ 406fc6353f173c3f4a95645405b8df058203a9ae
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
-
+
https://github.com/dotnet/runtime
- 036cb862a4e99b1fa035f654debad7091646fbe4
+ 491ed9a112559872c31ae40da8f6d9977ba4ce3a
diff --git a/eng/Versions.props b/eng/Versions.props
index fc7e1c7b8b0..8689d3a57de 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.5
+ 6.0.0-rtm.21472.8
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
4.6.0-preview4.19176.11
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
- 6.0.0-rtm.21471.19
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21472.13
From a2757462991b736d8e17a9a81d35e00d16c69133 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 15:58:39 +0000
Subject: [PATCH 098/223] Update dependencies from
https://github.com/dotnet/arcade build 20210923.5 (#5383)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/build.sh | 1 +
eng/common/cross/toolchain.cmake | 4 ++--
eng/common/tools.ps1 | 24 +++++++++++++++++++++---
eng/common/tools.sh | 9 +++++++++
global.json | 8 ++++----
7 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 91108728561..3eb97a19a38 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ c575da80f465e0b5fb98f416be92bb98b2f54b41
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ c575da80f465e0b5fb98f416be92bb98b2f54b41
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ c575da80f465e0b5fb98f416be92bb98b2f54b41
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ c575da80f465e0b5fb98f416be92bb98b2f54b41
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ c575da80f465e0b5fb98f416be92bb98b2f54b41
diff --git a/eng/Versions.props b/eng/Versions.props
index 8689d3a57de..ff9f5dfd57c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
+ 6.0.0-beta.21473.5
+ 6.0.0-beta.21473.5
+ 6.0.0-beta.21473.5
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 6edd6f60c5c..bc07a1c6848 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,6 +187,7 @@ function InitializeCustomToolset {
}
function Build {
+
if [[ "$ci" == true ]]; then
TryLogClientIpAddress
fi
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index fc11001aa76..ec8971eb019 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -138,8 +138,8 @@ function(add_toolchain_linker_flag Flag)
if (NOT Config STREQUAL "")
set(CONFIG_SUFFIX "_${Config}")
endif()
- set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
- set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+ set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
+ set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
endfunction()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index ce4419ad11a..44484289943 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -154,9 +154,6 @@ 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
@@ -712,6 +709,8 @@ function MSBuild() {
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
}
+ Enable-Nuget-EnhancedRetry
+
$toolsetBuildProject = InitializeToolset
$basePath = Split-Path -parent $toolsetBuildProject
$possiblePaths = @(
@@ -720,6 +719,8 @@ function MSBuild() {
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+ (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
@@ -756,6 +757,8 @@ function MSBuild-Core() {
}
}
+ Enable-Nuget-EnhancedRetry
+
$buildTool = InitializeBuildTool
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
@@ -896,3 +899,18 @@ function Try-LogClientIpAddress()
Write-Host "Unable to get this machine's effective IP address for logging: $_"
}
}
+
+#
+# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
+#
+function Enable-Nuget-EnhancedRetry() {
+ if ($ci) {
+ Write-Host "Setting NUGET enhanced retry environment variables"
+ $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
+ $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
+ $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
+ Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
+ Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
+ Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
+ }
+}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 41e323104df..6a4871ef72b 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -417,6 +417,13 @@ function MSBuild {
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
+
+ export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
+ export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
+ export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
+ Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
+ Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
+ Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
fi
local toolset_dir="${_InitializeToolset%/*}"
@@ -427,6 +434,8 @@ function MSBuild {
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
diff --git a/global.json b/global.json
index 78d51badc44..712353c410f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-rc.1.21416.15",
+ "dotnet": "6.0.100-rc.1.21430.12",
"runtimes": {
"dotnet": [
"2.1.7",
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21473.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21473.5"
},
"sdk": {
- "version": "6.0.100-rc.1.21416.15"
+ "version": "6.0.100-rc.1.21430.12"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
From 28f78e4280c6b340d4819f11d96c9f1ecea9883f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 20:59:16 +0000
Subject: [PATCH 099/223] Update dependencies from
https://github.com/dotnet/winforms build 20210924.11 (#5386)
[release/6.0] 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 3eb97a19a38..e17ab6bf5bc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 406fc6353f173c3f4a95645405b8df058203a9ae
+ 5feaec7582d2c99555ede1164500fef8e6c8240c
-
+
https://github.com/dotnet/winforms
- 406fc6353f173c3f4a95645405b8df058203a9ae
+ 5feaec7582d2c99555ede1164500fef8e6c8240c
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index ff9f5dfd57c..52ca63f4d52 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21472.8
+ 6.0.0-rtm.21474.11
From c5eab0a86ae720ca4d08cf51c97e4648ad008f8c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 21:27:20 +0000
Subject: [PATCH 100/223] Update dependencies from
https://github.com/dotnet/winforms build 20210924.14 (#5387)
[release/6.0] 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 e17ab6bf5bc..c7c7f255b80 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 5feaec7582d2c99555ede1164500fef8e6c8240c
+ 48fac652bc0ebcf2526d19a9b238b0e4fe287170
-
+
https://github.com/dotnet/winforms
- 5feaec7582d2c99555ede1164500fef8e6c8240c
+ 48fac652bc0ebcf2526d19a9b238b0e4fe287170
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 52ca63f4d52..16b7a1c6fbc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21474.11
+ 6.0.0-rtm.21474.14
From caf5fd4ea5b1b08ffb55e8dc2e8e1dd8af6037e5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 21:08:25 +0000
Subject: [PATCH 101/223] Update dependencies from
https://github.com/dotnet/winforms build 20210927.3 (#5396)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21472.13 to 6.0.0-rtm.21477.5 (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 c7c7f255b80..8c03f0a8996 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 48fac652bc0ebcf2526d19a9b238b0e4fe287170
+ 29bdbdeb72ef6ab59663126e9acf0da83142a8b6
-
+
https://github.com/dotnet/winforms
- 48fac652bc0ebcf2526d19a9b238b0e4fe287170
+ 29bdbdeb72ef6ab59663126e9acf0da83142a8b6
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
-
+
https://github.com/dotnet/runtime
- 491ed9a112559872c31ae40da8f6d9977ba4ce3a
+ 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
diff --git a/eng/Versions.props b/eng/Versions.props
index 16b7a1c6fbc..69c0be976f8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
- 6.0.0-rtm.21474.14
+ 6.0.0-rtm.21477.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
4.6.0-preview4.19176.11
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
- 6.0.0-rtm.21472.13
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.5
From 9adbba1ceeace4af8174707cd71a3cea75142419 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Sep 2021 00:23:05 +0000
Subject: [PATCH 102/223] Update dependencies from
https://github.com/dotnet/winforms build 20210927.5 (#5397)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.5 to 6.0.0-rtm.21477.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 8c03f0a8996..a91af750bb4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 29bdbdeb72ef6ab59663126e9acf0da83142a8b6
+ 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870
-
+
https://github.com/dotnet/winforms
- 29bdbdeb72ef6ab59663126e9acf0da83142a8b6
+ 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
-
+
https://github.com/dotnet/runtime
- 5eb9fd5547373d2c9c8d12a05bae696e8888e81e
+ a7e9f9fb2363e21571da2950990106e7cc4f714e
diff --git a/eng/Versions.props b/eng/Versions.props
index 69c0be976f8..ae33353506a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.3
+ 6.0.0-rtm.21477.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
4.6.0-preview4.19176.11
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21477.8
From 3182bd4938edda6423c95e7fcc9847dc2b8ab28e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Sep 2021 08:41:55 +0000
Subject: [PATCH 103/223] Update dependencies from
https://github.com/dotnet/winforms build 20210929.2 (#5404)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21477.8 to 6.0.0-rtm.21478.11 (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 a91af750bb4..b004546b73e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870
+ 5b394be375250b74fe4b87adf76eff875c40400a
-
+
https://github.com/dotnet/winforms
- 8c8ba989076d4ff3207f35ff5e0fefe0d16fc870
+ 5b394be375250b74fe4b87adf76eff875c40400a
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
-
+
https://github.com/dotnet/runtime
- a7e9f9fb2363e21571da2950990106e7cc4f714e
+ 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
diff --git a/eng/Versions.props b/eng/Versions.props
index ae33353506a..10b89bfd8bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
- 6.0.0-rtm.21477.5
+ 6.0.0-rtm.21479.2
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
4.6.0-preview4.19176.11
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
- 6.0.0-rtm.21477.8
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21478.11
From ab8e22e9d1e3ac29fa88b9899fc4b02068cb3456 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Sep 2021 23:41:34 +0000
Subject: [PATCH 104/223] Update dependencies from
https://github.com/dotnet/winforms build 20210929.5 (#5407)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.7 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21478.11 to 6.0.0-rtm.21479.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 b004546b73e..aad79931283 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 5b394be375250b74fe4b87adf76eff875c40400a
+ bbc039c00b33dd80a30e8564051d9c69ec47eef5
-
+
https://github.com/dotnet/winforms
- 5b394be375250b74fe4b87adf76eff875c40400a
+ bbc039c00b33dd80a30e8564051d9c69ec47eef5
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
b932e7bae15e4f874f99c33b37036b321fd0cb33
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://github.com/dotnet/runtime
- 9e0a252fd3c5e928973cd08bc1a94ca8dbe7cb84
+ e013f14c5330375a18656dea8dca14e5602a3ae0
diff --git a/eng/Versions.props b/eng/Versions.props
index 10b89bfd8bc..f87f7c9bf53 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.2
+ 6.0.0-rtm.21479.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
4.6.0-preview4.19176.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
- 6.0.0-rtm.21478.11
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21479.7
From 66744c5b36a7291a78162564662a083705726f75 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 17:57:26 +0000
Subject: [PATCH 105/223] Update dependencies from
https://github.com/dotnet/winforms build 20210930.2 (#5413)
[release/6.0] 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 aad79931283..087d102e2e7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- bbc039c00b33dd80a30e8564051d9c69ec47eef5
+ 85598295058ac2a48b7e450ac420f01eb78d6188
-
+
https://github.com/dotnet/winforms
- bbc039c00b33dd80a30e8564051d9c69ec47eef5
+ 85598295058ac2a48b7e450ac420f01eb78d6188
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index f87f7c9bf53..108f6cab8da 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21479.5
+ 6.0.0-rtm.21480.2
From b9462070ec7cc16a03713c6ef86b82548647beb9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 19:02:29 +0000
Subject: [PATCH 106/223] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20210930.1
(#5417)
[release/6.0] 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 087d102e2e7..a543ade7d73 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://github.com/dotnet/runtime
e013f14c5330375a18656dea8dca14e5602a3ae0
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- b932e7bae15e4f874f99c33b37036b321fd0cb33
+ bf6f24c075ff5315d0ec0e5359138ee796b0491c
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 108f6cab8da..e278319104b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,6 +81,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rtm.21465.4
+ 6.0.0-rtm.21480.1
From 442b56e85eb3b95d40c272361fc3f467d75f89cb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 01:20:39 +0000
Subject: [PATCH 107/223] Update dependencies from
https://github.com/dotnet/winforms build 20210930.7 (#5421)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.10 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21480.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 a543ade7d73..97bedfa7214 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 85598295058ac2a48b7e450ac420f01eb78d6188
+ fd636dc78dddacd973e088f63e44dcde71a01c15
-
+
https://github.com/dotnet/winforms
- 85598295058ac2a48b7e450ac420f01eb78d6188
+ fd636dc78dddacd973e088f63e44dcde71a01c15
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
-
+
https://github.com/dotnet/runtime
- e013f14c5330375a18656dea8dca14e5602a3ae0
+ 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
diff --git a/eng/Versions.props b/eng/Versions.props
index e278319104b..97f380a3085 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.2
+ 6.0.0-rtm.21480.7
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
4.6.0-preview4.19176.11
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
- 6.0.0-rtm.21479.7
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21480.10
From 1488ef303424d95c70875c403005c719c4562569 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 18:32:58 +0000
Subject: [PATCH 108/223] Update dependencies from
https://github.com/dotnet/winforms build 20211001.3 (#5423)
[release/6.0] 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 97bedfa7214..0e2319a594e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- fd636dc78dddacd973e088f63e44dcde71a01c15
+ 857971a60b4815defc254800c9ad14e12a926d2a
-
+
https://github.com/dotnet/winforms
- fd636dc78dddacd973e088f63e44dcde71a01c15
+ 857971a60b4815defc254800c9ad14e12a926d2a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 97f380a3085..64336208fff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21480.7
+ 6.0.0-rtm.21501.3
From 1fa418e6138b3047577d506af5335cabeb58e6ec Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 19:22:37 +0000
Subject: [PATCH 109/223] Update dependencies from
https://github.com/dotnet/winforms build 20211001.5 (#5424)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21480.10 to 6.0.0-rtm.21501.5 (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 0e2319a594e..a6fc5407460 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 857971a60b4815defc254800c9ad14e12a926d2a
+ bc7b7501bd2815808d58db2657519c896aab1524
-
+
https://github.com/dotnet/winforms
- 857971a60b4815defc254800c9ad14e12a926d2a
+ bc7b7501bd2815808d58db2657519c896aab1524
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
-
+
https://github.com/dotnet/runtime
- 23a5153fb38c7b74f98d298a2ae6580f0af9b66d
+ 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
diff --git a/eng/Versions.props b/eng/Versions.props
index 64336208fff..f9fa936fb71 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.3
+ 6.0.0-rtm.21501.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
4.6.0-preview4.19176.11
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
- 6.0.0-rtm.21480.10
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.5
From 8aea242f636dc0affec9ba4ca88cff2e4a7a1376 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 17:40:11 +0000
Subject: [PATCH 110/223] Update dependencies from
https://github.com/dotnet/winforms build 20211004.1 (#5430)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21501.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 a6fc5407460..bfe13f9a7d6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- bc7b7501bd2815808d58db2657519c896aab1524
+ e50d084b0e760011142827e35abd569aa0566b4f
-
+
https://github.com/dotnet/winforms
- bc7b7501bd2815808d58db2657519c896aab1524
+ e50d084b0e760011142827e35abd569aa0566b4f
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
-
+
https://github.com/dotnet/runtime
- 0e19ef90c576e4e9e85d78ef6373f78c15393ae8
+ 6c5c32d56ec74280783664c2526937d23cfc3467
diff --git a/eng/Versions.props b/eng/Versions.props
index f9fa936fb71..29462dbbd2e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21504.1
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
4.6.0-preview4.19176.11
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
- 6.0.0-rtm.21501.5
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21501.9
From d1620ee590dc8033f7f41eb6bc0b57fdb958b3e4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 21:01:16 +0000
Subject: [PATCH 111/223] Update dependencies from
https://github.com/dotnet/winforms build 20211004.3 (#5433)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (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 bfe13f9a7d6..332e433262d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e50d084b0e760011142827e35abd569aa0566b4f
+ f1a23c1f72612c9713c03c5ef61df5c69de5ef46
-
+
https://github.com/dotnet/winforms
- e50d084b0e760011142827e35abd569aa0566b4f
+ f1a23c1f72612c9713c03c5ef61df5c69de5ef46
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
-
+
https://github.com/dotnet/runtime
- 6c5c32d56ec74280783664c2526937d23cfc3467
+ ebaef9c408aedefd675dfcaea253ef5d7e7f8665
diff --git a/eng/Versions.props b/eng/Versions.props
index 29462dbbd2e..89f106d1c8e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.1
+ 6.0.0-rtm.21504.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
4.6.0-preview4.19176.11
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
- 6.0.0-rtm.21501.9
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.6
From 2c942eb611072bacd622f99a81a00a9362acff20 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 22:13:07 +0000
Subject: [PATCH 112/223] Update dependencies from
https://github.com/dotnet/winforms build 20211004.5 (#5434)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.10 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.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 332e433262d..fad2b677a85 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- f1a23c1f72612c9713c03c5ef61df5c69de5ef46
+ 067523ef6a8183140981ebff85e5555caef648e8
-
+
https://github.com/dotnet/winforms
- f1a23c1f72612c9713c03c5ef61df5c69de5ef46
+ 067523ef6a8183140981ebff85e5555caef648e8
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
-
+
https://github.com/dotnet/runtime
- ebaef9c408aedefd675dfcaea253ef5d7e7f8665
+ 8a75ba0d51504916eb04afe00097788467faf133
diff --git a/eng/Versions.props b/eng/Versions.props
index 89f106d1c8e..a542ca13d02 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.3
+ 6.0.0-rtm.21504.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
4.6.0-preview4.19176.11
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
- 6.0.0-rtm.21504.6
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.10
From fb1a859df66b4fc4eaa01be942e7006d20a41418 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 00:21:24 +0000
Subject: [PATCH 113/223] Update dependencies from
https://github.com/dotnet/winforms build 20211004.15 (#5438)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.15 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.10 to 6.0.0-rtm.21504.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 fad2b677a85..a8fabfddf81 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 067523ef6a8183140981ebff85e5555caef648e8
+ f5e961ccb3dbc8442f7c25290a037b43a1ea652f
-
+
https://github.com/dotnet/winforms
- 067523ef6a8183140981ebff85e5555caef648e8
+ f5e961ccb3dbc8442f7c25290a037b43a1ea652f
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
-
+
https://github.com/dotnet/runtime
- 8a75ba0d51504916eb04afe00097788467faf133
+ 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
diff --git a/eng/Versions.props b/eng/Versions.props
index a542ca13d02..b97af7f7a48 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.5
+ 6.0.0-rtm.21504.15
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
4.6.0-preview4.19176.11
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
- 6.0.0-rtm.21504.10
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21504.15
From cd0308253a2f9df2e21db640e975fc2320b85e23 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 21:40:37 +0000
Subject: [PATCH 114/223] Update dependencies from
https://github.com/dotnet/winforms build 20211005.4 (#5454)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.15 to 6.0.0-rtm.21505.6 (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 a8fabfddf81..443509550ef 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- f5e961ccb3dbc8442f7c25290a037b43a1ea652f
+ a6350cb6faf614a4b2110b809bcda1859836ee46
-
+
https://github.com/dotnet/winforms
- f5e961ccb3dbc8442f7c25290a037b43a1ea652f
+ a6350cb6faf614a4b2110b809bcda1859836ee46
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
-
+
https://github.com/dotnet/runtime
- 5d5a119fc5df33351aa022a75625cd5bd63ed3f1
+ 5e06d805f207de1607f11b30e37891c4e2b44b13
diff --git a/eng/Versions.props b/eng/Versions.props
index b97af7f7a48..a99a6a9fbe8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.4
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
4.6.0-preview4.19176.11
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
- 6.0.0-rtm.21504.15
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21505.6
From f8127d4cc7473bdde7e1cd72e5d02106c1de0f23 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 17:31:46 +0000
Subject: [PATCH 115/223] Update dependencies from
https://github.com/dotnet/winforms build 20211007.1 (#5464)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21506.22 (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 443509550ef..a13d7ec8366 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- a6350cb6faf614a4b2110b809bcda1859836ee46
+ 8ad2cd166dcfffedb795ab6382f568a66529b709
-
+
https://github.com/dotnet/winforms
- a6350cb6faf614a4b2110b809bcda1859836ee46
+ 8ad2cd166dcfffedb795ab6382f568a66529b709
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
-
+
https://github.com/dotnet/runtime
- 5e06d805f207de1607f11b30e37891c4e2b44b13
+ 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
diff --git a/eng/Versions.props b/eng/Versions.props
index a99a6a9fbe8..51dfc1fcec8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
- 6.0.0-rtm.21505.4
+ 6.0.0-rtm.21507.1
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
4.6.0-preview4.19176.11
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
- 6.0.0-rtm.21505.6
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21506.22
From 11976ac62950abb5d9e6ea9b8ea29feed89faece Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 7 Oct 2021 18:40:28 +0000
Subject: [PATCH 116/223] Update dependencies from
https://github.com/dotnet/arcade build 20211007.1 (#5466)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
global.json | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a13d7ec8366..0fcc8e58cf5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- c575da80f465e0b5fb98f416be92bb98b2f54b41
+ e58cb829bf6d9c340b4a0c100956e2995d792aa2
-
+
https://github.com/dotnet/arcade
- c575da80f465e0b5fb98f416be92bb98b2f54b41
+ e58cb829bf6d9c340b4a0c100956e2995d792aa2
-
+
https://github.com/dotnet/arcade
- c575da80f465e0b5fb98f416be92bb98b2f54b41
+ e58cb829bf6d9c340b4a0c100956e2995d792aa2
-
+
https://github.com/dotnet/arcade
- c575da80f465e0b5fb98f416be92bb98b2f54b41
+ e58cb829bf6d9c340b4a0c100956e2995d792aa2
-
+
https://github.com/dotnet/arcade
- c575da80f465e0b5fb98f416be92bb98b2f54b41
+ e58cb829bf6d9c340b4a0c100956e2995d792aa2
diff --git a/eng/Versions.props b/eng/Versions.props
index 51dfc1fcec8..41181bfb01f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21473.5
- 6.0.0-beta.21473.5
- 6.0.0-beta.21473.5
+ 6.0.0-beta.21507.1
+ 6.0.0-beta.21507.1
+ 6.0.0-beta.21507.1
diff --git a/global.json b/global.json
index 712353c410f..6b294c409c4 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21473.5",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21473.5"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21507.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21507.1"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
From a4862608aacb057f25172ded93aca7b6c3193599 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 01:27:14 +0000
Subject: [PATCH 117/223] Update dependencies from
https://github.com/dotnet/winforms build 20211007.6 (#5467)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.10 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.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 0fcc8e58cf5..02a5b08145f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 8ad2cd166dcfffedb795ab6382f568a66529b709
+ 5c0930b92ffad60caf084ca1f45bd31db58e97ae
-
+
https://github.com/dotnet/winforms
- 8ad2cd166dcfffedb795ab6382f568a66529b709
+ 5c0930b92ffad60caf084ca1f45bd31db58e97ae
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
-
+
https://github.com/dotnet/runtime
- 7d6c1ef01013b7bedd4d51e4ec8241e862c271ae
+ 2c2d6dff61d429370067468d74fbe39031d66575
diff --git a/eng/Versions.props b/eng/Versions.props
index 41181bfb01f..1f51e782c45 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.1
+ 6.0.0-rtm.21507.6
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
4.6.0-preview4.19176.11
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
- 6.0.0-rtm.21506.22
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.10
From bef7c0ffffd2c15ddd290f0bcb0ab54e6cc81a99 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 03:56:14 +0000
Subject: [PATCH 118/223] Update dependencies from
https://github.com/dotnet/winforms build 20211007.9 (#5468)
[release/6.0] 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 02a5b08145f..33323023479 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 5c0930b92ffad60caf084ca1f45bd31db58e97ae
+ 84f1fbdcb3f5baf87a9e9b0bc7de3cdb0819782e
-
+
https://github.com/dotnet/winforms
- 5c0930b92ffad60caf084ca1f45bd31db58e97ae
+ 84f1fbdcb3f5baf87a9e9b0bc7de3cdb0819782e
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1f51e782c45..09f86b1439e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21507.6
+ 6.0.0-rtm.21507.9
From ecbbb80e6028a4829ee01f255b4ff5425e9b90f8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 06:09:40 +0000
Subject: [PATCH 119/223] Update dependencies from
https://github.com/dotnet/winforms build 20211007.10 (#5469)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21507.16 (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 33323023479..a538e371010 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 84f1fbdcb3f5baf87a9e9b0bc7de3cdb0819782e
+ 90c886aefd0090420d1bc6761763441e142c837b
-
+
https://github.com/dotnet/winforms
- 84f1fbdcb3f5baf87a9e9b0bc7de3cdb0819782e
+ 90c886aefd0090420d1bc6761763441e142c837b
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
-
+
https://github.com/dotnet/runtime
- 2c2d6dff61d429370067468d74fbe39031d66575
+ 733a3089ec6945422caf06035c18ff700c9d51be
diff --git a/eng/Versions.props b/eng/Versions.props
index 09f86b1439e..258cd66d91c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.9
+ 6.0.0-rtm.21507.10
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
4.6.0-preview4.19176.11
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21507.16
From ecff888e63c875b166424f1fb7aee7d41edb2da2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 20:34:16 +0000
Subject: [PATCH 120/223] Update dependencies from
https://github.com/dotnet/winforms build 20211008.1 (#5473)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.16 to 6.0.0-rtm.21508.5 (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 a538e371010..c9a45839e31 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 90c886aefd0090420d1bc6761763441e142c837b
+ 1ce53c51470db485946a5c7f9960109b5885ef44
-
+
https://github.com/dotnet/winforms
- 90c886aefd0090420d1bc6761763441e142c837b
+ 1ce53c51470db485946a5c7f9960109b5885ef44
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
-
+
https://github.com/dotnet/runtime
- 733a3089ec6945422caf06035c18ff700c9d51be
+ 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
diff --git a/eng/Versions.props b/eng/Versions.props
index 258cd66d91c..beee9e36322 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
- 6.0.0-rtm.21507.10
+ 6.0.0-rtm.21508.1
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
4.6.0-preview4.19176.11
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
- 6.0.0-rtm.21507.16
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.5
From c25d90fab639bfb9a1d5b6d3542913dcd3cad30b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 22:46:57 +0000
Subject: [PATCH 121/223] Update dependencies from
https://github.com/dotnet/winforms build 20211008.3 (#5474)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21508.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 c9a45839e31..11f23c37114 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 1ce53c51470db485946a5c7f9960109b5885ef44
+ 58d302b9ec2b2105fc640c5f1f989819825411a0
-
+
https://github.com/dotnet/winforms
- 1ce53c51470db485946a5c7f9960109b5885ef44
+ 58d302b9ec2b2105fc640c5f1f989819825411a0
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
-
+
https://github.com/dotnet/runtime
- 9dfda4fd9e72d979f7a8c596544b5d805f4f8537
+ 2cc1b09f775dff8f536c831c9ea5b8403caa028e
diff --git a/eng/Versions.props b/eng/Versions.props
index beee9e36322..75d9bc2afbe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.1
+ 6.0.0-rtm.21508.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
4.6.0-preview4.19176.11
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
- 6.0.0-rtm.21508.5
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.9
From 917c7da75caea7358388811269a58e5a54edcc9c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 9 Oct 2021 03:47:52 +0000
Subject: [PATCH 122/223] Update dependencies from
https://github.com/dotnet/winforms build 20211008.6 (#5476)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.9 to 6.0.0-rtm.21508.16 (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 11f23c37114..0c4f9cf8cdc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 58d302b9ec2b2105fc640c5f1f989819825411a0
+ 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575
-
+
https://github.com/dotnet/winforms
- 58d302b9ec2b2105fc640c5f1f989819825411a0
+ 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
-
+
https://github.com/dotnet/runtime
- 2cc1b09f775dff8f536c831c9ea5b8403caa028e
+ 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
diff --git a/eng/Versions.props b/eng/Versions.props
index 75d9bc2afbe..8bb190c56e0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.3
+ 6.0.0-rtm.21508.6
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
4.6.0-preview4.19176.11
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
- 6.0.0-rtm.21508.9
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21508.16
From 4455ff4633d4cd2a4ae99f76b1c24fe305aef4c5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 11 Oct 2021 11:49:38 +0000
Subject: [PATCH 123/223] Update dependencies from
https://github.com/dotnet/winforms build 20211011.2 (#5480)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.16 to 6.0.0-rtm.21510.5 (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 0c4f9cf8cdc..0f30a728808 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575
+ ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50
-
+
https://github.com/dotnet/winforms
- 79c5a2a27ef68ea00a2b2b2b621b53fdc1da2575
+ ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
-
+
https://github.com/dotnet/runtime
- 3a814508ab393d2e551a5a32c8bd834e8c4fd0e4
+ b1aedd5a54d0c54ec12afe98a41979fb053998a5
diff --git a/eng/Versions.props b/eng/Versions.props
index 8bb190c56e0..22c016ed80e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
- 6.0.0-rtm.21508.6
+ 6.0.0-rtm.21511.2
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
4.6.0-preview4.19176.11
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
- 6.0.0-rtm.21508.16
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21510.5
From 388f13d32900f4abfce707e6ec1a4d02790b272b Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Mon, 11 Oct 2021 15:58:16 -0700
Subject: [PATCH 124/223] [release/6.0] Overbuild caused by PackageReference
support (Remove WPF Arcade workaround) (#5453)
* Remove WPF workaround that prevents collision with Arcade WPF temporary project workaround
---
.../Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
index e77e6a6efa4..500e15350a7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
@@ -281,15 +281,11 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
// Save the xmlDocument content into the temporary project file.
xmlProjectDoc.Save(TemporaryTargetAssemblyProjectName);
- // Disable conflicting Arcade SDK workaround that imports NuGet props/targets
- Hashtable globalProperties = new Hashtable(1);
- globalProperties["_WpfTempProjectNuGetFilePathNoExt"] = "";
-
//
// Compile the temporary target assembly project
//
Dictionary targetOutputs = new Dictionary();
- retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, globalProperties, targetOutputs);
+ retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, null, targetOutputs);
// If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
if (retValue)
From 81853027e2841e3d3c6e30ef4b7071e5f487d914 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Oct 2021 02:33:30 +0000
Subject: [PATCH 125/223] Update dependencies from
https://github.com/dotnet/winforms build 20211011.11 (#5488)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21510.5 to 6.0.0-rtm.21511.12 (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 0f30a728808..0d795ba3064 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50
+ 5388194e562bf0d5c6f3eaca2af88b017f843e1c
-
+
https://github.com/dotnet/winforms
- ad1df8fd7c09ebabe3f6c6c41fad82cff43a3b50
+ 5388194e562bf0d5c6f3eaca2af88b017f843e1c
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
-
+
https://github.com/dotnet/runtime
- b1aedd5a54d0c54ec12afe98a41979fb053998a5
+ d262c21063bbb5b385a776e4ce24f7132eb918dc
diff --git a/eng/Versions.props b/eng/Versions.props
index 22c016ed80e..faea70626c1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.2
+ 6.0.0-rtm.21511.11
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
4.6.0-preview4.19176.11
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
- 6.0.0-rtm.21510.5
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21511.12
From 61ef1d2ac226b6449588b95996c2280a2de458b1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Oct 2021 21:24:39 +0000
Subject: [PATCH 126/223] Update dependencies from
https://github.com/dotnet/winforms build 20211012.3 (#5494)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21511.12 to 6.0.0-rtm.21512.4 (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 0d795ba3064..dd4cda07ea7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 5388194e562bf0d5c6f3eaca2af88b017f843e1c
+ 29ece171d547bb736dec3bcd5882af3c5d03b7c4
-
+
https://github.com/dotnet/winforms
- 5388194e562bf0d5c6f3eaca2af88b017f843e1c
+ 29ece171d547bb736dec3bcd5882af3c5d03b7c4
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
-
+
https://github.com/dotnet/runtime
- d262c21063bbb5b385a776e4ce24f7132eb918dc
+ dcc4be529f69e670e8e709fdf1d9c00c52c5a388
diff --git a/eng/Versions.props b/eng/Versions.props
index faea70626c1..517233e33a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
- 6.0.0-rtm.21511.11
+ 6.0.0-rtm.21512.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
4.6.0-preview4.19176.11
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
- 6.0.0-rtm.21511.12
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.4
From 94c6ac00121c23d73a199255bbb565b492151ad2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Oct 2021 23:55:43 +0000
Subject: [PATCH 127/223] Update dependencies from
https://github.com/dotnet/winforms build 20211012.5 (#5497)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.4 to 6.0.0-rtm.21512.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 dd4cda07ea7..c2a1bfd9bc9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 29ece171d547bb736dec3bcd5882af3c5d03b7c4
+ 30725d9b3d8c578a113b95cff296c08a0e9458b4
-
+
https://github.com/dotnet/winforms
- 29ece171d547bb736dec3bcd5882af3c5d03b7c4
+ 30725d9b3d8c578a113b95cff296c08a0e9458b4
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
-
+
https://github.com/dotnet/runtime
- dcc4be529f69e670e8e709fdf1d9c00c52c5a388
+ 12fb2c3a2e11596268e58f087728eed53acfced3
diff --git a/eng/Versions.props b/eng/Versions.props
index 517233e33a1..9d791e47450 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.3
+ 6.0.0-rtm.21512.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
4.6.0-preview4.19176.11
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
- 6.0.0-rtm.21512.4
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21512.8
From 1e2208c2dc47e0936e6feed8e238e9fb17c192aa Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 17:52:35 +0000
Subject: [PATCH 128/223] Update dependencies from
https://github.com/dotnet/winforms build 20211013.2 (#5500)
[release/6.0] 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 c2a1bfd9bc9..bb841f41a76 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 30725d9b3d8c578a113b95cff296c08a0e9458b4
+ 3f9309ef8e7089b447758c963fc67c9984566f86
-
+
https://github.com/dotnet/winforms
- 30725d9b3d8c578a113b95cff296c08a0e9458b4
+ 3f9309ef8e7089b447758c963fc67c9984566f86
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d791e47450..801a6ab36c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21512.5
+ 6.0.0-rtm.21513.2
From 0c481053a0cc1fe183406553e86e9c58270fefed Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 19:37:07 +0000
Subject: [PATCH 129/223] Update dependencies from
https://github.com/dotnet/arcade build 20211013.3 (#5502)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
global.json | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bb841f41a76..cc51f1d8996 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- e58cb829bf6d9c340b4a0c100956e2995d792aa2
+ 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
-
+
https://github.com/dotnet/arcade
- e58cb829bf6d9c340b4a0c100956e2995d792aa2
+ 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
-
+
https://github.com/dotnet/arcade
- e58cb829bf6d9c340b4a0c100956e2995d792aa2
+ 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
-
+
https://github.com/dotnet/arcade
- e58cb829bf6d9c340b4a0c100956e2995d792aa2
+ 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
-
+
https://github.com/dotnet/arcade
- e58cb829bf6d9c340b4a0c100956e2995d792aa2
+ 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
diff --git a/eng/Versions.props b/eng/Versions.props
index 801a6ab36c4..55e01219f65 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21507.1
- 6.0.0-beta.21507.1
- 6.0.0-beta.21507.1
+ 6.0.0-beta.21513.3
+ 6.0.0-beta.21513.3
+ 6.0.0-beta.21513.3
diff --git a/global.json b/global.json
index 6b294c409c4..bdf1a266e7b 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21507.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21507.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21513.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21513.3"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
From 29ef6eb5ffad62b8e78b81cc0059bd85bdee8b49 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 20:45:39 +0000
Subject: [PATCH 130/223] Update dependencies from
https://github.com/dotnet/winforms build 20211013.12 (#5504)
[release/6.0] 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 cc51f1d8996..90c0434eeac 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 3f9309ef8e7089b447758c963fc67c9984566f86
+ 14ae9f8acb98a206a7933d6939efd3c509252c11
-
+
https://github.com/dotnet/winforms
- 3f9309ef8e7089b447758c963fc67c9984566f86
+ 14ae9f8acb98a206a7933d6939efd3c509252c11
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 55e01219f65..769a68eef56 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21513.2
+ 6.0.0-rtm.21513.12
From b0c4dcefaeb43ccb542717da03a62f2bb9a17b4f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 00:05:51 +0000
Subject: [PATCH 131/223] Update dependencies from
https://github.com/dotnet/winforms build 20211013.15 (#5506)
[release/6.0] 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 90c0434eeac..46a78e5408d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 14ae9f8acb98a206a7933d6939efd3c509252c11
+ b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08
-
+
https://github.com/dotnet/winforms
- 14ae9f8acb98a206a7933d6939efd3c509252c11
+ b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 769a68eef56..570682a907f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21513.12
+ 6.0.0-rtm.21513.15
From d7d679c5fe180b390c59fb7230d75c92838cf27a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 00:25:47 +0000
Subject: [PATCH 132/223] Update dependencies from
https://github.com/dotnet/winforms build 20211013.16 (#5507)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.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 46a78e5408d..12cc09b83d2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08
+ e60da7787b5cf633ceaa8ec4bd04496136168926
-
+
https://github.com/dotnet/winforms
- b7b6ae8a723c3d0ebe230d05a1f9de1fff225f08
+ e60da7787b5cf633ceaa8ec4bd04496136168926
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
-
+
https://github.com/dotnet/runtime
- 12fb2c3a2e11596268e58f087728eed53acfced3
+ 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
diff --git a/eng/Versions.props b/eng/Versions.props
index 570682a907f..7e8117c0a57 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.15
+ 6.0.0-rtm.21513.16
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
4.6.0-preview4.19176.11
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
- 6.0.0-rtm.21512.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.8
From bc889f2530324da100e9e5395fc09007646db9ce Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 05:19:03 +0000
Subject: [PATCH 133/223] Update dependencies from
https://github.com/dotnet/winforms build 20211013.19 (#5508)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.8 to 6.0.0-rtm.21513.22 (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 12cc09b83d2..33dfda46c50 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- e60da7787b5cf633ceaa8ec4bd04496136168926
+ 69eebc37f171f3d6cee7ff6d63c20762b70b685e
-
+
https://github.com/dotnet/winforms
- e60da7787b5cf633ceaa8ec4bd04496136168926
+ 69eebc37f171f3d6cee7ff6d63c20762b70b685e
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
-
+
https://github.com/dotnet/runtime
- 77fe2e0fed0bd7648087c3839c4d3d4ee0cc82a2
+ 29dad028278ad8332592960dbe3a3a241f02a500
diff --git a/eng/Versions.props b/eng/Versions.props
index 7e8117c0a57..1b909208b36 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.16
+ 6.0.0-rtm.21513.19
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
4.6.0-preview4.19176.11
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
- 6.0.0-rtm.21513.8
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.22
From 9a0ced6bd2a801f76e79e4f6835bfe2f6e031bc5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 18:15:57 +0000
Subject: [PATCH 134/223] Update dependencies from
https://github.com/dotnet/winforms build 20211014.5 (#5514)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.22 to 6.0.0-rtm.21513.26 (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 33dfda46c50..5d07bfb84c2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 69eebc37f171f3d6cee7ff6d63c20762b70b685e
+ 27bd0071318df622d602e9416183cb70ad6d031a
-
+
https://github.com/dotnet/winforms
- 69eebc37f171f3d6cee7ff6d63c20762b70b685e
+ 27bd0071318df622d602e9416183cb70ad6d031a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
-
+
https://github.com/dotnet/runtime
- 29dad028278ad8332592960dbe3a3a241f02a500
+ ae31427bf065a1573c51f710633fe597cd359d0a
diff --git a/eng/Versions.props b/eng/Versions.props
index 1b909208b36..189929d08ab 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.19
+ 6.0.0-rtm.21514.5
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
4.6.0-preview4.19176.11
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
- 6.0.0-rtm.21513.22
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21513.26
From c5ad026a7e180bda4f801a7e99ceab2aab9e602f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 23:25:05 +0000
Subject: [PATCH 135/223] Update dependencies from
https://github.com/dotnet/winforms build 20211014.12 (#5515)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.7 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21513.26 to 6.0.0-rtm.21514.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 5d07bfb84c2..761a6cfd6e7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 27bd0071318df622d602e9416183cb70ad6d031a
+ 32a70708ece8e200928f009637db9a423897c1de
-
+
https://github.com/dotnet/winforms
- 27bd0071318df622d602e9416183cb70ad6d031a
+ 32a70708ece8e200928f009637db9a423897c1de
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
-
+
https://github.com/dotnet/runtime
- ae31427bf065a1573c51f710633fe597cd359d0a
+ 892555a19b8b815f64406c7f9b4c44ec89cefaf7
diff --git a/eng/Versions.props b/eng/Versions.props
index 189929d08ab..c7db13f5087 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.5
+ 6.0.0-rtm.21514.12
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
4.6.0-preview4.19176.11
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
- 6.0.0-rtm.21513.26
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21514.7
From 396accedcec6c2fdd18a0e7cd027f6f7db1b3927 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Oct 2021 01:14:54 +0000
Subject: [PATCH 136/223] Update dependencies from
https://github.com/dotnet/winforms build 20211014.16 (#5516)
[release/6.0] 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 761a6cfd6e7..e7f08f0d7f5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 32a70708ece8e200928f009637db9a423897c1de
+ 1eab25c83581a91e7c808aed960b0e27cefc54c9
-
+
https://github.com/dotnet/winforms
- 32a70708ece8e200928f009637db9a423897c1de
+ 1eab25c83581a91e7c808aed960b0e27cefc54c9
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c7db13f5087..f7aa5bf27e6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21514.12
+ 6.0.0-rtm.21514.16
From ab1debe519b68f533df9f3d3e3ecd2ea20a8378e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 16 Oct 2021 00:28:46 +0000
Subject: [PATCH 137/223] Update dependencies from
https://github.com/dotnet/arcade build 20211015.3 (#5519)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
global.json | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e7f08f0d7f5..4ab1aec81b6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
+ f389f732d8cdca8ee1e38a534cf10c8c3182ba39
-
+
https://github.com/dotnet/arcade
- 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
+ f389f732d8cdca8ee1e38a534cf10c8c3182ba39
-
+
https://github.com/dotnet/arcade
- 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
+ f389f732d8cdca8ee1e38a534cf10c8c3182ba39
-
+
https://github.com/dotnet/arcade
- 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
+ f389f732d8cdca8ee1e38a534cf10c8c3182ba39
-
+
https://github.com/dotnet/arcade
- 6f356ed4df5eebeb9000924b2b00a7b7a2f027a0
+ f389f732d8cdca8ee1e38a534cf10c8c3182ba39
diff --git a/eng/Versions.props b/eng/Versions.props
index f7aa5bf27e6..12c3263da4e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21513.3
- 6.0.0-beta.21513.3
- 6.0.0-beta.21513.3
+ 6.0.0-beta.21515.3
+ 6.0.0-beta.21515.3
+ 6.0.0-beta.21515.3
diff --git a/global.json b/global.json
index bdf1a266e7b..05f9804a8dc 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21513.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21513.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21515.3"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
From ce39fca1fa8e238dfb271f55673d4ea4483ba605 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 02:09:22 +0000
Subject: [PATCH 138/223] Update dependencies from
https://github.com/dotnet/winforms build 20211017.3 (#5523)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.15 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21514.7 to 6.0.0-rtm.21515.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 4ab1aec81b6..e87f48c53f9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 1eab25c83581a91e7c808aed960b0e27cefc54c9
+ a88f722b0da7ece5b5e0650f6e84c5239ffcb98d
-
+
https://github.com/dotnet/winforms
- 1eab25c83581a91e7c808aed960b0e27cefc54c9
+ a88f722b0da7ece5b5e0650f6e84c5239ffcb98d
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
-
+
https://github.com/dotnet/runtime
- 892555a19b8b815f64406c7f9b4c44ec89cefaf7
+ a1c550c1228af5b381dc517483ae89ed161df153
diff --git a/eng/Versions.props b/eng/Versions.props
index 12c3263da4e..ab46044714f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
- 6.0.0-rtm.21514.16
+ 6.0.0-rtm.21517.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
4.6.0-preview4.19176.11
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
- 6.0.0-rtm.21514.7
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21515.15
From 25a68a19de0de45ade5015f0db75aac0092dede6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 02:24:47 +0000
Subject: [PATCH 139/223] Update dependencies from
https://github.com/dotnet/winforms build 20211017.6 (#5525)
[release/6.0] 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 e87f48c53f9..ec9aa9ace20 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- a88f722b0da7ece5b5e0650f6e84c5239ffcb98d
+ 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726
-
+
https://github.com/dotnet/winforms
- a88f722b0da7ece5b5e0650f6e84c5239ffcb98d
+ 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index ab46044714f..14466392cb0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21517.3
+ 6.0.0-rtm.21517.6
From 918ee86568586e48678db572165154ea7da8c713 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 08:38:26 +0000
Subject: [PATCH 140/223] Update dependencies from
https://github.com/dotnet/winforms build 20211018.2 (#5529)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.15 to 6.0.0-rtm.21517.2 (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 ec9aa9ace20..7bc1c060813 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726
+ 8f0e966c73a333e61158431ee07b50e4226c2489
-
+
https://github.com/dotnet/winforms
- 4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726
+ 8f0e966c73a333e61158431ee07b50e4226c2489
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
-
+
https://github.com/dotnet/runtime
- a1c550c1228af5b381dc517483ae89ed161df153
+ 92ff02435693486da161626246f016b4f1e7b8e8
diff --git a/eng/Versions.props b/eng/Versions.props
index 14466392cb0..f708b4c8bdc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.6
+ 6.0.0-rtm.21518.2
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
4.6.0-preview4.19176.11
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
- 6.0.0-rtm.21515.15
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21517.2
From 9b2f3bf0eb86fa13478b7e951c3d8cbaacad31c3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 23:35:14 +0000
Subject: [PATCH 141/223] Update dependencies from
https://github.com/dotnet/winforms build 20211018.6 (#5534)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21517.2 to 6.0.0-rtm.21518.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 7bc1c060813..04156229684 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 8f0e966c73a333e61158431ee07b50e4226c2489
+ 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2
-
+
https://github.com/dotnet/winforms
- 8f0e966c73a333e61158431ee07b50e4226c2489
+ 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
-
+
https://github.com/dotnet/runtime
- 92ff02435693486da161626246f016b4f1e7b8e8
+ ac21bbf3c2dabc2c424930acb00c4c0fac383f34
diff --git a/eng/Versions.props b/eng/Versions.props
index f708b4c8bdc..76cd1f7e837 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.2
+ 6.0.0-rtm.21518.6
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
4.6.0-preview4.19176.11
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
- 6.0.0-rtm.21517.2
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.8
From f132a103cbf5e334699485b547dcac564c9e111f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Oct 2021 00:46:08 +0000
Subject: [PATCH 142/223] Update dependencies from
https://github.com/dotnet/winforms build 20211018.9 (#5537)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.8 to 6.0.0-rtm.21518.12 (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 04156229684..2391c56712b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2
+ e73e15755db6f219e05030ca650debd5b5df8e4c
-
+
https://github.com/dotnet/winforms
- 7f142cb2881f5ad828e2ded52903f6e0c0ca7fb2
+ e73e15755db6f219e05030ca650debd5b5df8e4c
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
-
+
https://github.com/dotnet/runtime
- ac21bbf3c2dabc2c424930acb00c4c0fac383f34
+ 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
diff --git a/eng/Versions.props b/eng/Versions.props
index 76cd1f7e837..27c4b8c7ce7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.6
+ 6.0.0-rtm.21518.9
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
4.6.0-preview4.19176.11
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
- 6.0.0-rtm.21518.8
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21518.12
From d37c1f5613110dbcd3d735e2723bb8b610acc5cd Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Mon, 18 Oct 2021 19:06:40 -0700
Subject: [PATCH 143/223] [release/6.0] WPF projects that use a versioned
custom SDK fail to build (#5536)
* Port changes from https://github.com/dotnet/wpf/pull/5426 to release/6.0
* WPF projects that use a versioned custom SDK fail to build (#5426)
* Fix build when using and SDK that comes from a PackageReference
* Update custom Sdk attribute version parsing to match msbuild
* Use SdkReference.TryParse
Authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
---
.../GenerateTemporaryTargetAssembly.cs | 66 ++++++++++++++-----
1 file changed, 48 insertions(+), 18 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
index 500e15350a7..80a436dce22 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
@@ -757,29 +757,33 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
}
XmlNode root = xmlProjectDoc.DocumentElement;
-
+
for (int i = 0; i < root.Attributes.Count; i++)
{
XmlAttribute xmlAttribute = root.Attributes[i] as XmlAttribute;
if (xmlAttribute.Name.Equals("Sdk", StringComparison.OrdinalIgnoreCase))
{
- //
+ //
+ //
+ //
+
+ string sdkValue = xmlAttribute.Value;
+
+ if (!SdkReference.TryParse(sdkValue, out SdkReference sdkReference))
+ return;
// Remove Sdk attribute
- var sdkValue = xmlAttribute.Value;
root.Attributes.Remove(xmlAttribute);
//
// Add explicit top import
//
- //
+ //
+ //
+ //
//
- XmlNode nodeImportProps = xmlProjectDoc.CreateElement("Import", root.NamespaceURI);
- XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project");
- projectAttribute.Value = "Sdk.props";
- nodeImportProps.Attributes.Append(projectAttribute);
- nodeImportProps.Attributes.Append(xmlAttribute);
+ XmlNode nodeImportProps = CreateImportProjectSdkNode(xmlProjectDoc, "Sdk.props", sdkReference);
// Prepend this Import to the root of the XML document
root.PrependChild(nodeImportProps);
@@ -787,15 +791,11 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
//
// Add explicit bottom import
//
- //
+ //
+ //
+ //
+ XmlNode nodeImportTargets = CreateImportProjectSdkNode(xmlProjectDoc, "Sdk.targets", sdkReference);
// Append this Import to the end of the XML document
root.AppendChild(nodeImportTargets);
@@ -803,6 +803,36 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
}
}
+ // Creates an XmlNode that contains an Import Project element
+ //
+ //
+ static XmlNode CreateImportProjectSdkNode(XmlDocument xmlProjectDoc, string projectAttributeValue, SdkReference sdkReference)
+ {
+ XmlNode nodeImport = xmlProjectDoc.CreateElement("Import", xmlProjectDoc.DocumentElement.NamespaceURI);
+ XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project");
+ projectAttribute.Value = projectAttributeValue;
+ XmlAttribute sdkAttributeProps = xmlProjectDoc.CreateAttribute("Sdk");
+ sdkAttributeProps.Value = sdkReference.Name;
+ nodeImport.Attributes.Append(projectAttribute);
+ nodeImport.Attributes.Append(sdkAttributeProps);
+
+ if (!string.IsNullOrEmpty(sdkReference.Version))
+ {
+ XmlAttribute sdkVersionAttributeProps = xmlProjectDoc.CreateAttribute("Version");
+ sdkVersionAttributeProps.Value = sdkReference.Version;
+ nodeImport.Attributes.Append(sdkVersionAttributeProps);
+ }
+
+ if (!string.IsNullOrEmpty(sdkReference.MinimumVersion))
+ {
+ XmlAttribute sdkVersionAttributeProps = xmlProjectDoc.CreateAttribute("MinimumVersion");
+ sdkVersionAttributeProps.Value = sdkReference.MinimumVersion;
+ nodeImport.Attributes.Append(sdkVersionAttributeProps);
+ }
+
+ return nodeImport;
+ }
+
#endregion Private Methods
From bdf130986ea33f8a3d77d27fe479493aa2e46a79 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Oct 2021 23:50:11 +0000
Subject: [PATCH 144/223] Update dependencies from
https://github.com/dotnet/arcade build 20211019.3 (#5542)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
global.json | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2391c56712b..0fc31a5c484 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- f389f732d8cdca8ee1e38a534cf10c8c3182ba39
+ 85f3aa16d8797b5020f1fda11df1a958feb5f8df
-
+
https://github.com/dotnet/arcade
- f389f732d8cdca8ee1e38a534cf10c8c3182ba39
+ 85f3aa16d8797b5020f1fda11df1a958feb5f8df
-
+
https://github.com/dotnet/arcade
- f389f732d8cdca8ee1e38a534cf10c8c3182ba39
+ 85f3aa16d8797b5020f1fda11df1a958feb5f8df
-
+
https://github.com/dotnet/arcade
- f389f732d8cdca8ee1e38a534cf10c8c3182ba39
+ 85f3aa16d8797b5020f1fda11df1a958feb5f8df
-
+
https://github.com/dotnet/arcade
- f389f732d8cdca8ee1e38a534cf10c8c3182ba39
+ 85f3aa16d8797b5020f1fda11df1a958feb5f8df
diff --git a/eng/Versions.props b/eng/Versions.props
index 27c4b8c7ce7..d9833c2637c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21515.3
- 6.0.0-beta.21515.3
- 6.0.0-beta.21515.3
+ 6.0.0-beta.21519.3
+ 6.0.0-beta.21519.3
+ 6.0.0-beta.21519.3
diff --git a/global.json b/global.json
index 05f9804a8dc..f3262108675 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21515.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21519.3"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
From eee7eff2c7837b56fdb7f313540de74bc1b41a41 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 00:54:19 +0000
Subject: [PATCH 145/223] Update dependencies from
https://github.com/dotnet/winforms build 20211019.4 (#5543)
[release/6.0] 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 0fc31a5c484..dd97af72ef3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- e73e15755db6f219e05030ca650debd5b5df8e4c
+ 080dcacb82db540cc26e5bf9882c6af9320ba535
-
+
https://github.com/dotnet/winforms
- e73e15755db6f219e05030ca650debd5b5df8e4c
+ 080dcacb82db540cc26e5bf9882c6af9320ba535
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index d9833c2637c..fbcf8b5be06 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21518.9
+ 6.0.0-rtm.21519.4
From 030aa5b7384b677fd186778a6f02de1e35ff6de7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 06:21:34 +0000
Subject: [PATCH 146/223] Update dependencies from
https://github.com/dotnet/winforms build 20211019.8 (#5545)
[release/6.0] 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 dd97af72ef3..fbf74161f8b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 080dcacb82db540cc26e5bf9882c6af9320ba535
+ ed24788425dcfcec87d7c23cd4574def3556d504
-
+
https://github.com/dotnet/winforms
- 080dcacb82db540cc26e5bf9882c6af9320ba535
+ ed24788425dcfcec87d7c23cd4574def3556d504
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index fbcf8b5be06..34483f0e761 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21519.4
+ 6.0.0-rtm.21519.8
From ae12b52aefb05386eb24d451ae7c12f51d7a5cad Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 17:31:01 +0000
Subject: [PATCH 147/223] Update dependencies from
https://github.com/dotnet/winforms build 20211020.3 (#5551)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.12 to 6.0.0 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21519.16 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 5 +++
eng/Version.Details.xml | 76 ++++++++++++++++++++---------------------
eng/Versions.props | 36 +++++++++----------
3 files changed, 61 insertions(+), 56 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 2a0f97c3e5a..af1f3811a6e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,6 +3,11 @@
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fbf74161f8b..084ed59c648 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,85 +1,85 @@
-
+
https://github.com/dotnet/winforms
- ed24788425dcfcec87d7c23cd4574def3556d504
+ 26b0562b63250f26d0d516985f5633486e1d8263
-
+
https://github.com/dotnet/winforms
- ed24788425dcfcec87d7c23cd4574def3556d504
+ 26b0562b63250f26d0d516985f5633486e1d8263
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
bf6f24c075ff5315d0ec0e5359138ee796b0491c
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
-
+
https://github.com/dotnet/runtime
- 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7
+ 80ed1bd38cc6137edd33b03e2655c96b98992094
diff --git a/eng/Versions.props b/eng/Versions.props
index 34483f0e761..489464d20e6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,38 +5,38 @@
rtm
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
+ 6.0.0
+ 6.0.0
- 6.0.0-rtm.21519.8
+ 6.0.0-rtm.21520.3
5.0.0-alpha1.19562.1
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
+ 6.0.0
+ 6.0.0
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
+ 6.0.0-rtm.21519.16
+ 6.0.0
+ 6.0.0
+ 6.0.0
+ 6.0.0
+ 6.0.0
+ 6.0.0
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
+ 6.0.0
+ 6.0.0
+ 6.0.0
4.6.0-preview4.19176.11
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
- 6.0.0-rtm.21518.12
+ 6.0.0
+ 6.0.0
+ 6.0.0
From 66330e8414cc629901d540fadd00014e362a4a46 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 20:24:05 +0000
Subject: [PATCH 148/223] Update dependencies from
https://github.com/dotnet/winforms build 20211020.5 (#5552)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21519.16 to 6.0.0-rtm.21520.5 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 2 +-
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index af1f3811a6e..402ff724a3b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 084ed59c648..5ad756dba6e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,53 @@
-
+
https://github.com/dotnet/winforms
- 26b0562b63250f26d0d516985f5633486e1d8263
+ b6be5a85579eef27ff2c278c58f4a45bfbe1d96b
-
+
https://github.com/dotnet/winforms
- 26b0562b63250f26d0d516985f5633486e1d8263
+ b6be5a85579eef27ff2c278c58f4a45bfbe1d96b
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -55,31 +55,31 @@
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
-
+
https://github.com/dotnet/runtime
- 80ed1bd38cc6137edd33b03e2655c96b98992094
+ c86a857c3a0445af75aa10a26b151c0447d4ed7a
diff --git a/eng/Versions.props b/eng/Versions.props
index 489464d20e6..6a4076d906d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21520.3
+ 6.0.0-rtm.21520.5
@@ -20,7 +20,7 @@
- 6.0.0-rtm.21519.16
+ 6.0.0-rtm.21520.5
6.0.0
6.0.0
6.0.0
From eecd6abb1caf1db7f6784fd47fcdf137f22c2a2d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 16:38:51 -0700
Subject: [PATCH 149/223] Update dependencies from
https://github.com/dotnet/winforms build 20211020.8 (#5554)
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.0-rtm.21520.5 -> To Version 6.0.0-rtm.21520.8
Co-authored-by: dotnet-maestro[bot]
---
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 5ad756dba6e..b46180dc815 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- b6be5a85579eef27ff2c278c58f4a45bfbe1d96b
+ ecc9b344a0e564490abfd150efa4f4e9fd2c51bc
-
+
https://github.com/dotnet/winforms
- b6be5a85579eef27ff2c278c58f4a45bfbe1d96b
+ ecc9b344a0e564490abfd150efa4f4e9fd2c51bc
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 6a4076d906d..92ba4a7bc48 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21520.5
+ 6.0.0-rtm.21520.8
From 7dba431f76d513ae009c58a2c588e7be5ac2dd45 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 21 Oct 2021 04:13:44 +0000
Subject: [PATCH 150/223] Update dependencies from
https://github.com/dotnet/winforms build 20211020.13 (#5556)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.5 to 6.0.0-rtm.21520.9 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 2 +-
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 402ff724a3b..1301ae080f8 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b46180dc815..886135ef739 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,53 @@
-
+
https://github.com/dotnet/winforms
- ecc9b344a0e564490abfd150efa4f4e9fd2c51bc
+ a4e643851b62969e46b9a208f9d32dfde6c93b95
-
+
https://github.com/dotnet/winforms
- ecc9b344a0e564490abfd150efa4f4e9fd2c51bc
+ a4e643851b62969e46b9a208f9d32dfde6c93b95
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -55,31 +55,31 @@
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
-
+
https://github.com/dotnet/runtime
- c86a857c3a0445af75aa10a26b151c0447d4ed7a
+ 6f41165853278914d1a28d7f325ebe04ab78ac07
diff --git a/eng/Versions.props b/eng/Versions.props
index 92ba4a7bc48..9ffab46dbfc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21520.8
+ 6.0.0-rtm.21520.13
@@ -20,7 +20,7 @@
- 6.0.0-rtm.21520.5
+ 6.0.0-rtm.21520.9
6.0.0
6.0.0
6.0.0
From b027d9f7ecc8e22204c240cb49a20eb44ecfe395 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 21 Oct 2021 19:18:12 +0000
Subject: [PATCH 151/223] Update dependencies from
https://github.com/dotnet/winforms build 20211021.2 (#5559)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.4 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 2 +-
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 1301ae080f8..f7c0946137f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 886135ef739..9d953248574 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,53 @@
-
+
https://github.com/dotnet/winforms
- a4e643851b62969e46b9a208f9d32dfde6c93b95
+ 7dd082abb4ab42044f668a383cde7887e1668c51
-
+
https://github.com/dotnet/winforms
- a4e643851b62969e46b9a208f9d32dfde6c93b95
+ 7dd082abb4ab42044f668a383cde7887e1668c51
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -55,31 +55,31 @@
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
-
+
https://github.com/dotnet/runtime
- 6f41165853278914d1a28d7f325ebe04ab78ac07
+ 8da583575e2a2684c302adf228bac7954464ca0f
diff --git a/eng/Versions.props b/eng/Versions.props
index 9ffab46dbfc..2b89c9c7c47 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21520.13
+ 6.0.0-rtm.21521.2
@@ -20,7 +20,7 @@
- 6.0.0-rtm.21520.9
+ 6.0.0-rtm.21521.4
6.0.0
6.0.0
6.0.0
From 2a42b946fcf83be513e48659ac06bf445849cae2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 22 Oct 2021 02:17:40 +0000
Subject: [PATCH 152/223] Update dependencies from
https://github.com/dotnet/winforms build 20211021.6 (#5561)
[release/6.0] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILDAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.4 to 6.0.0-rtm.21521.6 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 2 +-
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index f7c0946137f..618e64d3391 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9d953248574..27279e6d0be 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,53 @@
-
+
https://github.com/dotnet/winforms
- 7dd082abb4ab42044f668a383cde7887e1668c51
+ 66cbb0e67e4838d008906d7372be0cf249793832
-
+
https://github.com/dotnet/winforms
- 7dd082abb4ab42044f668a383cde7887e1668c51
+ 66cbb0e67e4838d008906d7372be0cf249793832
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -55,31 +55,31 @@
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
-
+
https://github.com/dotnet/runtime
- 8da583575e2a2684c302adf228bac7954464ca0f
+ de751593a53e9ccaffef2420ad3d74727cad47aa
diff --git a/eng/Versions.props b/eng/Versions.props
index 2b89c9c7c47..e2b552ceedf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21521.2
+ 6.0.0-rtm.21521.6
@@ -20,7 +20,7 @@
- 6.0.0-rtm.21521.4
+ 6.0.0-rtm.21521.6
6.0.0
6.0.0
6.0.0
From 521865989ee4b5498da5305f7f82b721c1df0b03 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:11:41 +0000
Subject: [PATCH 153/223] Update dependencies from
https://github.com/dotnet/winforms build 20211022.1 (#5563)
[release/6.0] 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 27279e6d0be..3d37110bc11 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 66cbb0e67e4838d008906d7372be0cf249793832
+ b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc
-
+
https://github.com/dotnet/winforms
- 66cbb0e67e4838d008906d7372be0cf249793832
+ b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index e2b552ceedf..1ae7c037392 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21521.6
+ 6.0.0-rtm.21522.1
From 50b917f2ee6ca43e376fdba51a978bced5557440 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 22 Oct 2021 21:19:08 +0000
Subject: [PATCH 154/223] Update dependencies from
https://github.com/dotnet/winforms build 20211022.2 (#5564)
[release/6.0] 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 3d37110bc11..90ca1a4e266 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc
+ fe9a3e66980380b08028b714b1bc7c9aa9048ee9
-
+
https://github.com/dotnet/winforms
- b86c1518825c9a3c6d720466a7b4cc9ed6f3c9bc
+ fe9a3e66980380b08028b714b1bc7c9aa9048ee9
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ae7c037392..ab7427b472c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21522.1
+ 6.0.0-rtm.21522.2
From 3f75a67c752a116de292affae29a22bbb5b71b18 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 23 Oct 2021 12:07:24 -0700
Subject: [PATCH 155/223] Update dependencies from
https://github.com/dotnet/winforms build 20211023.1 (#5568)
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.0-rtm.21522.2 -> To Version 6.0.0-rtm.21523.1
Dependency coherency updates
System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.Private.Winforms
Co-authored-by: dotnet-maestro[bot]
---
NuGet.config | 2 +-
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 618e64d3391..c1ae94f6c23 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 90ca1a4e266..c096e7e3b91 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,53 @@
-
+
https://github.com/dotnet/winforms
- fe9a3e66980380b08028b714b1bc7c9aa9048ee9
+ d43e35d5224f12a335ff1a62d01e86b18a22d657
-
+
https://github.com/dotnet/winforms
- fe9a3e66980380b08028b714b1bc7c9aa9048ee9
+ d43e35d5224f12a335ff1a62d01e86b18a22d657
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -55,31 +55,31 @@
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://github.com/dotnet/runtime
- de751593a53e9ccaffef2420ad3d74727cad47aa
+ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
diff --git a/eng/Versions.props b/eng/Versions.props
index ab7427b472c..80f142632cc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21522.2
+ 6.0.0-rtm.21523.1
@@ -20,7 +20,7 @@
- 6.0.0-rtm.21521.6
+ 6.0.0-rtm.21522.10
6.0.0
6.0.0
6.0.0
From 29a4573d5ee0120e1aeccb6e68959a8824e6f795 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Wed, 3 Nov 2021 08:07:30 +0530
Subject: [PATCH 156/223] Update to 6.0.1 branding servicing
---
eng/Versions.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 80f142632cc..0ff7cafb389 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,8 +1,8 @@
- 6.0.0
- rtm
+ 6.0.1
+ servicing
6.0.0
From 10c4cdc82a2596e94536bec057531174b5bb6ec4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 10 Nov 2021 16:19:59 +0000
Subject: [PATCH 157/223] Update dependencies from
https://github.com/dotnet/arcade build 20211108.5 (#5680)
[release/6.0] Update dependencies from dotnet/arcade
---
NuGet.config | 1 -
eng/Version.Details.xml | 20 +++++++++----------
eng/Versions.props | 6 +++---
eng/common/templates/job/execute-sdl.yml | 2 +-
eng/common/templates/job/onelocbuild.yml | 2 +-
.../templates/job/source-index-stage1.yml | 2 +-
eng/common/templates/jobs/jobs.yml | 4 ++--
global.json | 4 ++--
8 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index c1ae94f6c23..53aa360281a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c096e7e3b91..cc8e0fd7a76 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
diff --git a/eng/Versions.props b/eng/Versions.props
index 0ff7cafb389..fde4be00f8c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21519.3
- 6.0.0-beta.21519.3
- 6.0.0-beta.21519.3
+ 6.0.0-beta.21558.5
+ 6.0.0-beta.21558.5
+ 6.0.0-beta.21558.5
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 69eb67849d7..4882dd93134 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -62,7 +62,7 @@ jobs:
pool:
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
- name: Hosted VS2017
+ vmImage: windows-2019
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
vmImage: windows-2019
steps:
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index e8bc77d2ebb..2b55a567f82 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,7 @@ parameters:
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 1cc0c29e4fd..d8990549e80 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -6,7 +6,7 @@ parameters:
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
condition: ''
dependsOn: ''
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index a1f8fce96ca..90015a7e5ae 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,7 +83,7 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
dependsOn:
- Asset_Registry_Publish
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
diff --git a/global.json b/global.json
index f3262108675..7573b274e65 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21519.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21558.5"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
From 7c6bd194fa91626622175258fe39ceb678fbd10b Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 10 Nov 2021 19:14:19 +0000
Subject: [PATCH 158/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.0 to 6.0.1-servicing.1.21559.10 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.0 to
6.0.1-servicing.1.21559.10 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21522.10 to
6.0.1-servicing.1.21559.10 (parent: Microsoft.Private.Winforms)
---
NuGet.config | 9 ++++++++-
eng/Version.Details.xml | 42 ++++++++++++++++++++---------------------
eng/Versions.props | 12 ++++++------
3 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 53aa360281a..dcc923c298e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,7 @@
+
@@ -15,5 +16,11 @@
-
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cc8e0fd7a76..7aa626fc270 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
- https://github.com/dotnet/winforms
- d43e35d5224f12a335ff1a62d01e86b18a22d657
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
+ ef7a9a865ee0fecd96035dcdd7174c4010ad1b2a
-
- https://github.com/dotnet/winforms
- d43e35d5224f12a335ff1a62d01e86b18a22d657
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
+ ef7a9a865ee0fecd96035dcdd7174c4010ad1b2a
https://github.com/dotnet/runtime
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
diff --git a/eng/Versions.props b/eng/Versions.props
index fde4be00f8c..1b2b21123d3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,19 +10,19 @@
- 6.0.0-rtm.21523.1
+ 6.0.1-servicing.21560.2
5.0.0-alpha1.19562.1
- 6.0.0
- 6.0.0
+ 6.0.1-servicing.1.21559.10
+ 6.0.1-servicing.1.21559.10
- 6.0.0-rtm.21522.10
- 6.0.0
- 6.0.0
+ 6.0.1-servicing.1.21559.10
+ 6.0.1
+ 6.0.1
6.0.0
6.0.0
6.0.0
From d0be61014a82e1064dd371c63b907aa69fb38c76 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 10 Nov 2021 22:32:39 +0000
Subject: [PATCH 159/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 7aa626fc270..eeaabd84a6b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ef7a9a865ee0fecd96035dcdd7174c4010ad1b2a
+ b13315f7f68eaa089a762a160b41f6c228f28048
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ef7a9a865ee0fecd96035dcdd7174c4010ad1b2a
+ b13315f7f68eaa089a762a160b41f6c228f28048
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1b2b21123d3..550961d94c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.1-servicing.21560.2
+ 6.0.1-servicing.21560.6
From 4ed9efdf099dddce684710a752c3547acaa46588 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 10 Nov 2021 23:38:56 +0000
Subject: [PATCH 160/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 eeaabd84a6b..27205e3d2c2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- b13315f7f68eaa089a762a160b41f6c228f28048
+ c7feb2f7eefa4baace09e2bd008a7d0110668d1d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- b13315f7f68eaa089a762a160b41f6c228f28048
+ c7feb2f7eefa4baace09e2bd008a7d0110668d1d
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 550961d94c7..7aeb41943a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.1-servicing.21560.6
+ 6.0.1-servicing.21560.7
From ae05800777e909751dd3feaacb8b3609ed057f83 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Thu, 11 Nov 2021 07:23:24 +0000
Subject: [PATCH 161/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.1.21559.10 to
6.0.1-servicing.1.21560.8 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.1-servicing.1.21559.10 to
6.0.1-servicing.1.21560.8 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.1.21559.10 to 6.0.1-servicing.1.21560.8 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index dcc923c298e..4ff052af088 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 27205e3d2c2..eb9c0e0a6c9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- c7feb2f7eefa4baace09e2bd008a7d0110668d1d
+ 55b0598a7e52c27841649667659489aa4b5f227d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- c7feb2f7eefa4baace09e2bd008a7d0110668d1d
+ 55b0598a7e52c27841649667659489aa4b5f227d
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
+ 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
+ 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
+ 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
+ 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3eaa3b56a58864ea3ee11a0c87f0dc7e0a766555
+ 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
diff --git a/eng/Versions.props b/eng/Versions.props
index 7aeb41943a1..16290441008 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21560.7
+ 6.0.1-servicing.21560.11
5.0.0-alpha1.19562.1
- 6.0.1-servicing.1.21559.10
- 6.0.1-servicing.1.21559.10
+ 6.0.1-servicing.1.21560.8
+ 6.0.1-servicing.1.21560.8
- 6.0.1-servicing.1.21559.10
+ 6.0.1-servicing.1.21560.8
6.0.1
6.0.1
6.0.0
From 519f4e491a10c540789d38f59542615f6ffd10a0 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Thu, 11 Nov 2021 20:22:20 +0000
Subject: [PATCH 162/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 eb9c0e0a6c9..5a2ce70a844 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 55b0598a7e52c27841649667659489aa4b5f227d
+ 370ac1a94ab208334847df3ef81efef22c595c87
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 55b0598a7e52c27841649667659489aa4b5f227d
+ 370ac1a94ab208334847df3ef81efef22c595c87
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 16290441008..add0c117a55 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.1-servicing.21560.11
+ 6.0.1-servicing.21561.2
From b487bf5e4a6a702e83b3ac0dd7cd73a0833a80dd Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Thu, 11 Nov 2021 23:35:47 +0000
Subject: [PATCH 163/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.1.21560.8 to 6.0.1-servicing.21561.3 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.1.21560.8 to 6.0.1-servicing.21561.3 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.1.21560.8 to 6.0.1-servicing.21561.3 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 30 +++++++++++++++---------------
eng/Versions.props | 10 +++++-----
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 4ff052af088..925d394c791 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5a2ce70a844..298bdec2818 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 370ac1a94ab208334847df3ef81efef22c595c87
+ 2800ba70f5c65b599adf21bab228ae31161f1765
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 370ac1a94ab208334847df3ef81efef22c595c87
+ 2800ba70f5c65b599adf21bab228ae31161f1765
https://github.com/dotnet/runtime
@@ -45,9 +45,9 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
- https://github.com/dotnet/runtime
- 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ d774aef05b82a7058917254ae9eec511ecbf74a6
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
+ d774aef05b82a7058917254ae9eec511ecbf74a6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
+ d774aef05b82a7058917254ae9eec511ecbf74a6
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
+ d774aef05b82a7058917254ae9eec511ecbf74a6
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
+ d774aef05b82a7058917254ae9eec511ecbf74a6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0fc8e7431c4e2013e7c5e91a72dab49bcba6a40c
+ d774aef05b82a7058917254ae9eec511ecbf74a6
diff --git a/eng/Versions.props b/eng/Versions.props
index add0c117a55..8e60dee2686 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,20 +10,20 @@
- 6.0.1-servicing.21561.2
+ 6.0.1-servicing.21561.7
5.0.0-alpha1.19562.1
- 6.0.1-servicing.1.21560.8
- 6.0.1-servicing.1.21560.8
+ 6.0.1-servicing.21561.3
+ 6.0.1-servicing.21561.3
- 6.0.1-servicing.1.21560.8
+ 6.0.1-servicing.21561.3
6.0.1
6.0.1
- 6.0.0
+ 6.0.1
6.0.0
6.0.0
6.0.0
From 7b309bdceca1c30b579a0fb82724212d90c34fd5 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Fri, 12 Nov 2021 03:38:32 +0000
Subject: [PATCH 164/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 298bdec2818..143f95ef489 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 2800ba70f5c65b599adf21bab228ae31161f1765
+ 30947e8e87d14cde70c58fd5a7299dcf03b40101
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 2800ba70f5c65b599adf21bab228ae31161f1765
+ 30947e8e87d14cde70c58fd5a7299dcf03b40101
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 8e60dee2686..2a692ad3c07 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.1-servicing.21561.7
+ 6.0.1-servicing.21561.10
From 1ebe6d72b737c157e4548734e906211202156c5b Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Sat, 13 Nov 2021 03:32:08 +0000
Subject: [PATCH 165/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21561.3 to 6.0.1-servicing.21562.10 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21561.3 to 6.0.1-servicing.21562.10 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21561.3 to 6.0.1-servicing.21562.10 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 925d394c791..13fd6af2f9f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 143f95ef489..da8a39b0332 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 30947e8e87d14cde70c58fd5a7299dcf03b40101
+ 36420b9bcb32b3ee549f9243926679abc3466f6a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 30947e8e87d14cde70c58fd5a7299dcf03b40101
+ 36420b9bcb32b3ee549f9243926679abc3466f6a
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d774aef05b82a7058917254ae9eec511ecbf74a6
+ 6de4589ae691b0a6fbcce69a243de77dfa43f894
diff --git a/eng/Versions.props b/eng/Versions.props
index 2a692ad3c07..d4537a04f05 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21561.10
+ 6.0.1-servicing.21562.3
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21561.3
- 6.0.1-servicing.21561.3
+ 6.0.1-servicing.21562.10
+ 6.0.1-servicing.21562.10
- 6.0.1-servicing.21561.3
+ 6.0.1-servicing.21562.10
6.0.1
6.0.1
6.0.1
From 9c813b748fd3a2524b381c6e5b9dc4d06863aed7 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Mon, 15 Nov 2021 09:26:56 +0000
Subject: [PATCH 166/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21562.10 to 6.0.1-servicing.21564.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21562.10 to 6.0.1-servicing.21564.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21562.10 to 6.0.1-servicing.21564.5 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 13fd6af2f9f..9ad92c130b7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index da8a39b0332..5a548b1c1e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 36420b9bcb32b3ee549f9243926679abc3466f6a
+ 6050520f6bb5a56a340e55ec565509cf41228c6f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 36420b9bcb32b3ee549f9243926679abc3466f6a
+ 6050520f6bb5a56a340e55ec565509cf41228c6f
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 6de4589ae691b0a6fbcce69a243de77dfa43f894
+ 357c80aef44b52066a256d0836f946f8f78aa292
diff --git a/eng/Versions.props b/eng/Versions.props
index d4537a04f05..99b73c23253 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21562.3
+ 6.0.1-servicing.21565.1
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21562.10
- 6.0.1-servicing.21562.10
+ 6.0.1-servicing.21564.5
+ 6.0.1-servicing.21564.5
- 6.0.1-servicing.21562.10
+ 6.0.1-servicing.21564.5
6.0.1
6.0.1
6.0.1
From cb5dfec3eb487410b70fcbda8c4269d80d84abe5 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Mon, 15 Nov 2021 23:36:25 +0000
Subject: [PATCH 167/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21564.5 to 6.0.1-servicing.21565.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21564.5 to 6.0.1-servicing.21565.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21564.5 to 6.0.1-servicing.21565.5 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 9ad92c130b7..f4f50188e5b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5a548b1c1e5..ed7fe5898bc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 6050520f6bb5a56a340e55ec565509cf41228c6f
+ 495df0bc629e83092f5b52b7f35c31c736da0a3a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 6050520f6bb5a56a340e55ec565509cf41228c6f
+ 495df0bc629e83092f5b52b7f35c31c736da0a3a
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 357c80aef44b52066a256d0836f946f8f78aa292
+ f130d26899319dcda691521f9b7bd5ea75a39c90
diff --git a/eng/Versions.props b/eng/Versions.props
index 99b73c23253..cadaf3284ff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21565.1
+ 6.0.1-servicing.21565.3
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21564.5
- 6.0.1-servicing.21564.5
+ 6.0.1-servicing.21565.5
+ 6.0.1-servicing.21565.5
- 6.0.1-servicing.21564.5
+ 6.0.1-servicing.21565.5
6.0.1
6.0.1
6.0.1
From 51fb95d53a3d389f1d715a0f2d3f610f36d24aea Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 16 Nov 2021 17:25:35 +0000
Subject: [PATCH 168/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21565.5 to 6.0.1-servicing.21565.18 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21565.5 to 6.0.1-servicing.21565.18 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21565.5 to 6.0.1-servicing.21565.18 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index f4f50188e5b..54e63f84395 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed7fe5898bc..3e5741c1995 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 495df0bc629e83092f5b52b7f35c31c736da0a3a
+ cd0976617d87b03064f6a0bf0ab48ea50ff8d8bc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 495df0bc629e83092f5b52b7f35c31c736da0a3a
+ cd0976617d87b03064f6a0bf0ab48ea50ff8d8bc
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f130d26899319dcda691521f9b7bd5ea75a39c90
+ 7280473880b4010b724bfcca78877dbafd202e2d
diff --git a/eng/Versions.props b/eng/Versions.props
index cadaf3284ff..55b3a576154 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21565.3
+ 6.0.1-servicing.21566.1
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21565.5
- 6.0.1-servicing.21565.5
+ 6.0.1-servicing.21565.18
+ 6.0.1-servicing.21565.18
- 6.0.1-servicing.21565.5
+ 6.0.1-servicing.21565.18
6.0.1
6.0.1
6.0.1
From 0350d04790959e8ebdd3ceab0d34a40f811f019d Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 17 Nov 2021 22:57:24 +0000
Subject: [PATCH 169/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21565.18 to 6.0.1-servicing.21567.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21565.18 to 6.0.1-servicing.21567.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.1 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.1 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21565.18 to 6.0.1-servicing.21567.5 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 54e63f84395..1d61606f62a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3e5741c1995..51bb54f12a9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- cd0976617d87b03064f6a0bf0ab48ea50ff8d8bc
+ 846205b4af05c7a200e1d203536fdc39994b9bd6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- cd0976617d87b03064f6a0bf0ab48ea50ff8d8bc
+ 846205b4af05c7a200e1d203536fdc39994b9bd6
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 7280473880b4010b724bfcca78877dbafd202e2d
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
diff --git a/eng/Versions.props b/eng/Versions.props
index 55b3a576154..59a08541a8f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.1-servicing.21566.1
+ 6.0.1-servicing.21567.5
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21565.18
- 6.0.1-servicing.21565.18
+ 6.0.1-servicing.21567.5
+ 6.0.1-servicing.21567.5
- 6.0.1-servicing.21565.18
+ 6.0.1-servicing.21567.5
6.0.1
6.0.1
6.0.1
From e31a2abbd18dfc88deb5a7a3546faedc60cb3c18 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 26 Nov 2021 02:49:54 +0000
Subject: [PATCH 170/223] Update dependencies from
https://github.com/dotnet/winforms build 20211111.11 (#5742)
[release/6.0] 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 cc8e0fd7a76..c2f2df1a21e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- d43e35d5224f12a335ff1a62d01e86b18a22d657
+ ccdf3563612dde7b63949d257d6ad852da7294df
-
+
https://github.com/dotnet/winforms
- d43e35d5224f12a335ff1a62d01e86b18a22d657
+ ccdf3563612dde7b63949d257d6ad852da7294df
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index fde4be00f8c..25c031cc2de 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.0-rtm.21523.1
+ 6.0.1-servicing.21561.11
From 5bfc26438e92e3d41bf3f9af05b0654621f00605 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 7 Dec 2021 12:30:01 -0800
Subject: [PATCH 171/223] Update branding to 6.0.2 (#5789)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 25c031cc2de..dcdf40be8b8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
- 6.0.1
+ 6.0.2
servicing
From 248894d8961a040d689ee986ebeac36945b9ee02 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 7 Dec 2021 23:27:21 +0000
Subject: [PATCH 172/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms
---
NuGet.config | 4 ++++
eng/Version.Details.xml | 8 ++++----
eng/Versions.props | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 1d61606f62a..db31c561b53 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,8 @@
+
+
@@ -20,6 +22,8 @@
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 51bb54f12a9..c352d0fff94 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 846205b4af05c7a200e1d203536fdc39994b9bd6
+ e710f8638b3be8795fe2c505f3a94c993540f4dc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 846205b4af05c7a200e1d203536fdc39994b9bd6
+ e710f8638b3be8795fe2c505f3a94c993540f4dc
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 59a08541a8f..bc98b09f738 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.1-servicing.21567.5
+ 6.0.2-servicing.21607.6
From 69e9748cfc732034ecf9be3b9276636ac35456ac Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 8 Dec 2021 03:03:59 +0000
Subject: [PATCH 173/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 c352d0fff94..2c0c3e67448 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- e710f8638b3be8795fe2c505f3a94c993540f4dc
+ 80d1711d9ba448fdc941b8792586c04d59a540f7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- e710f8638b3be8795fe2c505f3a94c993540f4dc
+ 80d1711d9ba448fdc941b8792586c04d59a540f7
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index bc98b09f738..5cdfc9cff2d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.2-servicing.21607.6
+ 6.0.2-servicing.21607.10
From 171becb82253caf590beb5f5c58602e52c3eb5fc Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 14 Dec 2021 01:41:51 +0000
Subject: [PATCH 174/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 2c0c3e67448..4c4b9d82120 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 80d1711d9ba448fdc941b8792586c04d59a540f7
+ 72bdd76209ee7ed57183791d56b5dda5ef925f9c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 80d1711d9ba448fdc941b8792586c04d59a540f7
+ 72bdd76209ee7ed57183791d56b5dda5ef925f9c
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5cdfc9cff2d..c94d63565a6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.2-servicing.21607.10
+ 6.0.2-servicing.21613.5
From 9a8901235521fc0908e1e81e99d5a795b79e5933 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 14 Dec 2021 21:38:58 +0000
Subject: [PATCH 175/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 4c4b9d82120..85f54fc1bf2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 72bdd76209ee7ed57183791d56b5dda5ef925f9c
+ 80a833be97374e932b38ab35095bacd3fe939eac
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 72bdd76209ee7ed57183791d56b5dda5ef925f9c
+ 80a833be97374e932b38ab35095bacd3fe939eac
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index e04a195d487..399f23fcded 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.2-servicing.21613.5
+ 6.0.2-servicing.21614.8
From 26bc3db68e71699a61b90407071aa53154711046 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Fri, 7 Jan 2022 18:10:26 +0000
Subject: [PATCH 176/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to
6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to
6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 8 ++------
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index db31c561b53..20e2e859823 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,9 +5,7 @@
-
-
-
+
@@ -21,9 +19,7 @@
-
-
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 85f54fc1bf2..0113d67e328 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 80a833be97374e932b38ab35095bacd3fe939eac
+ 54f9087b1833b07192c53a2c4fe5e20e39355097
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 80a833be97374e932b38ab35095bacd3fe939eac
+ 54f9087b1833b07192c53a2c4fe5e20e39355097
https://github.com/dotnet/runtime
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
diff --git a/eng/Versions.props b/eng/Versions.props
index 399f23fcded..077ef12d325 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,19 +10,19 @@
- 6.0.2-servicing.21614.8
+ 6.0.2-servicing.22056.8
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21567.5
- 6.0.1-servicing.21567.5
+ 6.0.2-servicing.22056.7
+ 6.0.2-servicing.22056.7
- 6.0.1-servicing.21567.5
- 6.0.1
- 6.0.1
+ 6.0.2-servicing.22056.7
+ 6.0.2
+ 6.0.2
6.0.1
6.0.0
6.0.0
From 7e293021e5b4a41d6ce6af5985b331f43d5cb955 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Fri, 7 Jan 2022 22:51:01 +0000
Subject: [PATCH 177/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22056.7 to
6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22056.7 to
6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 20e2e859823..41f3227bc0e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0113d67e328..78c0899aa37 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 54f9087b1833b07192c53a2c4fe5e20e39355097
+ 9ba3652cb52ab04993e403a9df73eba61015bd67
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 54f9087b1833b07192c53a2c4fe5e20e39355097
+ 9ba3652cb52ab04993e403a9df73eba61015bd67
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
+ 639c1b99f1f103baba14ae34f4473c7e315ef062
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
+ 639c1b99f1f103baba14ae34f4473c7e315ef062
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
+ 639c1b99f1f103baba14ae34f4473c7e315ef062
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
+ 639c1b99f1f103baba14ae34f4473c7e315ef062
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 72fb99ca39e0c8eeb9bbfc22930e38d6137a802b
+ 639c1b99f1f103baba14ae34f4473c7e315ef062
diff --git a/eng/Versions.props b/eng/Versions.props
index 077ef12d325..06e922d025d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22056.8
+ 6.0.2-servicing.22057.5
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22056.7
- 6.0.2-servicing.22056.7
+ 6.0.2-servicing.22057.4
+ 6.0.2-servicing.22057.4
- 6.0.2-servicing.22056.7
+ 6.0.2-servicing.22057.4
6.0.2
6.0.2
6.0.1
From 0931498bff9d022546d66815bd4b3c774dbc1a1f Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Sat, 8 Jan 2022 02:49:36 +0000
Subject: [PATCH 178/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.4 to
6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.4 to
6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 41f3227bc0e..7f720960bc2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78c0899aa37..dbaf516db18 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 9ba3652cb52ab04993e403a9df73eba61015bd67
+ ebaf5d4a51b5fb29fc77270dc05d2248ed0e43d1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 9ba3652cb52ab04993e403a9df73eba61015bd67
+ ebaf5d4a51b5fb29fc77270dc05d2248ed0e43d1
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 639c1b99f1f103baba14ae34f4473c7e315ef062
+ 0d4706a65e754419c144258e03d196fb4e48d44b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 639c1b99f1f103baba14ae34f4473c7e315ef062
+ 0d4706a65e754419c144258e03d196fb4e48d44b
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 639c1b99f1f103baba14ae34f4473c7e315ef062
+ 0d4706a65e754419c144258e03d196fb4e48d44b
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 639c1b99f1f103baba14ae34f4473c7e315ef062
+ 0d4706a65e754419c144258e03d196fb4e48d44b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 639c1b99f1f103baba14ae34f4473c7e315ef062
+ 0d4706a65e754419c144258e03d196fb4e48d44b
diff --git a/eng/Versions.props b/eng/Versions.props
index 06e922d025d..d4a07e068b7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22057.5
+ 6.0.2-servicing.22057.8
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22057.4
- 6.0.2-servicing.22057.4
+ 6.0.2-servicing.22057.9
+ 6.0.2-servicing.22057.9
- 6.0.2-servicing.22057.4
+ 6.0.2-servicing.22057.9
6.0.2
6.0.2
6.0.1
From 969fb279a9fad06f034f698ebede50fbbbdb5441 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Sat, 8 Jan 2022 06:25:58 +0000
Subject: [PATCH 179/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.9 to
6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.9 to
6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 7f720960bc2..e14c4170d2a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dbaf516db18..1a249f68e25 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ebaf5d4a51b5fb29fc77270dc05d2248ed0e43d1
+ 046b07801fb47c969a386cacf1d2499c472d7b16
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ebaf5d4a51b5fb29fc77270dc05d2248ed0e43d1
+ 046b07801fb47c969a386cacf1d2499c472d7b16
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0d4706a65e754419c144258e03d196fb4e48d44b
+ 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0d4706a65e754419c144258e03d196fb4e48d44b
+ 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0d4706a65e754419c144258e03d196fb4e48d44b
+ 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0d4706a65e754419c144258e03d196fb4e48d44b
+ 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0d4706a65e754419c144258e03d196fb4e48d44b
+ 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
diff --git a/eng/Versions.props b/eng/Versions.props
index d4a07e068b7..1eeed5da92f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22057.8
+ 6.0.2-servicing.22057.10
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22057.9
- 6.0.2-servicing.22057.9
+ 6.0.2-servicing.22057.14
+ 6.0.2-servicing.22057.14
- 6.0.2-servicing.22057.9
+ 6.0.2-servicing.22057.14
6.0.2
6.0.2
6.0.1
From e08b442235bbbb984e7f24d3c5c7812f13d6a0eb Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Mon, 10 Jan 2022 18:59:18 +0000
Subject: [PATCH 180/223] [internal/release/6.0] Update dependencies from
dnceng/internal/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 1a249f68e25..e624eb17475 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 046b07801fb47c969a386cacf1d2499c472d7b16
+ 2d30ebed86d5850200e761ec763785e3869154fb
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 046b07801fb47c969a386cacf1d2499c472d7b16
+ 2d30ebed86d5850200e761ec763785e3869154fb
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1eeed5da92f..e5bb078751a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
- 6.0.2-servicing.22057.10
+ 6.0.2-servicing.22060.3
From 420dd9dda10c9b0621dc9d8dbbec388d3b1ac385 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 11 Jan 2022 00:07:18 +0000
Subject: [PATCH 181/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.14 to
6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.14 to
6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index e14c4170d2a..d4ec5a52f3e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e624eb17475..993de9a026c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 2d30ebed86d5850200e761ec763785e3869154fb
+ bfff2b434943b05fd55eecb6f826d7c62f475ee3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 2d30ebed86d5850200e761ec763785e3869154fb
+ bfff2b434943b05fd55eecb6f826d7c62f475ee3
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
+ b974f5c7600df75fa04fba610e0abae160aa4daf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
+ b974f5c7600df75fa04fba610e0abae160aa4daf
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
+ b974f5c7600df75fa04fba610e0abae160aa4daf
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
+ b974f5c7600df75fa04fba610e0abae160aa4daf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3e07e042d5ff7a21bd9111420de248bd6e16d4a9
+ b974f5c7600df75fa04fba610e0abae160aa4daf
diff --git a/eng/Versions.props b/eng/Versions.props
index e5bb078751a..82d82037d49 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22060.3
+ 6.0.2-servicing.22060.6
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22057.14
- 6.0.2-servicing.22057.14
+ 6.0.2-servicing.22060.7
+ 6.0.2-servicing.22060.7
- 6.0.2-servicing.22057.14
+ 6.0.2-servicing.22060.7
6.0.2
6.0.2
6.0.1
From a4d988d30ba9813b79863b741272b96e144a878e Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 11 Jan 2022 04:13:22 +0000
Subject: [PATCH 182/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.7 to
6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.7 to
6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index d4ec5a52f3e..5c73d3db444 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 993de9a026c..450e71d376b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- bfff2b434943b05fd55eecb6f826d7c62f475ee3
+ 5b031f00ece03d4ef83bacedc2f9d86b49f4207e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- bfff2b434943b05fd55eecb6f826d7c62f475ee3
+ 5b031f00ece03d4ef83bacedc2f9d86b49f4207e
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- b974f5c7600df75fa04fba610e0abae160aa4daf
+ f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- b974f5c7600df75fa04fba610e0abae160aa4daf
+ f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- b974f5c7600df75fa04fba610e0abae160aa4daf
+ f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- b974f5c7600df75fa04fba610e0abae160aa4daf
+ f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- b974f5c7600df75fa04fba610e0abae160aa4daf
+ f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
diff --git a/eng/Versions.props b/eng/Versions.props
index 82d82037d49..f278b8d04fc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22060.6
+ 6.0.2-servicing.22060.8
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22060.7
- 6.0.2-servicing.22060.7
+ 6.0.2-servicing.22060.9
+ 6.0.2-servicing.22060.9
- 6.0.2-servicing.22060.7
+ 6.0.2-servicing.22060.9
6.0.2
6.0.2
6.0.1
From 9bc6a37848dfe0a44a36dad9e47b8153d2cc240c Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 11 Jan 2022 20:29:09 +0000
Subject: [PATCH 183/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.9 to
6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.9 to
6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 5c73d3db444..96bc2305d0a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 450e71d376b..1ca7ac2e4b7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 5b031f00ece03d4ef83bacedc2f9d86b49f4207e
+ c89b792c93eba7098b3d2d887137c57c2a7e9065
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 5b031f00ece03d4ef83bacedc2f9d86b49f4207e
+ c89b792c93eba7098b3d2d887137c57c2a7e9065
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
+ 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
+ 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
+ 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
+ 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- f5289728f4ffa5bc5635629a1e5d4a5d421c1a6e
+ 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
diff --git a/eng/Versions.props b/eng/Versions.props
index f278b8d04fc..6ab7f1964cd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22060.8
+ 6.0.2-servicing.22060.10
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22060.9
- 6.0.2-servicing.22060.9
+ 6.0.2-servicing.22060.12
+ 6.0.2-servicing.22060.12
- 6.0.2-servicing.22060.9
+ 6.0.2-servicing.22060.12
6.0.2
6.0.2
6.0.1
From dcddfa427a787318d07ab895df3eabbb861332ac Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Sat, 15 Jan 2022 01:56:30 +0000
Subject: [PATCH 184/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.12 to
6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.12 to
6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent:
Microsoft.Private.Winforms)
- Source msrc from internal
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
eng/pipeline.yml | 6 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 96bc2305d0a..bae0751cb1a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1ca7ac2e4b7..e42ce97386f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- c89b792c93eba7098b3d2d887137c57c2a7e9065
+ 789f95bcde597a22356a8f0f042159fafddb85b9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- c89b792c93eba7098b3d2d887137c57c2a7e9065
+ 789f95bcde597a22356a8f0f042159fafddb85b9
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
+ 71075a0b48b1879c616cfaea087546e6d384d10a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
+ 71075a0b48b1879c616cfaea087546e6d384d10a
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
+ 71075a0b48b1879c616cfaea087546e6d384d10a
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
+ 71075a0b48b1879c616cfaea087546e6d384d10a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 56c11f26e9c4cd2d7ea709768c334dbb83f7b323
+ 71075a0b48b1879c616cfaea087546e6d384d10a
diff --git a/eng/Versions.props b/eng/Versions.props
index 6ab7f1964cd..78eb65f8c98 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22060.10
+ 6.0.2-servicing.22064.5
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22060.12
- 6.0.2-servicing.22060.12
+ 6.0.2-servicing.22063.6
+ 6.0.2-servicing.22063.6
- 6.0.2-servicing.22060.12
+ 6.0.2-servicing.22063.6
6.0.2
6.0.2
6.0.1
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 8ebe3d7ef47..ef146996bc6 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -71,12 +71,12 @@ jobs:
- name: _InternalRuntimeDownloadArgs
value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- - group: DotNet-MSRC-Storage
+ - group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats
- name: _InternalRuntimeDownloadArgs
value: >-
- /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
- /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
+ /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+ /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
# Override some values if we're building internally
From fb76229895cae74c1adc62c2411a0730a2f3759b Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Sat, 15 Jan 2022 04:36:51 +0000
Subject: [PATCH 185/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22063.6 to
6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22063.6 to
6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from
6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 24 ++++++++++++------------
eng/Versions.props | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index bae0751cb1a..56c6c42245f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e42ce97386f..40cdea205a2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 789f95bcde597a22356a8f0f042159fafddb85b9
+ 5ad241b9633924db40503de19cb502bb0aca7718
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 789f95bcde597a22356a8f0f042159fafddb85b9
+ 5ad241b9633924db40503de19cb502bb0aca7718
https://github.com/dotnet/runtime
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 71075a0b48b1879c616cfaea087546e6d384d10a
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 71075a0b48b1879c616cfaea087546e6d384d10a
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 71075a0b48b1879c616cfaea087546e6d384d10a
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 71075a0b48b1879c616cfaea087546e6d384d10a
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 71075a0b48b1879c616cfaea087546e6d384d10a
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
diff --git a/eng/Versions.props b/eng/Versions.props
index 78eb65f8c98..6f58b511348 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,17 +10,17 @@
- 6.0.2-servicing.22064.5
+ 6.0.2-servicing.22064.7
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22063.6
- 6.0.2-servicing.22063.6
+ 6.0.2-servicing.22064.6
+ 6.0.2-servicing.22064.6
- 6.0.2-servicing.22063.6
+ 6.0.2-servicing.22064.6
6.0.2
6.0.2
6.0.1
From 3dad800473a53139877c8c25114a6876fd8a20d0 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:56:32 -0800
Subject: [PATCH 186/223] Update branding to 6.0.3 (#6050)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index ed2b54dc9bb..98dbe4abe12 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
- 6.0.2
+ 6.0.3
servicing
From 0f7d3196e9ab8079e0340ef5951c9821a85f0564 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 17:34:47 +0530
Subject: [PATCH 187/223] [release/6.0] Update dependencies from
dnceng/internal/dotnet-wpf-int (#6072)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220204.1
Microsoft.DotNet.Wpf.DncEng
From Version 6.0.0-rtm.21480.1 -> To Version 6.0.0-rtm.22104.1
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220204.2
Microsoft.DotNet.Wpf.DncEng
From Version 6.0.0-rtm.21480.1 -> To Version 6.0.0-rtm.22104.2
Co-authored-by: dotnet-maestro[bot]
---
NuGet.config | 2 --
eng/Version.Details.xml | 4 ++--
eng/Versions.props | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 1d61606f62a..59cc6e76c2e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,6 @@
-
@@ -19,7 +18,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 51bb54f12a9..6f782a55053 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- bf6f24c075ff5315d0ec0e5359138ee796b0491c
+ 962ab77e3d043ec9377feec32e1b26824338e9db
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 98dbe4abe12..ee01541c26f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,6 +81,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rtm.21480.1
+ 6.0.0-rtm.22104.2
From 68ec050a0fedc5a9db384eb4c36013da673cc7db Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 19:30:48 +0530
Subject: [PATCH 188/223] [release/6.0] Update dependencies from dotnet/arcade
(#5682)
* Update dependencies from https://github.com/dotnet/arcade build 20211110.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
From Version 6.0.0-beta.21558.5 -> To Version 6.0.0-beta.21560.2
* Update images to VS2022
* Update dependencies from https://github.com/dotnet/arcade build 20211209.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
From Version 6.0.0-beta.21558.5 -> To Version 6.0.0-beta.21609.4
* Update dependencies from https://github.com/dotnet/arcade build 20220202.3
Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
From Version 6.0.0-beta.21558.5 -> To Version 6.0.0-beta.22102.3
* update platform toolset to 143
* Fix vcruntime version error
Co-authored-by: dotnet-maestro[bot]
Co-authored-by: Matt Mitchell
Co-authored-by: Ashish Kumar Singh
---
eng/Version.Details.xml | 20 +-
eng/Versions.props | 6 +-
eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 4 +-
eng/common/build.sh | 3 -
eng/common/generate-graph-files.ps1 | 86 ---
eng/common/post-build/publish-using-darc.ps1 | 28 +-
eng/common/sdk-task.ps1 | 3 -
eng/common/sdl/configure-sdl-tool.ps1 | 9 +-
eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +-
eng/common/sdl/packages.config | 2 +-
eng/common/templates/job/execute-sdl.yml | 25 +-
.../templates/job/generate-graph-files.yml | 48 --
eng/common/templates/job/job.yml | 5 +
eng/common/templates/job/onelocbuild.yml | 21 +-
.../templates/job/publish-build-assets.yml | 4 -
eng/common/templates/jobs/codeql-build.yml | 31 +
eng/common/templates/jobs/jobs.yml | 24 +-
.../channels/generic-internal-channel.yml | 190 ------
.../channels/generic-public-channel.yml | 192 ------
.../templates/post-build/common-variables.yml | 73 --
.../templates/post-build/post-build.yml | 624 +++++-------------
.../post-build/setup-maestro-vars.yml | 124 ++--
eng/common/templates/steps/execute-codeql.yml | 32 +
eng/common/tools.ps1 | 76 +--
eng/common/tools.sh | 67 +-
eng/pipeline.yml | 4 +-
global.json | 8 +-
.../redist/VCRuntime/VCRuntime.vcxproj | 11 +-
28 files changed, 426 insertions(+), 1298 deletions(-)
delete mode 100644 eng/common/generate-graph-files.ps1
delete mode 100644 eng/common/templates/job/generate-graph-files.yml
create mode 100644 eng/common/templates/jobs/codeql-build.yml
delete mode 100644 eng/common/templates/post-build/channels/generic-internal-channel.yml
delete mode 100644 eng/common/templates/post-build/channels/generic-public-channel.yml
create mode 100644 eng/common/templates/steps/execute-codeql.yml
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6f782a55053..6dba141430b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 8ebefe290f57089d60100465111e78f223ee91db
+ 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
-
+
https://github.com/dotnet/arcade
- 8ebefe290f57089d60100465111e78f223ee91db
+ 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
-
+
https://github.com/dotnet/arcade
- 8ebefe290f57089d60100465111e78f223ee91db
+ 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
-
+
https://github.com/dotnet/arcade
- 8ebefe290f57089d60100465111e78f223ee91db
+ 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
-
+
https://github.com/dotnet/arcade
- 8ebefe290f57089d60100465111e78f223ee91db
+ 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
diff --git a/eng/Versions.props b/eng/Versions.props
index ee01541c26f..73c940f7ebe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.21558.5
- 6.0.0-beta.21558.5
- 6.0.0-beta.21558.5
+ 6.0.0-beta.22102.3
+ 6.0.0-beta.22102.3
+ 6.0.0-beta.22102.3
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index 1db2f681448..f0fedfd0830 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -3,8 +3,8 @@
15.0
Unicode
-
- v142
+
+ v143
10.0.19041.0
diff --git a/eng/common/build.sh b/eng/common/build.sh
index bc07a1c6848..a16e18b174a 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -188,9 +188,6 @@ function InitializeCustomToolset {
function Build {
- if [[ "$ci" == true ]]; then
- TryLogClientIpAddress
- fi
InitializeToolset
InitializeCustomToolset
diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1
deleted file mode 100644
index 0728b1a8b57..00000000000
--- a/eng/common/generate-graph-files.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(
- [Parameter(Mandatory=$true)][string] $barToken, # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens
- [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
- [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
- [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created
- [string] $darcVersion, # darc's version
- [string] $graphvizVersion = '2.38', # GraphViz version
- [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
- # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
-)
-
-function CheckExitCode ([string]$stage)
-{
- $exitCode = $LASTEXITCODE
- if ($exitCode -ne 0) {
- Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..."
- ExitWithExitCode $exitCode
- }
-}
-
-try {
- $ErrorActionPreference = 'Stop'
- . $PSScriptRoot\tools.ps1
-
- Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
-
- Push-Location $PSScriptRoot
-
- Write-Host 'Installing darc...'
- . .\darc-init.ps1 -darcVersion $darcVersion
- CheckExitCode 'Running darc-init'
-
- $engCommonBaseDir = Join-Path $PSScriptRoot 'native\'
- $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory
- $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external'
- $installBin = Join-Path $graphvizInstallDir 'bin'
-
- Write-Host 'Installing dot...'
- .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose
-
- $darcExe = "$env:USERPROFILE\.dotnet\tools"
- $darcExe = Resolve-Path "$darcExe\darc.exe"
-
- Create-Directory $outputFolder
-
- # Generate 3 graph descriptions:
- # 1. Flat with coherency information
- # 2. Graphviz (dot) file
- # 3. Standard dependency graph
- $graphVizFilePath = "$outputFolder\graphviz.txt"
- $graphVizImageFilePath = "$outputFolder\graph.png"
- $normalGraphFilePath = "$outputFolder\graph-full.txt"
- $flatGraphFilePath = "$outputFolder\graph-flat.txt"
- $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" )
-
- if ($includeToolset) {
- Write-Host 'Toolsets will be included in the graph...'
- $baseOptions += @( '--include-toolset' )
- }
-
- Write-Host 'Generating standard dependency graph...'
- & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath
- CheckExitCode 'Generating normal dependency graph'
-
- Write-Host 'Generating flat dependency graph and graphviz file...'
- & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath
- CheckExitCode 'Generating flat and graphviz dependency graph'
-
- Write-Host "Generating graph image $graphVizFilePath"
- $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe"
- & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath"
- CheckExitCode 'Generating graphviz image'
-
- Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!"
-}
-catch {
- if (!$includeToolset) {
- Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow
- Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow
- }
- Write-Host $_.ScriptStackTrace
- Write-PipelineTelemetryError -Category 'Arcade' -Message $_
- ExitWithExitCode 1
-} finally {
- Pop-Location
-}
\ No newline at end of file
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 2427ca6b6ae..8508397d776 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,13 +5,8 @@ param(
[Parameter(Mandatory=$true)][string] $MaestroToken,
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
- [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
- [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
- [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
- [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
- [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
- [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
+ [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
)
try {
@@ -35,27 +30,6 @@ try {
$optionalParams.Add("--no-wait") | Out-Null
}
- if ("false" -ne $PublishInstallersAndChecksums) {
- $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
- }
-
- if ("true" -eq $EnableNugetValidation) {
- $optionalParams.Add("--validate-nuget") | Out-Null
- }
-
- if ("true" -eq $EnableSourceLinkValidation) {
- $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
- }
-
- if ("true" -eq $EnableSigningValidation) {
- $optionalParams.Add("--validate-signingchecksums") | Out-Null
-
- if ("" -ne $SigningValidationAdditionalParameters) {
- $optionalParams.Add("--signing-validation-parameters") | Out-Null
- $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
- }
- }
-
& $darc add-build-to-channel `
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 7ab9baac5c8..b1bca63ab1d 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -83,9 +83,6 @@ try {
}
if ($restore) {
- if ($ci) {
- Try-LogClientIpAddress
- }
Build 'Restore'
}
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index 4999c307088..adea8e8da2a 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -15,7 +15,9 @@ Param(
# Optional: Additional params to add to any tool using CredScan.
[string[]] $CrScanAdditionalRunConfigParams,
# Optional: Additional params to add to any tool using PoliCheck.
- [string[]] $PoliCheckAdditionalRunConfigParams
+ [string[]] $PoliCheckAdditionalRunConfigParams,
+ # Optional: Additional params to add to any tool using CodeQL/Semmle.
+ [string[]] $CodeQLAdditionalRunConfigParams
)
$ErrorActionPreference = 'Stop'
@@ -78,6 +80,11 @@ try {
$tool.Args += "Target < $TargetDirectory"
}
$tool.Args += $PoliCheckAdditionalRunConfigParams
+ } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
+ if ($targetDirectory) {
+ $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
+ }
+ $tool.Args += $CodeQLAdditionalRunConfigParams
}
# Create variable pointing to the args array directly so we can use splat syntax later.
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index 1157151f486..b9fe7317964 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -34,6 +34,7 @@ Param(
[string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
[string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
[string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+ [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
[bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run
)
@@ -105,7 +106,8 @@ try {
-AzureDevOpsAccessToken $AzureDevOpsAccessToken `
-GuardianLoggerLevel $GuardianLoggerLevel `
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
- -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+ -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
+ -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
if ($BreakOnFailure) {
Exit-IfNZEC "Sdl"
}
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd7..b7bcfe38caf 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
-
+
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 4882dd93134..d0a1ea8b0f2 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -29,14 +29,6 @@ parameters:
# Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
# not pipeline artifacts, so doesn't affect the use of this parameter.
pipelineArtifactNames: []
- # Optional: location and ID of the AzDO build that the build/pipeline artifacts should be
- # downloaded from. By default, uses runtime expressions to decide based on the variables set by
- # the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are
- # running without Maestro++/BAR involved, or to download artifacts from a specific existing build
- # to iterate quickly on SDL changes.
- AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
jobs:
- job: Run_SDL
@@ -54,21 +46,26 @@ jobs:
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
# sync with the packages.config file.
- name: DefaultGuardianVersion
- value: 0.53.3
+ value: 0.110.1
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
- name: GuardianPackagesConfigFile
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
pool:
- # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
- ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
- vmImage: windows-2019
- ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
- vmImage: windows-2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- checkout: self
clean: true
+ - template: /eng/common/templates/post-build/setup-maestro-vars.yml
+
- ${{ if ne(parameters.downloadArtifacts, 'false')}}:
- ${{ if ne(parameters.artifactNames, '') }}:
- ${{ each artifactName in parameters.artifactNames }}:
diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml
deleted file mode 100644
index e54ce956f90..00000000000
--- a/eng/common/templates/job/generate-graph-files.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
- # Optional: dependencies of the job
- dependsOn: ''
-
- # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
- pool: {}
-
- # Optional: Include toolset dependencies in the generated graph files
- includeToolset: false
-
-jobs:
-- job: Generate_Graph_Files
-
- dependsOn: ${{ parameters.dependsOn }}
-
- displayName: Generate Graph Files
-
- pool: ${{ parameters.pool }}
-
- variables:
- # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
- # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat
- - group: Publish-Build-Assets
- - group: DotNet-AllOrgs-Darc-Pats
- - name: _GraphArguments
- value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT)
- -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat)
- -barToken $(MaestroAccessToken)
- -outputFolder '$(Build.StagingDirectory)/GraphFiles/'
- - ${{ if ne(parameters.includeToolset, 'false') }}:
- - name: _GraphArguments
- value: ${{ variables._GraphArguments }} -includeToolset
-
- steps:
- - task: PowerShell@2
- displayName: Generate Graph Files
- inputs:
- filePath: eng\common\generate-graph-files.ps1
- arguments: $(_GraphArguments)
- continueOnError: true
- - task: PublishBuildArtifacts@1
- displayName: Publish Graph to Artifacts
- inputs:
- PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
- PublishLocation: Container
- ArtifactName: GraphFiles
- continueOnError: true
- condition: always()
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 37dceb1bab0..30d1de5835e 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,6 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
+ disableComponentGovernance: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
@@ -136,6 +137,10 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true
+ - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+ - task: ComponentGovernanceComponentDetection@0
+ continueOnError: true
+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 2b55a567f82..9d1e3042d8a 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -3,15 +3,15 @@ parameters:
dependsOn: ''
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
- pool:
- vmImage: windows-2019
-
+ pool: ''
+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
SourcesDirectory: $(Build.SourcesDirectory)
CreatePr: true
AutoCompletePr: false
+ ReusePr: true
UseLfLineEndings: true
UseCheckedInLocProjectJson: false
LanguageSet: VS_Main_Languages
@@ -30,7 +30,18 @@ jobs:
displayName: OneLocBuild
- pool: ${{ parameters.pool }}
+ ${{ if ne(parameters.pool, '') }}:
+ pool: ${{ parameters.pool }}
+ ${{ if eq(parameters.pool, '') }}:
+ pool:
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
@@ -64,6 +75,8 @@ jobs:
${{ if eq(parameters.CreatePr, true) }}:
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
+ ${{ if eq(parameters.RepoType, 'gitHub') }}:
+ isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index fe9dfdf720c..d91bf914711 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -38,10 +38,6 @@ jobs:
value: ${{ parameters.configuration }}
- group: Publish-Build-Assets
- group: AzureDevOps-Artifact-Feeds-Pats
- # Skip component governance and codesign validation for SDL. These jobs
- # create no content.
- - name: skipComponentGovernanceDetection
- value: true
- name: runCodesignValidationInjection
value: false
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
new file mode 100644
index 00000000000..f7dc5ea4aaa
--- /dev/null
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -0,0 +1,31 @@
+parameters:
+ # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+ continueOnError: false
+ # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+ jobs: []
+ # Optional: if specified, restore and use this version of Guardian instead of the default.
+ overrideGuardianVersion: ''
+
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+ parameters:
+ enableMicrobuild: false
+ enablePublishBuildArtifacts: false
+ enablePublishTestResults: false
+ enablePublishBuildAssets: false
+ enablePublishUsingPipelines: false
+ enableTelemetry: true
+
+ variables:
+ - group: Publish-Build-Assets
+ # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+ # sync with the packages.config file.
+ - name: DefaultGuardianVersion
+ value: 0.109.0
+ - name: GuardianPackagesConfigFile
+ value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+ - name: GuardianVersion
+ value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+
+ jobs: ${{ parameters.jobs }}
+
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 90015a7e5ae..70d44735ace 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,6 +8,10 @@ parameters:
# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false
+ # Optional: Disable component governance detection. In general, component governance
+ # should be on for all jobs. Use only in the event of issues.
+ disableComponentGovernance: false
+
# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false
@@ -83,17 +87,15 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
- vmImage: windows-2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
-
- - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}:
- - template: ../job/generate-graph-files.yml
- parameters:
- continueOnError: ${{ parameters.continueOnError }}
- includeToolset: ${{ parameters.graphFileGeneration.includeToolset }}
- dependsOn:
- - Asset_Registry_Publish
- pool:
- vmImage: windows-2019
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
deleted file mode 100644
index 8990dfc8c87..00000000000
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-parameters:
- BARBuildId: ''
- PromoteToChannelIds: ''
- artifactsPublishingAdditionalParameters: ''
- dependsOn:
- - Validate
- publishInstallersAndChecksums: true
- symbolPublishingAdditionalParameters: ''
- stageName: ''
- channelName: ''
- channelId: ''
- transportFeed: ''
- shippingFeed: ''
- symbolsFeed: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
- dependsOn: ${{ parameters.dependsOn }}
- variables:
- - template: ../common-variables.yml
- displayName: ${{ parameters.channelName }} Publishing
- jobs:
- - template: ../setup-maestro-vars.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
- - job: publish_symbols
- displayName: Symbol Publishing
- dependsOn: setupMaestroVars
- condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
- variables:
- - group: DotNet-Symbol-Server-Pats
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
- pool:
- vmImage: 'windows-2019'
- steps:
- - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
- displayName: Warn about v2 Arcade Publishing Usage
-
- # This is necessary whenever we want to publish/restore to an AzDO private feed
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate to AzDO Feeds'
-
- - task: DownloadBuildArtifacts@0
- displayName: Download Build Assets
- continueOnError: true
- inputs:
- buildType: specific
- buildVersionToDownload: specific
- project: $(AzDOProjectName)
- pipeline: $(AzDOPipelineId)
- buildId: $(AzDOBuildId)
- downloadType: 'specific'
- itemPattern: |
- PdbArtifacts/**
- BlobArtifacts/**
- downloadPath: '$(Build.ArtifactStagingDirectory)'
- checkDownloadedFiles: true
-
- # This is necessary whenever we want to publish/restore to an AzDO private feed
- # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
- # otherwise it'll complain about accessing a private feed.
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate to AzDO Feeds'
-
- - task: PowerShell@2
- displayName: Enable cross-org publishing
- inputs:
- filePath: eng\common\enable-cross-org-publishing.ps1
- arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
- - task: PowerShell@2
- displayName: Publish
- inputs:
- filePath: eng\common\sdk-task.ps1
- arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
- /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
- /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
- /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
- /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
- /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
- /p:Configuration=Release
- /p:PublishToMSDL=false
- ${{ parameters.symbolPublishingAdditionalParameters }}
-
- - template: ../../steps/publish-logs.yml
- parameters:
- StageLabel: '${{ parameters.stageName }}'
- JobLabel: 'SymbolPublishing'
-
- - job: publish_assets
- displayName: Publish Assets
- dependsOn: setupMaestroVars
- timeoutInMinutes: 120
- variables:
- - name: BARBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
- - name: IsStableBuild
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
- condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
- pool:
- vmImage: 'windows-2019'
- steps:
- - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
- displayName: Warn about v2 Arcade Publishing Usage
-
- - task: DownloadBuildArtifacts@0
- displayName: Download Build Assets
- continueOnError: true
- inputs:
- buildType: specific
- buildVersionToDownload: specific
- project: $(AzDOProjectName)
- pipeline: $(AzDOPipelineId)
- buildId: $(AzDOBuildId)
- downloadType: 'specific'
- itemPattern: |
- PackageArtifacts/**
- BlobArtifacts/**
- AssetManifests/**
- downloadPath: '$(Build.ArtifactStagingDirectory)'
- checkDownloadedFiles: true
-
- - task: NuGetToolInstaller@1
- displayName: 'Install NuGet.exe'
-
- # This is necessary whenever we want to publish/restore to an AzDO private feed
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate to AzDO Feeds'
-
- - task: PowerShell@2
- displayName: Enable cross-org publishing
- inputs:
- filePath: eng\common\enable-cross-org-publishing.ps1
- arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
- - task: PowerShell@2
- displayName: Publish Assets
- inputs:
- filePath: eng\common\sdk-task.ps1
- arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
- /p:PublishingInfraVersion=2
- /p:IsStableBuild=$(IsStableBuild)
- /p:IsInternalBuild=$(IsInternalBuild)
- /p:RepositoryName=$(Build.Repository.Name)
- /p:CommitSha=$(Build.SourceVersion)
- /p:NugetPath=$(NuGetExeToolPath)
- /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
- /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
- /p:BARBuildId=$(BARBuildId)
- /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
- /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
- /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
- /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
- /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
- /p:Configuration=Release
- /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
- /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
- /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
- /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
- /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
- /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
- /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
- /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
- /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:PublishToMSDL=false
- ${{ parameters.artifactsPublishingAdditionalParameters }}
-
- - template: ../../steps/publish-logs.yml
- parameters:
- StageLabel: '${{ parameters.stageName }}'
- JobLabel: 'AssetsPublishing'
-
- - template: ../../steps/add-build-to-channel.yml
- parameters:
- ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
deleted file mode 100644
index 3220c6a4f92..00000000000
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-parameters:
- BARBuildId: ''
- PromoteToChannelIds: ''
- artifactsPublishingAdditionalParameters: ''
- dependsOn:
- - Validate
- publishInstallersAndChecksums: true
- symbolPublishingAdditionalParameters: ''
- stageName: ''
- channelName: ''
- channelId: ''
- transportFeed: ''
- shippingFeed: ''
- symbolsFeed: ''
- # If the channel name is empty, no links will be generated
- akaMSChannelName: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
- dependsOn: ${{ parameters.dependsOn }}
- variables:
- - template: ../common-variables.yml
- displayName: ${{ parameters.channelName }} Publishing
- jobs:
- - template: ../setup-maestro-vars.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
- - job: publish_symbols
- displayName: Symbol Publishing
- dependsOn: setupMaestroVars
- condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
- variables:
- - group: DotNet-Symbol-Server-Pats
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
- pool:
- vmImage: 'windows-2019'
- steps:
- - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
- displayName: Warn about v2 Arcade Publishing Usage
-
- - task: DownloadBuildArtifacts@0
- displayName: Download Build Assets
- continueOnError: true
- inputs:
- buildType: specific
- buildVersionToDownload: specific
- project: $(AzDOProjectName)
- pipeline: $(AzDOPipelineId)
- buildId: $(AzDOBuildId)
- downloadType: 'specific'
- itemPattern: |
- PdbArtifacts/**
- BlobArtifacts/**
- downloadPath: '$(Build.ArtifactStagingDirectory)'
- checkDownloadedFiles: true
-
- # This is necessary whenever we want to publish/restore to an AzDO private feed
- # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
- # otherwise it'll complain about accessing a private feed.
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate to AzDO Feeds'
-
- - task: PowerShell@2
- displayName: Enable cross-org publishing
- inputs:
- filePath: eng\common\enable-cross-org-publishing.ps1
- arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
- - task: PowerShell@2
- displayName: Publish
- inputs:
- filePath: eng\common\sdk-task.ps1
- arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
- /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
- /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
- /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
- /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
- /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
- /p:Configuration=Release
- ${{ parameters.symbolPublishingAdditionalParameters }}
-
- - template: ../../steps/publish-logs.yml
- parameters:
- StageLabel: '${{ parameters.stageName }}'
- JobLabel: 'SymbolPublishing'
-
- - job: publish_assets
- displayName: Publish Assets
- dependsOn: setupMaestroVars
- timeoutInMinutes: 120
- variables:
- - name: BARBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
- - name: IsStableBuild
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
- - name: ArtifactsCategory
- value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
- condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
- pool:
- vmImage: 'windows-2019'
- steps:
- - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
- displayName: Warn about v2 Arcade Publishing Usage
-
- - task: DownloadBuildArtifacts@0
- displayName: Download Build Assets
- continueOnError: true
- inputs:
- buildType: specific
- buildVersionToDownload: specific
- project: $(AzDOProjectName)
- pipeline: $(AzDOPipelineId)
- buildId: $(AzDOBuildId)
- downloadType: 'specific'
- itemPattern: |
- PackageArtifacts/**
- BlobArtifacts/**
- AssetManifests/**
- downloadPath: '$(Build.ArtifactStagingDirectory)'
- checkDownloadedFiles: true
-
- - task: NuGetToolInstaller@1
- displayName: 'Install NuGet.exe'
-
- # This is necessary whenever we want to publish/restore to an AzDO private feed
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate to AzDO Feeds'
-
- - task: PowerShell@2
- displayName: Enable cross-org publishing
- inputs:
- filePath: eng\common\enable-cross-org-publishing.ps1
- arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
- - task: PowerShell@2
- displayName: Publish Assets
- inputs:
- filePath: eng\common\sdk-task.ps1
- arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
- /p:PublishingInfraVersion=2
- /p:ArtifactsCategory=$(ArtifactsCategory)
- /p:IsStableBuild=$(IsStableBuild)
- /p:IsInternalBuild=$(IsInternalBuild)
- /p:RepositoryName=$(Build.Repository.Name)
- /p:CommitSha=$(Build.SourceVersion)
- /p:NugetPath=$(NuGetExeToolPath)
- /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
- /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
- /p:BARBuildId=$(BARBuildId)
- /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
- /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
- /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
- /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
- /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
- /p:Configuration=Release
- /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
- /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
- /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
- /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
- /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
- /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
- /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
- /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
- /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
- /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
- /p:AkaMSClientId=$(akams-client-id)
- /p:AkaMSClientSecret=$(akams-client-secret)
- ${{ parameters.artifactsPublishingAdditionalParameters }}
-
- - template: ../../steps/publish-logs.yml
- parameters:
- StageLabel: '${{ parameters.stageName }}'
- JobLabel: 'AssetsPublishing'
-
- - template: ../../steps/add-build-to-channel.yml
- parameters:
- ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c99fd750376..1ac7f49a43c 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -4,54 +4,6 @@ variables:
- group: DotNet-DotNetCli-Storage
- group: DotNet-MSRC-Storage
- group: Publish-Build-Assets
-
- # .NET Core 3.1 Dev
- - name: PublicDevRelease_31_Channel_Id
- value: 128
-
- # .NET 5 Dev
- - name: Net_5_Dev_Channel_Id
- value: 131
-
- # .NET Eng - Validation
- - name: Net_Eng_Validation_Channel_Id
- value: 9
-
- # .NET Eng - Latest
- - name: Net_Eng_Latest_Channel_Id
- value: 2
-
- # .NET 3 Eng - Validation
- - name: NET_3_Eng_Validation_Channel_Id
- value: 390
-
- # .NET 3 Eng
- - name: NetCore_3_Tools_Channel_Id
- value: 344
-
- # .NET Core 3.0 Internal Servicing
- - name: InternalServicing_30_Channel_Id
- value: 184
-
- # .NET Core 3.0 Release
- - name: PublicRelease_30_Channel_Id
- value: 19
-
- # .NET Core 3.1 Release
- - name: PublicRelease_31_Channel_Id
- value: 129
-
- # General Testing
- - name: GeneralTesting_Channel_Id
- value: 529
-
- # .NET Core 3.1 Blazor Features
- - name: NetCore_31_Blazor_Features_Channel_Id
- value: 531
-
- # .NET Core Experimental
- - name: NetCore_Experimental_Channel_Id
- value: 562
# Whether the build is internal or not
- name: IsInternalBuild
@@ -70,30 +22,5 @@ variables:
- name: SymbolToolVersion
value: 1.0.1
- # Feed Configurations
- # These should include the suffix "/index.json"
-
- # Default locations for Installers and checksums
- # Public Locations
- - name: ChecksumsBlobFeedUrl
- value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
- - name: InstallersBlobFeedUrl
- value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
-
- # Private Locations
- - name: InternalChecksumsBlobFeedUrl
- value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
- - name: InternalChecksumsBlobFeedKey
- value: $(dotnetclichecksumsmsrc-storage-key)
-
- - name: InternalInstallersBlobFeedUrl
- value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
- - name: InternalInstallersBlobFeedKey
- value: $(dotnetclimsrc-access-key)
-
- # Skip component governance and codesign validation for SDL. These jobs
- # create no content.
- - name: skipComponentGovernanceDetection
- value: true
- name: runCodesignValidationInjection
value: false
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 4f79cf0f337..24e92a275a4 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,113 +1,114 @@
parameters:
- # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
- # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
- # Publishing V3 DOES NOT accept inlining the publishing stages.
- publishingInfraVersion: 2
- # When set to true the publishing templates from the repo will be used
- # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
- inline: true
-
- # Only used if inline==false. When set to true will stall the current build until
- # the Promotion Pipeline build finishes. Otherwise, the current build will continue
- # execution concurrently with the promotion build.
- waitPublishingFinish: true
-
- BARBuildId: ''
- PromoteToChannelIds: ''
-
- enableSourceLinkValidation: false
- enableSigningValidation: true
- enableSymbolValidation: false
- enableNugetValidation: true
- publishInstallersAndChecksums: true
- SDLValidationParameters:
- enable: false
- continueOnError: false
- params: ''
- artifactNames: ''
- downloadArtifacts: true
+ # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+ # Publishing V1 is no longer supported
+ # Publishing V2 is no longer supported
+ # Publishing V3 is the default
+ - name: publishingInfraVersion
+ displayName: Which version of publishing should be used to promote the build definition?
+ type: number
+ default: 3
+ values:
+ - 3
+
+ - name: BARBuildId
+ displayName: BAR Build Id
+ type: number
+ default: 0
+
+ - name: PromoteToChannelIds
+ displayName: Channel to promote BARBuildId to
+ type: string
+ default: ''
+
+ - name: enableSourceLinkValidation
+ displayName: Enable SourceLink validation
+ type: boolean
+ default: false
+
+ - name: enableSigningValidation
+ displayName: Enable signing validation
+ type: boolean
+ default: true
+
+ - name: enableSymbolValidation
+ displayName: Enable symbol validation
+ type: boolean
+ default: false
+
+ - name: enableNugetValidation
+ displayName: Enable NuGet validation
+ type: boolean
+ default: true
+
+ - name: publishInstallersAndChecksums
+ displayName: Publish installers and checksums
+ type: boolean
+ default: true
+
+ - name: SDLValidationParameters
+ type: object
+ default:
+ enable: false
+ continueOnError: false
+ params: ''
+ artifactNames: ''
+ downloadArtifacts: true
# These parameters let the user customize the call to sdk-task.ps1 for publishing
# symbols & general artifacts as well as for signing validation
- symbolPublishingAdditionalParameters: ''
- artifactsPublishingAdditionalParameters: ''
- signingValidationAdditionalParameters: ''
+ - name: symbolPublishingAdditionalParameters
+ displayName: Symbol publishing additional parameters
+ type: string
+ default: ''
+
+ - name: artifactsPublishingAdditionalParameters
+ displayName: Artifact publishing additional parameters
+ type: string
+ default: ''
+
+ - name: signingValidationAdditionalParameters
+ displayName: Signing validation additional parameters
+ type: string
+ default: ''
# Which stages should finish execution before post-build stages start
- validateDependsOn:
- - build
- publishDependsOn:
- - Validate
+ - name: validateDependsOn
+ type: object
+ default:
+ - build
- # Channel ID's instantiated in this file.
- # When adding a new channel implementation the call to `check-channel-consistency.ps1`
- # needs to be updated with the new channel ID
- NetEngLatestChannelId: 2
- NetEngValidationChannelId: 9
- NetDev5ChannelId: 131
- NetDev6ChannelId: 1296
- GeneralTestingChannelId: 529
- NETCoreToolingDevChannelId: 548
- NETCoreToolingReleaseChannelId: 549
- NETInternalToolingChannelId: 551
- NETCoreExperimentalChannelId: 562
- NetEngServicesIntChannelId: 678
- NetEngServicesProdChannelId: 679
- NetCoreSDK313xxChannelId: 759
- NetCoreSDK313xxInternalChannelId: 760
- NetCoreSDK314xxChannelId: 921
- NetCoreSDK314xxInternalChannelId: 922
- VS166ChannelId: 1010
- VS167ChannelId: 1011
- VS168ChannelId: 1154
- VSMasterChannelId: 1012
- VS169ChannelId: 1473
- VS1610ChannelId: 1692
+ - name: publishDependsOn
+ type: object
+ default:
+ - Validate
stages:
-- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
- stage: Validate
dependsOn: ${{ parameters.validateDependsOn }}
displayName: Validate Build Assets
variables:
- template: common-variables.yml
jobs:
- - template: setup-maestro-vars.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
- - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
- - job:
- displayName: Post-build Checks
- dependsOn: setupMaestroVars
- variables:
- - name: TargetChannels
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
- pool:
- vmImage: 'windows-2019'
- steps:
- - task: PowerShell@2
- displayName: Maestro Channels Consistency
- inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
- arguments: -PromoteToChannels "$(TargetChannels)"
- -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
-
- job:
displayName: NuGet Validation
- dependsOn: setupMaestroVars
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
pool:
- vmImage: 'windows-2019'
- variables:
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
steps:
+ - template: setup-maestro-vars.yml
+ parameters:
+ BARBuildId: ${{ parameters.BARBuildId }}
+ PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
@@ -128,19 +129,22 @@ stages:
- job:
displayName: Signing Validation
- dependsOn: setupMaestroVars
condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
- variables:
- - template: common-variables.yml
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
pool:
- vmImage: 'windows-2019'
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
+ - template: setup-maestro-vars.yml
+ parameters:
+ BARBuildId: ${{ parameters.BARBuildId }}
+ PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
@@ -185,19 +189,22 @@ stages:
- job:
displayName: SourceLink Validation
- dependsOn: setupMaestroVars
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
- variables:
- - template: common-variables.yml
- - name: AzDOProjectName
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
- - name: AzDOPipelineId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
- - name: AzDOBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
pool:
- vmImage: 'windows-2019'
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
+ - template: setup-maestro-vars.yml
+ parameters:
+ BARBuildId: ${{ parameters.BARBuildId }}
+ PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
- task: DownloadBuildArtifacts@0
displayName: Download Blob Artifacts
inputs:
@@ -223,367 +230,46 @@ stages:
- template: /eng/common/templates/job/execute-sdl.yml
parameters:
enable: ${{ parameters.SDLValidationParameters.enable }}
- dependsOn: setupMaestroVars
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
-- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
- - stage: publish_using_darc
- ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
- dependsOn: ${{ parameters.publishDependsOn }}
- ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
- dependsOn: ${{ parameters.validateDependsOn }}
- displayName: Publish using Darc
- variables:
- - template: common-variables.yml
- jobs:
- - template: setup-maestro-vars.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
- - job:
- displayName: Publish Using Darc
- dependsOn: setupMaestroVars
- timeoutInMinutes: 120
- variables:
- - name: BARBuildId
- value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
- pool:
- vmImage: 'windows-2019'
- steps:
- - task: PowerShell@2
- displayName: Publish Using Darc
- inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
- arguments: -BuildId $(BARBuildId)
- -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
- -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
- -MaestroToken '$(MaestroApiAccessToken)'
- -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
- -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
- -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
- -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-
-- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NetCore_Dev5_Publish'
- channelName: '.NET 5 Dev'
- akaMSChannelName: 'net5/dev'
- channelId: ${{ parameters.NetDev5ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NetCore_Dev6_Publish'
- channelName: '.NET 6 Dev'
- akaMSChannelName: 'net6/dev'
- channelId: ${{ parameters.NetDev6ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net_Eng_Latest_Publish'
- channelName: '.NET Eng - Latest'
- akaMSChannelName: 'eng/daily'
- channelId: ${{ parameters.NetEngLatestChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net_Eng_Validation_Publish'
- channelName: '.NET Eng - Validation'
- akaMSChannelName: 'eng/validation'
- channelId: ${{ parameters.NetEngValidationChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'General_Testing_Publish'
- channelName: 'General Testing'
- akaMSChannelName: 'generaltesting'
- channelId: ${{ parameters.GeneralTestingChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_Tooling_Dev_Publishing'
- channelName: '.NET Core Tooling Dev'
- channelId: ${{ parameters.NETCoreToolingDevChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_Tooling_Release_Publishing'
- channelName: '.NET Core Tooling Release'
- channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NET_Internal_Tooling_Publishing'
- channelName: '.NET Internal Tooling'
- channelId: ${{ parameters.NETInternalToolingChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_Experimental_Publishing'
- channelName: '.NET Core Experimental'
- channelId: ${{ parameters.NETCoreExperimentalChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net_Eng_Services_Int_Publish'
- channelName: '.NET Eng Services - Int'
- channelId: ${{ parameters.NetEngServicesIntChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'Net_Eng_Services_Prod_Publish'
- channelName: '.NET Eng Services - Prod'
- channelId: ${{ parameters.NetEngServicesProdChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_SDK_314xx_Publishing'
- channelName: '.NET Core SDK 3.1.4xx'
- channelId: ${{ parameters.NetCoreSDK314xxChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_SDK_314xx_Internal_Publishing'
- channelName: '.NET Core SDK 3.1.4xx Internal'
- channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_SDK_313xx_Publishing'
- channelName: '.NET Core SDK 3.1.3xx'
- channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'NETCore_SDK_313xx_Internal_Publishing'
- channelName: '.NET Core SDK 3.1.3xx Internal'
- channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS16_6_Publishing'
- channelName: 'VS 16.6'
- channelId: ${{ parameters.VS166ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS16_7_Publishing'
- channelName: 'VS 16.7'
- channelId: ${{ parameters.VS167ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS16_8_Publishing'
- channelName: 'VS 16.8'
- channelId: ${{ parameters.VS168ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS_Master_Publishing'
- channelName: 'VS Master'
- channelId: ${{ parameters.VSMasterChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS_16_9_Publishing'
- channelName: 'VS 16.9'
- channelId: ${{ parameters.VS169ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
- - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
- parameters:
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
- dependsOn: ${{ parameters.publishDependsOn }}
- publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
- stageName: 'VS_16_10_Publishing'
- channelName: 'VS 16.10'
- channelId: ${{ parameters.VS1610ChannelId }}
- transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
- shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
- symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+- stage: publish_using_darc
+ ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+ dependsOn: ${{ parameters.publishDependsOn }}
+ ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
+ dependsOn: ${{ parameters.validateDependsOn }}
+ displayName: Publish using Darc
+ variables:
+ - template: common-variables.yml
+ jobs:
+ - job:
+ displayName: Publish Using Darc
+ timeoutInMinutes: 120
+ pool:
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ steps:
+ - template: setup-maestro-vars.yml
+ parameters:
+ BARBuildId: ${{ parameters.BARBuildId }}
+ PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+ - task: PowerShell@2
+ displayName: Publish Using Darc
+ inputs:
+ filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+ arguments: -BuildId $(BARBuildId)
+ -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+ -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+ -MaestroToken '$(MaestroApiAccessToken)'
+ -WaitPublishingFinish true
+ -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+ -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 4a22b2e6f6d..0c87f149a4a 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -2,77 +2,69 @@ parameters:
BARBuildId: ''
PromoteToChannelIds: ''
-jobs:
-- job: setupMaestroVars
- displayName: Setup Maestro Vars
- variables:
- - template: common-variables.yml
- pool:
- vmImage: 'windows-2019'
- steps:
- - checkout: none
-
- - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
- - task: DownloadBuildArtifacts@0
- displayName: Download Release Configs
- inputs:
- buildType: current
- artifactName: ReleaseConfigs
- checkDownloadedFiles: true
-
- - task: PowerShell@2
- name: setReleaseVars
- displayName: Set Release Configs Vars
+steps:
+ - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+ - task: DownloadBuildArtifacts@0
+ displayName: Download Release Configs
inputs:
- targetType: inline
- script: |
- try {
- if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
- $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
+ buildType: current
+ artifactName: ReleaseConfigs
+ checkDownloadedFiles: true
- $BarId = $Content | Select -Index 0
- $Channels = $Content | Select -Index 1
- $IsStableBuild = $Content | Select -Index 2
+ - task: PowerShell@2
+ name: setReleaseVars
+ displayName: Set Release Configs Vars
+ inputs:
+ targetType: inline
+ pwsh: true
+ script: |
+ try {
+ if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
+ $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
- $AzureDevOpsProject = $Env:System_TeamProject
- $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
- $AzureDevOpsBuildId = $Env:Build_BuildId
- }
- else {
- $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
+ $BarId = $Content | Select -Index 0
+ $Channels = $Content | Select -Index 1
+ $IsStableBuild = $Content | Select -Index 2
- $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
- $apiHeaders.Add('Accept', 'application/json')
- $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
- $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-
- $BarId = $Env:BARBuildId
- $Channels = $Env:PromoteToMaestroChannels -split ","
- $Channels = $Channels -join "]["
- $Channels = "[$Channels]"
+ $AzureDevOpsProject = $Env:System_TeamProject
+ $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
+ $AzureDevOpsBuildId = $Env:Build_BuildId
+ }
+ else {
+ $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
- $IsStableBuild = $buildInfo.stable
- $AzureDevOpsProject = $buildInfo.azureDevOpsProject
- $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
- $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
- }
+ $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
+ $apiHeaders.Add('Accept', 'application/json')
+ $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
- Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
- Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
- Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
+ $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
+
+ $BarId = $Env:BARBuildId
+ $Channels = $Env:PromoteToMaestroChannels -split ","
+ $Channels = $Channels -join "]["
+ $Channels = "[$Channels]"
- Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
- Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
- Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
+ $IsStableBuild = $buildInfo.stable
+ $AzureDevOpsProject = $buildInfo.azureDevOpsProject
+ $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
+ $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
}
- catch {
- Write-Host $_
- Write-Host $_.Exception
- Write-Host $_.ScriptStackTrace
- exit 1
- }
- env:
- MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
- BARBuildId: ${{ parameters.BARBuildId }}
- PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
+
+ Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId"
+ Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels"
+ Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild"
+
+ Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject"
+ Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId"
+ Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId"
+ }
+ catch {
+ Write-Host $_
+ Write-Host $_.Exception
+ Write-Host $_.ScriptStackTrace
+ exit 1
+ }
+ env:
+ MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+ BARBuildId: ${{ parameters.BARBuildId }}
+ PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml
new file mode 100644
index 00000000000..3930b163021
--- /dev/null
+++ b/eng/common/templates/steps/execute-codeql.yml
@@ -0,0 +1,32 @@
+parameters:
+ # Language that should be analyzed. Defaults to csharp
+ language: csharp
+ # Build Commands
+ buildCommands: ''
+ overrideParameters: '' # Optional: to override values for parameters.
+ additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+ # Optional: if specified, restore and use this version of Guardian instead of the default.
+ overrideGuardianVersion: ''
+ # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+ # diagnosis of problems with specific tool configurations.
+ publishGuardianDirectoryToPipeline: false
+ # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+ # parameters rather than relying on YAML. It may be better to use a local script, because you can
+ # reproduce results locally without piecing together a command based on the YAML.
+ executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+ # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
+ # 'continueOnError', the parameter value is not correctly picked up.
+ # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
+ # optional: determines whether to continue the build if the step errors;
+ sdlContinueOnError: false
+
+steps:
+- template: /eng/common/templates/steps/execute-sdl.yml
+ parameters:
+ overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+ executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+ overrideParameters: ${{ parameters.overrideParameters }}
+ additionalParameters: '${{ parameters.additionalParameters }}
+ -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")'
+ publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+ sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 44484289943..f1e1cb53953 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-
- # In case of network error, try to log the current IP for reference
- Try-LogClientIpAddress
}
# Source Build uses DotNetCoreSdkDir variable
@@ -301,32 +298,45 @@ function InstallDotNet([string] $dotnetRoot,
if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
if ($noPath) { $installParameters.NoPath = $True }
- try {
- & $installScript @installParameters
- }
- catch {
- if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
- Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
- if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
+ $variations = @()
+ $variations += @($installParameters)
- if ($runtimeSourceFeedKey) {
- $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
- $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
- $installParameters.FeedCredential = $decodedString
- }
+ $dotnetBuilds = $installParameters.Clone()
+ $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
+ $variations += @($dotnetBuilds)
- try {
- & $installScript @installParameters
- }
- catch {
- Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
- ExitWithExitCode 1
- }
+ if ($runtimeSourceFeed) {
+ $runtimeSource = $installParameters.Clone()
+ $runtimeSource.AzureFeed = $runtimeSourceFeed
+ if ($runtimeSourceFeedKey) {
+ $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
+ $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
+ $runtimeSource.FeedCredential = $decodedString
+ }
+ $variations += @($runtimeSource)
+ }
+
+ $installSuccess = $false
+ foreach ($variation in $variations) {
+ if ($variation | Get-Member AzureFeed) {
+ $location = $variation.AzureFeed
} else {
- Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
- ExitWithExitCode 1
+ $location = "public location";
+ }
+ Write-Host "Attempting to install dotnet from $location."
+ try {
+ & $installScript @variation
+ $installSuccess = $true
+ break
+ }
+ catch {
+ Write-Host "Failed to install dotnet from $location."
}
}
+ if (-not $installSuccess) {
+ Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
+ ExitWithExitCode 1
+ }
}
#
@@ -882,24 +892,6 @@ 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: $_"
- }
-}
-
#
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
#
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 6a4871ef72b..e555c34269f 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -188,28 +188,29 @@ function InstallDotNet {
GetDotNetInstallScript "$root"
local install_script=$_GetDotNetInstallScript
- local archArg=''
+ local installParameters=(--version $version --install-dir "$root")
+
if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then
- archArg="--architecture $3"
+ installParameters+=(--architecture $3)
fi
- local runtimeArg=''
if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
- runtimeArg="--runtime $4"
+ installParameters+=(--runtime $4)
fi
- local skipNonVersionedFilesArg=""
if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then
- skipNonVersionedFilesArg="--skip-non-versioned-files"
+ installParameters+=(--skip-non-versioned-files)
fi
- bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
- local exit_code=$?
- echo "Failed to install dotnet SDK from public location (exit code '$exit_code')."
- local runtimeSourceFeed=''
- if [[ -n "${6:-}" ]]; then
- runtimeSourceFeed="--azure-feed $6"
- fi
+ local variations=() # list of variable names with parameter arrays in them
+
+ local public_location=("${installParameters[@]}")
+ variations+=(public_location)
- local runtimeSourceFeedKey=''
+ local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
+ variations+=(dotnetbuilds)
+
+ if [[ -n "${6:-}" ]]; then
+ variations+=(private_feed)
+ local private_feed=("${installParameters[@]}" --azure-feed $6)
if [[ -n "${7:-}" ]]; then
# The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
# '-d'. To work around this, do a simple detection and switch the parameter
@@ -219,22 +220,27 @@ function InstallDotNet {
decodeArg="-d"
fi
decodedFeedKey=`echo $7 | base64 $decodeArg`
- runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+ private_feed+=(--feed-credential $decodedFeedKey)
fi
+ fi
- if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
- bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
- local exit_code=$?
- Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
- ExitWithExitCode $exit_code
- }
- else
- if [[ $exit_code != 0 ]]; then
- Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
- fi
- ExitWithExitCode $exit_code
+ local installSuccess=0
+ for variationName in "${variations[@]}"; do
+ local name="$variationName[@]"
+ local variation=("${!name}")
+ echo "Attempting to install dotnet from $variationName."
+ bash "$install_script" "${variation[@]}" && installSuccess=1
+ if [[ "$installSuccess" -eq 1 ]]; then
+ break
fi
- }
+
+ echo "Failed to install dotnet from $variationName."
+ done
+
+ if [[ "$installSuccess" -eq 0 ]]; then
+ Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
+ ExitWithExitCode 1
+ fi
}
function with_retries {
@@ -399,13 +405,6 @@ 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: ' || true
- fi
-}
-
function MSBuild {
local args=$@
if [[ "$pipelines_log" == true ]]; then
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 8ebe3d7ef47..71907b191e9 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -35,10 +35,10 @@ jobs:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
- demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
+ demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
+ demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
variables:
# needed for signing
- name: _TeamName
diff --git a/global.json b/global.json
index 7573b274e65..f388c75c72e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-rc.1.21430.12",
+ "dotnet": "6.0.101",
"runtimes": {
"dotnet": [
"2.1.7",
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21558.5"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22102.3"
},
"sdk": {
- "version": "6.0.100-rc.1.21430.12"
+ "version": "6.0.101"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
diff --git a/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj b/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
index d465def4d27..4b569a75f9a 100644
--- a/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
@@ -33,13 +33,8 @@
- Microsoft.VC142.CRT
- Microsoft.VC142.DebugCRT
-
- Microsoft.VC141.CRT
- Microsoft.VC141.DebugCRT
+ Microsoft.VC143.CRT
+ Microsoft.VC143.DebugCRT
@@ -3466,7 +3470,7 @@
-
+
@@ -3686,7 +3690,7 @@
-
+
@@ -4082,7 +4086,7 @@
ManagedSharedDestinationDir="src\Shared\Ms\Internal\Generated">
-
+
@@ -4621,7 +4625,7 @@
-
+
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/api/api_utils.cpp b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/api/api_utils.cpp
index fb6b0126fef..6b639080301 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/api/api_utils.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/api/api_utils.cpp
@@ -70,6 +70,7 @@ HRESULT HrValidateInitializeCall(
MilRTInitialization::DisableDisplayClipping |
MilRTInitialization::DisableMultimonDisplayClipping |
MilRTInitialization::IsDisableMultimonDisplayClippingValid |
+ MilRTInitialization::DisableDirtyRectangles |
MilRTInitialization::UseRefRast |
MilRTInitialization::UseRgbRast |
MilRTInitialization::PresentUsingMask
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.cpp b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.cpp
index bde4d8b859d..aed04102024 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.cpp
@@ -113,7 +113,7 @@ CHwDisplayRenderTarget::Create(
associatedDisplay,
eWindowLayerType
);
-
+
IFCOOM(*ppRenderTarget);
(*ppRenderTarget)->AddRef(); // CHwDisplayRenderTarget::ctor sets ref count == 0
}
@@ -164,6 +164,8 @@ CHwDisplayRenderTarget::Init(
dwFlags
);
+ m_fDisableDirtyRectangles = (dwFlags & MilRTInitialization::DisableDirtyRectangles) != 0;
+
#if DBG_STEP_RENDERING
m_fDbgClearOnPresent = !(dwFlags & MilRTInitialization::PresentRetainContents);
#endif DBG_STEP_RENDERING
@@ -378,6 +380,12 @@ CHwDisplayRenderTarget::Present(
goto Cleanup;
}
+ if (m_fDisableDirtyRectangles)
+ {
+ // invalidating the empty rect tells ShouldPresent to present everything
+ InvalidateRect(reinterpret_cast(&CMILSurfaceRect::sc_rcEmpty));
+ }
+
bool fPresent = false;
RGNDATA *pDirtyRegion = NULL;
IFC(ShouldPresent(
@@ -417,8 +425,8 @@ CHwDisplayRenderTarget::Present(
// Note that WGXERR_DISPLAYSTATEINVALID is bubbled up here so the caller is
// responsible for recreating this object
if (m_D3DPresentParams.SwapEffect == D3DSWAPEFFECT_COPY)
- {
- AssertConstMsgW( ( m_MILDC.GetRTInitializationFlags()
+ {
+ AssertConstMsgW( ( m_MILDC.GetRTInitializationFlags()
& MilRTInitialization::PresentRetainContents
)
|| IsTagEnabled(tagMILStepRendering),
@@ -497,11 +505,11 @@ CHwDisplayRenderTarget::Present(
//
// Member: CHwDisplayRenderTarget::InvalidateRect
//
-// Synopsis: Check for enabled rendering and retain contents before
+// Synopsis: Check for enabled rendering and retain contents before
// delegating to base class.
//
-HRESULT
+HRESULT
CHwDisplayRenderTarget::InvalidateRect(
__in_ecount(1) CMILSurfaceRect const *pRect
)
@@ -525,7 +533,7 @@ CHwDisplayRenderTarget::InvalidateRect(
// layout, and desired swap effect.
//
-HRESULT
+HRESULT
CHwDisplayRenderTarget::PresentInternal(
__in_ecount(1) CMILSurfaceRect const *prcSource,
__in_ecount(1) CMILSurfaceRect const *prcDest,
@@ -602,7 +610,7 @@ volatile BOOL g_fStepHWRendering = false;
volatile BOOL g_fStepHWRenderingLock = false;
#endif
-void
+void
CHwDisplayRenderTarget::ShowSteppedRendering(
__in LPCTSTR pszRenderDesc,
__in_ecount(1) const ISteppedRenderingSurfaceRT *pRT
@@ -628,8 +636,8 @@ CHwDisplayRenderTarget::ShowSteppedRendering(
CMILSurfaceRect rcPresentSource;
CMILSurfaceRect rcPresentDest(
0,
- 0,
- m_uWidth,
+ 0,
+ m_uWidth,
m_uHeight,
XYWH_Parameters
);
@@ -975,10 +983,10 @@ CHwDisplayRenderTarget::ShowSteppedRendering(
//+----------------------------------------------------------------------------
//
-// Member:
+// Member:
// CHwDisplayRenderTarget::DbgStepCreateD3DSurfaceFromBitmapSource
//
-// Synopsis:
+// Synopsis:
// Creates a CD3DSurface in video memory from an IWGXBitmapSource. This
// method was written for stepped rendering, so it is named as such.
// Before renaming this function and using it retail, investigate whether
@@ -1009,7 +1017,7 @@ CHwDisplayRenderTarget::DbgStepCreateD3DSurfaceFromBitmapSource(
IFC(pBitmap->GetPixelFormat(
&fmtBitmap
));
-
+
Assert(fmtBitmap == MilPixelFormat::PBGRA32bpp);
hwVidMemManager.SetRealizationParameters(
@@ -1310,7 +1318,7 @@ CHwDisplayRenderTarget::AdvanceFrame(
if (SUCCEEDED(m_hrDisplayInvalid) && m_pD3DDevice)
{
ENTER_DEVICE_FOR_SCOPE(*m_pD3DDevice);
-
+
m_pD3DDevice->AdvanceFrame(uFrameNumber);
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.h
index d443032cf66..d1c1a77bcbc 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hwdisplayrt.h
@@ -147,7 +147,7 @@ class CHwDisplayRenderTarget :
THIS_
__in_ecount(1) const RECT *prcSource,
__in_ecount(1) const RECT *prcDest
- ) PURE;
+ ) PURE;
STDMETHOD(InvalidateRect)(
__in_ecount(1) CMILSurfaceRect const *pRect
@@ -158,7 +158,7 @@ class CHwDisplayRenderTarget :
{
return CBaseSurfaceRenderTarget::ClearInvalidatedRects();
}
-
+
STDMETHOD(WaitForVBlank)();
STDMETHOD_(VOID, AdvanceFrame)(
@@ -186,6 +186,7 @@ class CHwDisplayRenderTarget :
protected:
BOOL m_fEnableRendering; // Rendering is disabled during resize
+ BOOL m_fDisableDirtyRectangles; // app wants to skip D3D dirty-rect optimization
CD3DSwapChain *m_pD3DSwapChain;
D3DPRESENT_PARAMETERS m_D3DPresentParams;
UINT const m_AdapterOrdinalInGroup;
@@ -230,7 +231,7 @@ class CHwDisplayRenderTarget :
__in_ecount(1) IWGXBitmapSource *pBitmap,
__deref_out_ecount(1) CD3DSurface **ppD3DSurface
);
-
+
BOOL m_fDbgClearOnPresent;
#endif DBG_STEP_RENDERING
};
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swhwndrt.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swhwndrt.h
index e3fdd839664..608df7a1043 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swhwndrt.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swhwndrt.h
@@ -35,13 +35,13 @@ MtExtern(CSwPresenter32bppGDI);
**************************************************************************/
//
-// There is only one presenter, CSwPresenter32bppGDI. Having a separate
+// There is only one presenter, CSwPresenter32bppGDI. Having a separate
// CSwPresenterBase is probably redundant and unnecessary
//
class CSwPresenterBase :
// This needs to be an IWGXBitmap so it can be used in SetSurface but
- // a lock operates on it and our lock implementation, CWGXBitmapLock,
+ // a lock operates on it and our lock implementation, CWGXBitmapLock,
// requires a CWGXBitmap because of the Unlock() method
public CWGXBitmap
{
@@ -166,7 +166,7 @@ class CSwRenderTargetHWND :
THIS_
__in_ecount(1) const RECT *prcSource,
__in_ecount(1) const RECT *prcDest
- );
+ );
STDMETHOD(InvalidateRect)(
__in_ecount(1) CMILSurfaceRect const *prc
@@ -180,7 +180,7 @@ class CSwRenderTargetHWND :
{
RRETURN(CBaseSurfaceRenderTarget::ClearInvalidatedRects());
}
-
+
STDMETHOD(Resize)(
UINT uWidth,
UINT uHeight
@@ -219,6 +219,7 @@ class CSwRenderTargetHWND :
HWND m_hwnd;
CSwPresenter32bppGDI *m_pPresenter;
+ BOOL m_fDisableDirtyRectangles; // app wants to skip dirty-rect optimization
};
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swlib/swhwndrt.cpp b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swlib/swhwndrt.cpp
index b58161e0e71..7dc354e54e0 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swlib/swhwndrt.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/sw/swlib/swhwndrt.cpp
@@ -60,7 +60,7 @@ HRESULT CSwPresenterBase::GetSize(
{
*puiWidth = m_nWidth;
*puiHeight = m_nHeight;
-
+
return S_OK;
}
@@ -75,7 +75,7 @@ HRESULT CSwPresenterBase::GetSize(
HRESULT CSwPresenterBase::GetPixelFormat(
__out_ecount(1) MilPixelFormat::Enum *pPixelFormat
)
-{
+{
*pPixelFormat = m_RenderPixelFormat;
return S_OK;
@@ -97,7 +97,7 @@ HRESULT CSwPresenterBase::GetResolution(
*pDpiX = primaryDisplayDpi.DpiScaleX;
*pDpiY = primaryDisplayDpi.DpiScaleY;
-
+
return S_OK;
}
@@ -336,6 +336,7 @@ HRESULT CSwRenderTargetHWND::Init(
);
m_hwnd = hwnd;
+ m_fDisableDirtyRectangles = (nFlags & MilRTInitialization::DisableDirtyRectangles) != 0;
#if DBG_STEP_RENDERING
m_fDbgClearOnPresent = !(nFlags & MilRTInitialization::PresentRetainContents);
@@ -368,16 +369,22 @@ STDMETHODIMP CSwRenderTargetHWND::Present(
CMILSurfaceRect presentRect;
bool fPresent = false;
-
+
RGNDATA *pDirtyRegion = NULL;
+ if (m_fDisableDirtyRectangles)
+ {
+ // invalidating the empty rect tells ShouldPresent to present everything
+ InvalidateRect(reinterpret_cast(&CMILSurfaceRect::sc_rcEmpty));
+ }
+
IFC(ShouldPresent(
pRect,
&presentRect,
&pDirtyRegion,
&fPresent
));
-
+
if (fPresent)
{
IFC(m_pPresenter->Present(
@@ -441,7 +448,7 @@ CSwRenderTargetHWND::ScrollBlt (
IFC(m_pPresenter->ScrollBlt(&source, &dest, true, true));
Cleanup:
- RRETURN(hr);
+ RRETURN(hr);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/hwndtarget.cpp b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/hwndtarget.cpp
index 85492384da9..5971bcd8c1d 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/hwndtarget.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/hwndtarget.cpp
@@ -20,31 +20,31 @@ MtDefine(CSlaveHWndRenderTarget, MILRender, "CSlaveHWndRenderTarget");
//------------------------------------------------------------------
// CSlaveHwndRenderTarget::ctor
-//
+//
// Note:
-// It is important that m_disableCookie start at zero to
-// allow an initial UpdateWindowSettings(enable) command to
-// enable the render target without a preceeding
+// It is important that m_disableCookie start at zero to
+// allow an initial UpdateWindowSettings(enable) command to
+// enable the render target without a preceeding
// UpdateWindowSettings(disable) command.
//
// This is a good place to force sw fallback by initializing
// m_fSoftwareFallback = true
-//
+//
// Everything else not initialized here is initialized to zero
// by DECLARE_METERHEAP_CLEAR
//
// DpiProvider is a CDelegatingUnknown, which requires the correct
// version of IUnknown to delegate AddRef/Release/QueryInterface
-// calls to. This is accomplished by passing the CMILCOMBase*
-// version of the IUnknown to it.
+// calls to. This is accomplished by passing the CMILCOMBase*
+// version of the IUnknown to it.
//------------------------------------------------------------------
-CSlaveHWndRenderTarget::CSlaveHWndRenderTarget(CComposition *pComposition) :
- CRenderTarget(pComposition),
- m_DisplayDevicesAvailabilityChangedWindowMessage(RegisterWindowMessage(L"DisplayDevicesAvailabilityChanged")),
- m_LastKnownDisplayDevicesAvailabilityChangedWParam(-1),
- m_WindowLayerType(MilWindowLayerType::NotLayered),
- m_WindowTransparency(MilTransparency::Opaque),
+CSlaveHWndRenderTarget::CSlaveHWndRenderTarget(CComposition *pComposition) :
+ CRenderTarget(pComposition),
+ m_DisplayDevicesAvailabilityChangedWindowMessage(RegisterWindowMessage(L"DisplayDevicesAvailabilityChanged")),
+ m_LastKnownDisplayDevicesAvailabilityChangedWParam(-1),
+ m_WindowLayerType(MilWindowLayerType::NotLayered),
+ m_WindowTransparency(MilTransparency::Opaque),
m_hWnd(nullptr), // Will be changed during ProcessCreate
m_UCETargetFlags(MilRTInitialization::Null), // Will be changed during ProcessCreate
m_RenderTargetFlags(MilRTInitialization::Null), // Will be changed during ProcessCreate
@@ -89,10 +89,10 @@ CSlaveHWndRenderTarget::Render(
CDrawingContext *pDrawingContext = NULL;
IFC(GetDrawingContext(&pDrawingContext));
-
+
if (m_pRenderTarget
&& m_fRenderingEnabled
- && !m_fNoScreenAccess // If we don't have screen access we don't need to render.
+ && !m_fNoScreenAccess // If we don't have screen access we don't need to render.
&& !m_fIsZombie) // The hwnd target is going away and therefore we don't need to render.
{
UINT uNumInvalidTargetRegions = 0;
@@ -103,13 +103,13 @@ CSlaveHWndRenderTarget::Render(
if (m_hWnd)
{
//
- // Get list of areas of target that don't have valid contents.
+ // Get list of areas of target that don't have valid contents.
// Later add the list to the dirty areas.
// This happens when SetPosition() has been called on the render target
// to change the window size.
//
bool fWholeTargetInvalid = false;
-
+
IFC(m_pRenderTarget->GetInvalidRegions(
&rgInvalidTargetRegions,
&uNumInvalidTargetRegions,
@@ -159,7 +159,7 @@ CSlaveHWndRenderTarget::Render(
// the layered window is opaque, I just tried it and artifacts appeared everywhere,
// and since it's not a goal to make it work, I haven't debugged it).
//
- bool fCanAccelerateScroll = !m_fNeedsFullRender
+ bool fCanAccelerateScroll = !m_fNeedsFullRender
&& (uNumInvalidTargetRegions == 0)
&& (m_WindowLayerType == MilWindowLayerType::NotLayered);
@@ -191,7 +191,7 @@ CSlaveHWndRenderTarget::Render(
uNumInvalidTargetRegions,
rgInvalidTargetRegions,
fCanAccelerateScroll,
- &fNeedsFullPresent
+ &fNeedsFullPresent
));
pDrawingContext->EndFrame();
@@ -220,11 +220,11 @@ CSlaveHWndRenderTarget::Render(
//
// If we have no invalid regions for this frame, we will
// not present and will keep the previous frames invalid regions
- // because we did not copy them in CDrawingContext::Render. We
+ // because we did not copy them in CDrawingContext::Render. We
// will copy them on the next frame that actually does get presented.
//
if (m_fHasInvalidRegions)
- {
+ {
IFC(SendInvalidRegions());
}
@@ -266,13 +266,13 @@ CSlaveHWndRenderTarget::Present()
if (m_fNeedsPresent)
{
m_fNeedsPresent = false;
-
+
if ( m_pRenderTarget
&& m_fRenderingEnabled
&& !m_fNoScreenAccess // If we don't have screen access; so no need to present.
&& !m_fIsZombie)
{
-
+
IFC(m_pRenderTarget->Present());
if (g_uMilPerfInstrumentationFlags & MilPerfInstrumentation_SignalPresent)
{
@@ -295,7 +295,7 @@ CSlaveHWndRenderTarget::Present()
// HandleWindowErrors also handles some success codes (e.g. S_PRESENT_OCCLUDED). Hence calling it
// outside of the if-FAILED block.
hr = HandleWindowErrors(hr);
-
+
RRETURN1(hr, S_PRESENT_OCCLUDED);
}
@@ -303,11 +303,11 @@ CSlaveHWndRenderTarget::Present()
//
// Member: CSlaveHWndRenderTarget::PostDisplayAvailabilityMessage
//
-// Synopsis: Sends m_DisplayDevicesAvailabilityChangedWindowMessage to the
-// HWND.
+// Synopsis: Sends m_DisplayDevicesAvailabilityChangedWindowMessage to the
+// HWND.
//
-// wParam for this message is set to 0 if no displays are available,
-// and it is set to 1 when > 0 displays are available.
+// wParam for this message is set to 0 if no displays are available,
+// and it is set to 1 when > 0 displays are available.
//
// lParam is unused.
// Parameters:
@@ -320,11 +320,11 @@ CSlaveHWndRenderTarget::Present()
BOOL CSlaveHWndRenderTarget::PostDisplayAvailabilityMessage(int displayCount)
{
m_LastKnownDisplayDevicesAvailabilityChangedWParam = (displayCount > 0) ? 1 : 0;
- return
+ return
PostMessage(
- m_hWnd,
- m_DisplayDevicesAvailabilityChangedWindowMessage,
- m_LastKnownDisplayDevicesAvailabilityChangedWParam,
+ m_hWnd,
+ m_DisplayDevicesAvailabilityChangedWindowMessage,
+ m_LastKnownDisplayDevicesAvailabilityChangedWParam,
0);
}
@@ -332,11 +332,11 @@ BOOL CSlaveHWndRenderTarget::PostDisplayAvailabilityMessage(int displayCount)
//
// Member: CSlaveHWndRenderTarget::NotifyInvalidDisplaySet
//
-// Synopsis: Invalidates this particulare HWND render target if it isn't
-// a full-screen render target (typically used by the DWM)
+// Synopsis: Invalidates this particulare HWND render target if it isn't
+// a full-screen render target (typically used by the DWM)
// Parameters:
-// invalid: When true, indicates that the new display set
-// obtained after the recent mode-change is invalid.
+// invalid: When true, indicates that the new display set
+// obtained after the recent mode-change is invalid.
// oldDisplayCount: The number of valid displays available before this
// change.
// displayCount: Indicates the number of valid displays available
@@ -360,7 +360,7 @@ CSlaveHWndRenderTarget::NotifyDisplaySetChange(bool invalid , int oldDisplayCoun
// Let the UI thread know that the display-set has changed in a meaningful way.
// This helps in ensuring that the UI thread does not repeatedly attempt to process
// WM_PAINT or invalidate itself when the render-thread is unable to render.
- if ((invalid || (displayCount == 0)) &&
+ if ((invalid || (displayCount == 0)) &&
(oldDisplayCount != displayCount))
{
PostDisplayAvailabilityMessage(displayCount); // ignore return value
@@ -403,9 +403,9 @@ CSlaveHWndRenderTarget::ProcessCreate(
HRESULT hr = S_OK;
RtlCopyMemory(&m_clearColor, &pCmd->clearColor, sizeof(m_clearColor));
-
+
m_hWnd = (HWND)pCmd->hwnd;
-
+
DpiProvider::UpdateDpi(DpiScale(pCmd->DpiX, pCmd->DpiY));
DpiProvider::SetDpiAwarenessContext(pCmd->DpiAwarenessContext);
@@ -418,7 +418,7 @@ CSlaveHWndRenderTarget::ProcessCreate(
RRETURN(hr);
}
-HRESULT
+HRESULT
CSlaveHWndRenderTarget::ProcessSuppressLayered(
__in_ecount(1) CMilSlaveHandleTable* pHandleTable,
__in_ecount(1) const MILCMD_HWNDTARGET_SUPPRESSLAYERED* pCmd
@@ -427,7 +427,7 @@ CSlaveHWndRenderTarget::ProcessSuppressLayered(
RRETURN(S_OK);
}
-HRESULT
+HRESULT
CSlaveHWndRenderTarget::ProcessDpiChanged(
__in_ecount(1) CMilSlaveHandleTable* pHandleTable,
__in_ecount(1) const MILCMD_HWNDTARGET_DPICHANGED* pCmd
@@ -443,7 +443,7 @@ CSlaveHWndRenderTarget::ProcessDpiChanged(
// CSlaveHWndRenderTarget::CalculateWindowRect
//
// Synopsis:
-// A helper method that obtains the window rect.
+// A helper method that obtains the window rect.
//
//----------------------------------------------------------------------------
@@ -487,19 +487,19 @@ CSlaveHWndRenderTarget::CalculateWindowRect()
Cleanup:
if (FAILED(hr))
{
- //
- // Since there appear to be random multiple errors being
+ //
+ // Since there appear to be random multiple errors being
// returned here, and we can't rely on WIN32 error codes being
// accurate, for the time being we are dying silently on the ones
// below by returning a WGXERR_GENERIC_IGNORE.
//
- TraceTag((tagMILWarning,
- "CSlaveHWndRenderTarget::GetWindowRect: Failure occurred, converting to WGXERR_GENERIC_IGNORE"));
+ TraceTag((tagMILWarning,
+ "CSlaveHWndRenderTarget::GetWindowRect: Failure occurred, converting to WGXERR_GENERIC_IGNORE"));
MIL_THR(WGXERR_GENERIC_IGNORE);
}
- RRETURN(hr);
+ RRETURN(hr);
}
@@ -509,7 +509,7 @@ CSlaveHWndRenderTarget::CalculateWindowRect()
HRESULT
CSlaveHWndRenderTarget::ProcessUpdateWindowSettings(
- __in_ecount(1) CMilSlaveHandleTable* pHandleTable,
+ __in_ecount(1) CMilSlaveHandleTable* pHandleTable,
__in_ecount(1) const MILCMD_TARGET_UPDATEWINDOWSETTINGS* pCmd
)
{
@@ -569,7 +569,7 @@ CSlaveHWndRenderTarget::ProcessUpdateWindowSettings(
{
// Remember the lastest cookie.
m_disableCookie = pCmd->disableCookie;
-
+
m_fRenderingEnabled = false;
}
}
@@ -645,7 +645,7 @@ CSlaveHWndRenderTarget::ProcessUpdateWindowSettings(
IFC(UpdateRenderTargetFlags(
m_UCETargetFlags
));
-
+
Cleanup:
RRETURN(hr);
@@ -694,7 +694,7 @@ CSlaveHWndRenderTarget::ProcessSetFlags(
HRESULT hr = S_OK;
const MilRTInitialization::Flags c_dwAllowedFlags =
- (MilRTInitialization::TypeMask | MilRTInitialization::UseRefRast | MilRTInitialization::UseRgbRast);
+ (MilRTInitialization::TypeMask | MilRTInitialization::UseRefRast | MilRTInitialization::UseRgbRast | MilRTInitialization::DisableDirtyRectangles);
MilRTInitialization::Flags dwNewInitializationFlags;
@@ -725,8 +725,8 @@ CSlaveHWndRenderTarget::ProcessInvalidate(
UINT cbPayload
)
{
- HRESULT hr = S_OK;
-
+ HRESULT hr = S_OK;
+
// We get a WM_PAINT when the screen is unlocked.... or immediately after
// invalidation if the window is layered or running in the DWM.
@@ -734,7 +734,7 @@ CSlaveHWndRenderTarget::ProcessInvalidate(
// non-layered windows on XPDM. Other scenarios will still render when the
// screen is locked but those scenarios are not as bad. See comment in
// HandleWindowErrors for more information.
-
+
m_fNoScreenAccess = false;
if ( (pCmd->rc.right > pCmd->rc.left)
@@ -754,7 +754,7 @@ CSlaveHWndRenderTarget::ProcessInvalidate(
Cleanup:
RRETURN(hr);
}
-
+
//-----------------------------------------------------------------------------
// CSlaveHWndRenderTarget::SetNewRenderTargetFlags
@@ -788,10 +788,10 @@ HRESULT
CSlaveHWndRenderTarget::UpdateRenderTargetFlags()
{
// We want to update the render flags to possibly include software
- // based upon RenderOptions and the requested flags. We don't want to
- // overwrite the current flags requested by the client so we don't call
+ // based upon RenderOptions and the requested flags. We don't want to
+ // overwrite the current flags requested by the client so we don't call
// SetNewUCETargetFlags().
- RRETURN(UpdateRenderTargetFlags(m_UCETargetFlags));
+ RRETURN(UpdateRenderTargetFlags(m_UCETargetFlags));
}
//-----------------------------------------------------------------------------
@@ -891,7 +891,7 @@ CSlaveHWndRenderTarget::EnsureRenderTargetInternal()
EventWriteWClientDesktopRTCreateEnd((UINT64)m_hWnd);
m_fNeedsFullRender = true;
- m_fTransparencyDirty = true;
+ m_fTransparencyDirty = true;
}
Assert(m_pRenderTarget != NULL);
@@ -924,7 +924,7 @@ CSlaveHWndRenderTarget::UpdateWindowSettingsInternal()
// commands to update their size and location. So we have to query
// it all the time.
//
-
+
if (m_fChild)
{
IFC(CalculateWindowRect());
@@ -981,7 +981,7 @@ CSlaveHWndRenderTarget::InvalidateInternal(
{
IFC(m_invalidRegions.Add(*pRect));
}
-
+
m_fHasInvalidRegions = true;
Cleanup:
@@ -1054,10 +1054,10 @@ CSlaveHWndRenderTarget::HandleWindowErrors(HRESULT hr)
{
// Setting the flag will force us to create a software render target on the next render.
// This will never allow us to get back into hw mode. To enable resetting the render target
- // using the SetFlags command simply set
+ // using the SetFlags command simply set
// m_UCETargetFlags = m_UCETargetFlags | MilRTInitialization::SoftwareOnly;
- // This feature intentionally not enabled becuase we do not have any API exposure for it and
- // there is no test plan.
+ // This feature intentionally not enabled becuase we do not have any API exposure for it and
+ // there is no test plan.
Assert((m_UCETargetFlags & MilRTInitialization::TypeMask) != MilRTInitialization::HardwareOnly);
Assert((m_RenderTargetFlags & MilRTInitialization::TypeMask) != MilRTInitialization::HardwareOnly);
m_fSoftwareFallback = true;
@@ -1072,11 +1072,11 @@ CSlaveHWndRenderTarget::HandleWindowErrors(HRESULT hr)
ReleaseResources();
SetScreenAccessDenied();
- // If m_LastKnownDisplayDevicesAvailabilityChangedWParam == 0, it means that the
- // UI thread will eventually call InvalidateRect(HWND) when it receives an updated
- // m_DisplayDevicesAvailabilityChanged Window Message with wParam = 1.
- // Until then, we do not need to continue invalidating the window - doing so will
- // simply generate a series of WM_PAINT messages that would be handled and ignroed by
+ // If m_LastKnownDisplayDevicesAvailabilityChangedWParam == 0, it means that the
+ // UI thread will eventually call InvalidateRect(HWND) when it receives an updated
+ // m_DisplayDevicesAvailabilityChanged Window Message with wParam = 1.
+ // Until then, we do not need to continue invalidating the window - doing so will
+ // simply generate a series of WM_PAINT messages that would be handled and ignroed by
// the UI thread
if ((hr == WGXERR_NEED_RECREATE_AND_PRESENT) ||
((hr == WGXERR_DISPLAYSTATEINVALID) && (m_LastKnownDisplayDevicesAvailabilityChangedWParam != 0)))
@@ -1085,11 +1085,11 @@ CSlaveHWndRenderTarget::HandleWindowErrors(HRESULT hr)
}
// The composition object needs to know when the underlying render targets
- // are being recreated; therefore we bubble WGXERR_DISPLAYSTATEINVALID
- // up.
+ // are being recreated; therefore we bubble WGXERR_DISPLAYSTATEINVALID
+ // up.
hrReturn = WGXERR_DISPLAYSTATEINVALID;
break;
-
+
case WGXERR_SCREENACCESSDENIED: // Display is locked right now
SetScreenAccessDenied();
__fallthrough;
@@ -1100,7 +1100,7 @@ CSlaveHWndRenderTarget::HandleWindowErrors(HRESULT hr)
hrReturn = S_OK;
break;
-
+
case __HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE): // FALL THROUGH Window has been asynchronously destroyed
m_fIsZombie = TRUE;
__fallthrough;
@@ -1121,8 +1121,8 @@ CSlaveHWndRenderTarget::HandleWindowErrors(HRESULT hr)
}
//
- // Somewhat special case for S_PRESENT_OCCLUDED. In this case nothing is
- // wrong with the render target, we just need to do a full present when we
+ // Somewhat special case for S_PRESENT_OCCLUDED. In this case nothing is
+ // wrong with the render target, we just need to do a full present when we
// become un-occluded.
//
if (hrReturn == S_PRESENT_OCCLUDED)
@@ -1150,7 +1150,7 @@ CSlaveHWndRenderTarget::SetScreenAccessDenied()
// is locked for software render targets or for hardware
// render targets that present to GDI. For hardware render
// targets that do not present to GDI we get
- // WGXERR_DISPLAYSTATEINVALID.
+ // WGXERR_DISPLAYSTATEINVALID.
//
// On Vista WDDM, D3D Presents return S_PRESENT_OCCLUDED,
// but lower levels of the code eat this error. GDI
@@ -1182,7 +1182,7 @@ CSlaveHWndRenderTarget::SetScreenAccessDenied()
// will come to us immediately. This *could* cause us to
// loop, producing a WM_PAINT "storm", *if* we fail with
// one of the above error codes in these cases when the
- // screen is (still) locked.
+ // screen is (still) locked.
//
// Fortunately for us, the cases
// which do not hold back WM_PAINTs also do not return
@@ -1194,14 +1194,14 @@ CSlaveHWndRenderTarget::SetScreenAccessDenied()
// through here.
//
// 2009/09/23 BedeJ - Unfortunately for us, this last paragraph
- // is not entirely true. If the monitor is powered off, but the
+ // is not entirely true. If the monitor is powered off, but the
// display is not locked, a D3D present can fail with
// S_PRESENT_OCCLUDED (see CD3DDeviceLevel1::PresentWithD3D). When
- // I tried to work around this by invalidating the window before
+ // I tried to work around this by invalidating the window before
// silently eating the error, I ended up in the WM_PAINT storm
- // situation described here. The fix I developed instead was to
+ // situation described here. The fix I developed instead was to
// continue to ignore the failure, but have the UI thread register
- // for and listen to power broadcast events for monitor power on/off,
+ // for and listen to power broadcast events for monitor power on/off,
// and to invalidate the entire window when the monitor is powered
// back on if a failure . To avoid unnecessary invalidation of windows that
// haven't had a failed present, we send a window message to the UI
@@ -1209,8 +1209,8 @@ CSlaveHWndRenderTarget::SetScreenAccessDenied()
// that the invalidation is necessary.
//
- m_fNoScreenAccess = true;
-}
+ m_fNoScreenAccess = true;
+}
//+-----------------------------------------------------------------------
//
@@ -1240,46 +1240,46 @@ HRESULT CSlaveHWndRenderTarget::WaitForVBlank()
{
MIL_THR(WGXERR_NO_HARDWARE_DEVICE);
}
-
+
RRETURN(hr);
}
//------------------------------------------------------------------
// CSlaveHWndRenderTarget::ReleaseResources
-//
+//
// Wrapper function for releasing all render targets and cleaning
// up dependent member variables
//------------------------------------------------------------------
void
CSlaveHWndRenderTarget::ReleaseResources()
-{
+{
ReleaseInterface(m_pRenderTarget);
ReleaseDrawingContext();
}
-
+
//+------------------------------------------------------------------------
//
// Function: CSlaveHWndRenderTarget::Advance
//
// Synopsis: Advances frame count and inserts a gpu marker.
-//
+//
//-------------------------------------------------------------------------
void
CSlaveHWndRenderTarget::AdvanceFrame(UINT uFrameNumber)
{
- if (m_fRenderingEnabled && !m_fIsZombie && m_pRenderTarget)
+ if (m_fRenderingEnabled && !m_fIsZombie && m_pRenderTarget)
{
m_pRenderTarget->AdvanceFrame(uFrameNumber);
}
}
-
+
//+------------------------------------------------------------------------
//
// Function: CSlaveHWndRenderTarget::GetNumQueuedPresents
//
-// Synopsis: Forwards to the rendertarget if it's valid, otherwise
+// Synopsis: Forwards to the rendertarget if it's valid, otherwise
// returns 0.
-//
+//
//-------------------------------------------------------------------------
HRESULT
CSlaveHWndRenderTarget::GetNumQueuedPresents(
@@ -1288,8 +1288,8 @@ CSlaveHWndRenderTarget::GetNumQueuedPresents(
{
HRESULT hr = S_OK;
- if (m_fRenderingEnabled
- && !m_fIsZombie
+ if (m_fRenderingEnabled
+ && !m_fIsZombie
&& m_pRenderTarget
)
{
@@ -1311,7 +1311,7 @@ CSlaveHWndRenderTarget::GetNumQueuedPresents(
// Synopsis: Returns the underlying render target internal.
//
//------------------------------------------------------------------------
-HRESULT
+HRESULT
CSlaveHWndRenderTarget::GetBaseRenderTargetInternal(
__deref_out_opt IRenderTargetInternal **ppIRT
)
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/Generated/wgx_misc.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/Generated/wgx_misc.h
index 2ab30d7c2e7..95c63afa452 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/Generated/wgx_misc.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/Generated/wgx_misc.h
@@ -745,32 +745,38 @@ BEGIN_MILFLAGENUM( MilRTInitialization )
//
// This flag forces the creation of a render target bitmap to match its
// parent's type, so a software surface only creates software RTs and a
- // hardware surface only creates hardware RTs. This is necessary for the
+ // hardware surface only creates hardware RTs. This is necessary for the
// hardware-accelerated bitmap effects pipeline to guarantee that we do
- // not encounter a situation where we're trying to run shaders sampling
+ // not encounter a situation where we're trying to run shaders sampling
// from a hardware texture to render into a software intermediate.
//
ForceCompatible = 0x00002000,
//
- // This flag is the same as DisableDisplayClipping except that it disables
+ // This flag is the same as DisableDisplayClipping except that it disables
// display clipping on multi-monitor configurations in all OS'. This flag is
- // automatically
- // set on Windows 8 and newer systems. If WPF decides to unset
- // DisableDisplayClipping, then DisableMultimonDisplayClipping flag will not be
+ // automatically
+ // set on Windows 8 and newer systems. If WPF decides to unset
+ // DisableDisplayClipping, then DisableMultimonDisplayClipping flag will not be
// respected even if set by an applicaiton via its manifest
//
DisableMultimonDisplayClipping = 0x00004000,
//
- // This flag is passed down by PresentationCore to tell wpfgfx that
- // the DisableMultimonDisplayClipping compatibity flag is set by the user. This
+ // This flag is passed down by PresentationCore to tell wpfgfx that
+ // the DisableMultimonDisplayClipping compatibity flag is set by the user. This
// allows us to distinguish between when DisableMultimonDisplayClipping == 0 means
- // that the user set it to false explicitly, versus when the user didn't set it
+ // that the user set it to false explicitly, versus when the user didn't set it
// and the DisableMultimonDisplayClipping bit happens to be implicitly set to 0
//
IsDisableMultimonDisplayClippingValid = 0x00008000,
+ //
+ // This flag directs the render target to render the full scene,
+ // bypassing D3D's dirty-rectangle optimizations.
+ //
+ DisableDirtyRectangles = 0x00010000,
+
//
// Test only / internal flags
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/exports.cs b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/exports.cs
index ebeae5054ab..04d1faf94ed 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/exports.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/exports.cs
@@ -273,7 +273,7 @@ out int messageRetrieved
IntPtr pChannel,
DUCE.ResourceHandle hResource,
out uint refCount
- );
+ );
}
///
@@ -452,7 +452,7 @@ internal void Commit()
///
///
/// Critical: This code calls into MilConnection_CloseBatch which causes an elevation
- /// TreatAsSafe: Closing a batch is safe and nothing is exposed. Batches are in the
+ /// TreatAsSafe: Closing a batch is safe and nothing is exposed. Batches are in the
/// render thread, and can only be written to from the UI thread while
/// they're open using other SC/STAS methods on DUCE.Channel. Once closed,
/// the only operation that can be done on a batch is Channel.Commit.
@@ -574,7 +574,7 @@ ref handle
if (EventTrace.IsEnabled(EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW))
{
- EventTrace.EventProvider.TraceEvent(EventTrace.Event.CreateOrAddResourceOnChannel, EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW, PerfService.GetPerfElementID(instance), _hChannel, (uint) handle, (uint) resourceType);
+ EventTrace.EventProvider.TraceEvent(EventTrace.Event.CreateOrAddResourceOnChannel, EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW, PerfService.GetPerfElementID(instance), _hChannel, (uint) handle, (uint) resourceType);
}
return handleNeedsCreation;
@@ -650,14 +650,14 @@ out releasedOnChannel
if ((releasedOnChannel != 0) && EventTrace.IsEnabled(EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW))
{
- EventTrace.EventProvider.TraceEvent(EventTrace.Event.ReleaseOnChannel, EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW, _hChannel, (uint) handle);
+ EventTrace.EventProvider.TraceEvent(EventTrace.Event.ReleaseOnChannel, EventTrace.Keyword.KeywordGraphics | EventTrace.Keyword.KeywordPerf, EventTrace.Level.PERF_LOW, _hChannel, (uint) handle);
}
return (releasedOnChannel != 0);
}
///
- /// Internal only: GetRefCount returns the reference count of a resource
+ /// Internal only: GetRefCount returns the reference count of a resource
/// corresponding to the specified handle on the channel.
///
///
@@ -1152,7 +1152,7 @@ public bool IsOnChannel(Channel channel)
///
- /// Returns the real UInt32 handle.
+ /// Returns the real UInt32 handle.
///
public DUCE.ResourceHandle Handle { get { return _handle; } }
}
@@ -1702,7 +1702,7 @@ public bool CreateOrAddRefOnChannel(object instance, Channel channel, DUCE.Resou
bool inmap = _map.Get(channel, out handle);
bool created = channel.CreateOrAddRefOnChannel(instance, ref handle, type);
-
+
if (!inmap)
{
_map.Set(channel, handle);
@@ -1880,7 +1880,7 @@ internal static void SetEffect(
DUCE.ResourceHandle hEffect,
Channel channel)
{
- DUCE.MILCMD_VISUAL_SETEFFECT command;
+ DUCE.MILCMD_VISUAL_SETEFFECT command;
command.Type = MILCMD.MilCmdVisualSetEffect;
command.Handle = hCompositionNode;
@@ -1894,7 +1894,7 @@ internal static void SetEffect(
);
}
}
-
+
///
/// Critical: This code accesses an unsafe code block
@@ -1906,7 +1906,7 @@ internal static void SetCacheMode(
DUCE.ResourceHandle hCacheMode,
Channel channel)
{
- DUCE.MILCMD_VISUAL_SETCACHEMODE command;
+ DUCE.MILCMD_VISUAL_SETCACHEMODE command;
command.Type = MILCMD.MilCmdVisualSetCacheMode;
command.Handle = hCompositionNode;
@@ -2054,7 +2054,7 @@ internal static void SetScrollableAreaClip(
sizeof(DUCE.MILCMD_VISUAL_SETSCROLLABLEAREACLIP)
);
}
- }
+ }
///
/// Critical: This code accesses an unsafe code block
@@ -2534,7 +2534,7 @@ Channel channel
command.flags |= (UInt32)MILRTInitializationFlags.MIL_RT_SOFTWARE_ONLY;
}
- bool? enableMultiMonitorDisplayClipping =
+ bool? enableMultiMonitorDisplayClipping =
System.Windows.CoreCompatibilityPreferences.EnableMultiMonitorDisplayClipping;
if (enableMultiMonitorDisplayClipping != null)
@@ -2548,6 +2548,11 @@ Channel channel
}
}
+ if (CoreAppContextSwitches.DisableDirtyRectangles)
+ {
+ command.flags |= (UInt32)MILRTInitializationFlags.MIL_RT_DISABLE_DIRTY_RECTANGLES;
+ }
+
command.hBitmap = DUCE.ResourceHandle.Null;
command.stride = 0;
command.ePixelFormat = 0;
@@ -2791,17 +2796,17 @@ Channel channel
}
///
- /// See for
+ /// See for
/// details.
///
///
/// Critical: This code accesses an unsafe code block
- /// Safe: Operation is ok to call, sending a pointer to a channel is safe,
+ /// Safe: Operation is ok to call, sending a pointer to a channel is safe,
/// and this does not return any Critical data to the caller
///
[SecuritySafeCritical]
internal static void NotifyPolicyChangeForNonInteractiveMode(
- bool forceRender,
+ bool forceRender,
Channel channel
)
{
@@ -2814,8 +2819,8 @@ Channel channel
unsafe
{
channel.SendCommand(
- (byte*)&command,
- sizeof(DUCE.MILCMD_PARTITION_NOTIFYPOLICYCHANGEFORNONINTERACTIVEMODE),
+ (byte*)&command,
+ sizeof(DUCE.MILCMD_PARTITION_NOTIFYPOLICYCHANGEFORNONINTERACTIVEMODE),
sendInSeparateBatch: false
);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/processed/wgx_core_types.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/processed/wgx_core_types.h
index 14e615e472d..0b2aa8e2412 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/processed/wgx_core_types.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/processed/wgx_core_types.h
@@ -858,6 +858,12 @@ BEGIN_MILFLAGENUM( MilRTInitialization )
//
IsDisableMultimonDisplayClippingValid = 0x00008000,
+ //
+ // This flag directs the render target to render the full scene,
+ // bypassing D3D's dirty-rectangle optimizations.
+ //
+ DisableDirtyRectangles = 0x00010000,
+
//
// Test only / internal flags
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/wgx_core_types_compat.cs b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/wgx_core_types_compat.cs
index 0fc50a44e82..5bc2b83c1ed 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/wgx_core_types_compat.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/include/wgx_core_types_compat.cs
@@ -25,133 +25,133 @@ internal enum MIL_SEGMENT_TYPE {
MilSegmentPolyLine,
MilSegmentPolyBezier,
MilSegmentPolyQuadraticBezier,
-
+
MIL_SEGMENT_TYPE_FORCE_DWORD = unchecked((int)0xffffffff)
};
[System.Flags]
internal enum MILCoreSegFlags
{
-
+
SegTypeLine = 0x00000001,
SegTypeBezier = 0x00000002,
SegTypeMask = 0x00000003,
-
+
// When this bit is set then this segment is not to be stroked
SegIsAGap = 0x00000004,
-
+
// When this bit is set then the join between this segment and the PREVIOUS segment
// will be rounded upon widening, regardless of the pen line join property.
SegSmoothJoin = 0x00000008,
-
+
// When this bit is set on the first type then the figure should be closed.
SegClosed = 0x00000010,
-
+
// This bit indicates whether the segment is curved.
SegIsCurved = 0x00000020,
-
+
FORCE_DWORD = unchecked((int)0xffffffff)
};
-
+
internal enum MIL_PEN_CAP {
MilPenCapFlat = 0,
MilPenCapSquare = 1,
MilPenCapRound = 2,
MilPenCapTriangle = 3,
-
+
MIL_PEN_CAP_FORCE_DWORD = unchecked((int)0xffffffff)
};
-
+
internal enum MIL_PEN_JOIN {
MilPenJoinMiter = 0,
MilPenJoinBevel = 1,
MilPenJoinRound = 2,
-
+
MIL_PEN_JOIN_FORCE_DWORD = unchecked((int)0xffffffff)
};
-
+
[System.Flags]
internal enum MILRTInitializationFlags
{
-
+
// Default initialization flags (0) imply hardware with software fallback,
// synchronized to reduce tearing for hw RTs, and no retention of contents
// between scenes.
-
+
MIL_RT_INITIALIZE_DEFAULT = 0x00000000,
-
+
// This flag disables the hardware accelerated RT. Use only software.
-
+
MIL_RT_SOFTWARE_ONLY = 0x00000001,
-
+
// This flag disables the software RT. Use only hardware.
-
+
MIL_RT_HARDWARE_ONLY = 0x00000002,
-
+
// Creates a dummy render target that consumes all calls
-
+
MIL_RT_NULL = 0x00000003,
-
+
// Mask for choice of render target
-
+
MIL_RT_TYPE_MASK = 0x00000003,
-
+
// This flag indicates that presentation should not wait for any specific
// time to promote the results to the display. This may result in display
// tearing.
-
+
MIL_RT_PRESENT_IMMEDIATELY = 0x00000004,
-
+
// This flag makes the RT reatin the contents from one frame to the next.
// Retaining the contents has performance implications. For scene changes
// with little to update retaining contents may help, but if most of the
// scene will be repainted anyway, retention may hurt some hw scenarios.
-
+
MIL_RT_PRESENT_RETAIN_CONTENTS = 0x00000008,
-
+
// This flag indicates that we should create a full screen RT.
-
+
MIL_RT_FULLSCREEN = 0x00000010,
-
+
// This flag indicates that the render target backbuffer will have
// linear gamma.
-
+
MIL_RT_LINEAR_GAMMA = 0x00000020,
-
+
// This flag indicates that the render target backbuffer will have
// an alpha channel that is at least 8 bits wide.
-
+
MIL_RT_NEED_DESTINATION_ALPHA = 0x00000040,
-
+
// This flag allows the render target backbuffer to contain
// 10 bits per channel rather than 32. This flag only has
// meaning when linear gamma is also present.
-
+
MIL_RT_ALLOW_LOW_PRECISION = 0x00000080,
-
+
// This flag assumes that all resources (such as bitmaps and render
// targets) are released on the same thread as the rendering device. This
// flag enables us to use a single threaded dx device instead of a
// multi-threaded one.
-
+
MIL_RT_SINGLE_THREADED_USAGE = 0x00000100,
-
+
// This flag directs the render target to extend its presentation area
// to include the non-client area. The origin of the render target space
// will be equal to the origin of the window.
-
+
MIL_RT_RENDER_NONCLIENT = 0x00000200,
-
+
// This flag enables tear free composition by using the SWAPEFFECT D3D_FLIP.
-
+
MIL_RT_PRESENT_FLIP = 0x00000400,
-
+
// Setting this flag results in the DX device instructing the driver not to
// autorotate if the monitor is in a rotated mode. Only makes sense for
// fullscreen RTs
-
+
MIL_RT_FULLSCREEN_NO_AUTOROTATE = 0x00000800,
-
+
// This flag directed the render target not to restrict its rendering and
// presentation to the visible portion of window on the desktop. This is
// useful for when the window position may be faked or the system may try
@@ -163,58 +163,64 @@ internal enum MILRTInitializationFlags
MIL_RT_DISABLE_DISPLAY_CLIPPING = 0x00001000,
//
- // This flag is the same as MIL_RT_DISABLE_DISPLAY_CLIPPING except that it disables
- // display clipping on multi-monitor configurations in all OS'. This flag is automatically
- // set on Windows 8 and newer systems. If WPF decides to unset
+ // This flag is the same as MIL_RT_DISABLE_DISPLAY_CLIPPING except that it disables
+ // display clipping on multi-monitor configurations in all OS'. This flag is automatically
+ // set on Windows 8 and newer systems. If WPF decides to unset
// MIL_RT_DISABLE_DISPLAY_CLIPPING, then MIL_RT_DISABLE_MULTIMON_DISPLAY_CLIPPING flag
// will not be respected even if set by an applicaiton via its manifest
//
MIL_RT_DISABLE_MULTIMON_DISPLAY_CLIPPING = 0x00004000,
//
- // This flag is passed down by PresentationCore to tell wpfgfx that
- // the DisableMultimonDisplayClipping compatibity flag is set by the user. This
+ // This flag is passed down by PresentationCore to tell wpfgfx that
+ // the DisableMultimonDisplayClipping compatibity flag is set by the user. This
// allows us to distinguish between when DisableMultimonDisplayClipping == 0 means
- // that the user set it to false explicitly, versus when the user didn't set it
+ // that the user set it to false explicitly, versus when the user didn't set it
// and the DisableMultimonDisplayClipping bit happens to be implicitly set to 0
//
MIL_RT_IS_DISABLE_MULTIMON_DISPLAY_CLIPPING_VALID = 0x00008000,
- //
+ //
+ // This flag directs the render target to render the full scene,
+ // bypassing D3D's dirty-rectangle optimizations.
+ //
+ MIL_RT_DISABLE_DIRTY_RECTANGLES = 0x00010000,
+
+ //
// UCE only flags
//
-
+
// This flag directs the composition rendertarget to enable the occlusion
// culling optimization.
MIL_UCE_RT_ENABLE_OCCLUSION = 0x00010000,
-
-
+
+
//
// Test only / internal flags
//
-
+
// This flag forces the render target to use the d3d9 reference raster
// when using d3d. (Should be combined with MIL_RT_INITIALIZE_DEFAULT or
// MIL_RT_HARDWARE_ONLY)
// This is designed for test apps only
-
+
MIL_RT_USE_REF_RAST = 0x01000000,
-
+
// This flag forces the render target to use the rgb reference raster
// when using d3d.( Should be combined with MIL_RT_INITIALIZE_DEFAULT or
// MIL_RT_HARDWARE_ONLY )
// This is designed for test apps only
-
+
MIL_RT_USE_RGB_RAST = 0x02000000,
-
-
+
+
// MIL Core Rendering Internal flag (=Do NOT pass to RT Create methods)
// This flag enables the buffer to be set up in a transposed mode
// in order to manage our own rotation for 90 and 270 degree rotations.
-
+
MIL_RT_FULLSCREEN_TRANSPOSE_XY = unchecked((int)0x10000000),
-
-
+
+
// We support 4 primary present modes:
//
// 1) Present using D3D
@@ -227,11 +233,11 @@ internal enum MILRTInitializationFlags
MIL_RT_PRESENT_USING_BITBLT = unchecked((int)0x40000000),
MIL_RT_PRESENT_USING_ALPHABLEND = unchecked((int)0x80000000),
MIL_RT_PRESENT_USING_ULW = unchecked((int)0xC0000000),
-
+
FORCE_DWORD = unchecked((int)0xffffffff)
};
-
-
+
+
internal enum MIL_PRESENTATION_RESULTS {
MIL_PRESENTATION_VSYNC,
MIL_PRESENTATION_NOPRESENT,
@@ -239,7 +245,7 @@ internal enum MIL_PRESENTATION_RESULTS {
MIL_PRESENTATION_DWM,
MIL_PRESENTATION_FORCE_DWORD = unchecked((int)0xffffffff)
};
-
+
[StructLayout(LayoutKind.Sequential, Pack=1)]
internal struct MIL_PEN_DATA {
internal double Thickness;
@@ -251,29 +257,28 @@ internal struct MIL_PEN_DATA {
internal MIL_PEN_JOIN LineJoin;
internal UInt32 DashArraySize;
};
-
+
[System.Flags]
internal enum MILTransparencyFlags
{
-
+
Opaque = 0x0,
ConstantAlpha = 0x1,
PerPixelAlpha = 0x2,
ColorKey = 0x4,
-
+
FORCE_DWORD = unchecked((int)0xffffffff)
};
-
+
internal enum MILWindowLayerType
{
-
+
NotLayered = 0,
SystemManagedLayer = 1,
ApplicationManagedLayer = 2,
-
+
FORCE_DWORD = unchecked((int)0xffffffff)
};
-
From 194e4ec4567373f482313eb5f25f82166f8ba200 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:13:41 +0530
Subject: [PATCH 191/223] preserve extra info across PeekMessage (#5838)
(#6001)
Co-authored-by: Sam Bent
---
.../src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs | 4 +++-
.../src/WindowsBase/System/Windows/Threading/Dispatcher.cs | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs
index 5f0d758f925..358e053fdf0 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs
@@ -187,9 +187,11 @@ internal unsafe static extern SafeFileHandle CreateFile(
#if BASE_NATIVEMETHODS
-
[DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
internal static extern IntPtr GetMessageExtraInfo();
+
+ [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
+ internal static extern IntPtr SetMessageExtraInfo(IntPtr lParam);
#endif
#if BASE_NATIVEMETHODS
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs
index f87a32dee96..90728a1022a 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs
@@ -2417,8 +2417,14 @@ internal bool CriticalRequestProcessing(bool force)
}
else if (_postedProcessingType == PROCESS_FOREGROUND)
{
+ // Preserve the thread's current "extra message info"
+ // (PeekMessage overwrites it).
+ IntPtr extraInformation = UnsafeNativeMethods.GetMessageExtraInfo();
+
MSG msg = new MSG();
UnsafeNativeMethods.PeekMessage(ref msg, new HandleRef(this, _window.Value.Handle), _msgProcessQueue, _msgProcessQueue, NativeMethods.PM_REMOVE);
+
+ UnsafeNativeMethods.SetMessageExtraInfo(extraInformation);
}
_postedProcessingType = PROCESS_NONE;
}
From 0c2b044ac41b6be89b1ce63fe4f2684dd47932cb Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:13:52 +0530
Subject: [PATCH 192/223] honor UIA_WindowVisibilityOverridden property (#5839)
(#6000)
Co-authored-by: Sam Bent
---
.../Automation/HwndProxyElementProvider.cs | 17 ++++++++++++++++-
.../MS/Win32/UnsafeNativeMethods.cs | 7 +++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/HwndProxyElementProvider.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/HwndProxyElementProvider.cs
index 5c33d6fc70b..cf13ed68e2e 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/HwndProxyElementProvider.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/HwndProxyElementProvider.cs
@@ -574,7 +574,7 @@ WindowVisualState IWindowProvider.VisualState
WindowInteractionState IWindowProvider.InteractionState
{
- // Note: we should consider Implementing InteractionState by finding the gui thread of the
+ // Note: we should consider Implementing InteractionState by finding the gui thread of the
// process and mapping ThreadState and WaitReason to a WindowInteractionState
get
{
@@ -1457,6 +1457,21 @@ private static bool IsWindowReallyEnabled( NativeMethods.HWND hwnd )
// Check that a window is visible, and has a non-empty rect
private static bool IsWindowReallyVisible( NativeMethods.HWND hwnd )
{
+ // check for visibility overrides
+ // The UIA team says:
+ // * UIA_WindowVisibilityOverridden property was added in 2011 for Win8.1
+ // * "I'm not actually sure it is documented publicly."
+ // * "It's a window property that if its handle value is 1 it's ForceVisible, and if it's 2 it's ForceHidden."
+ IntPtr visibilityOverride = UnsafeNativeMethods.GetProp(hwnd, "UIA_WindowVisibilityOverridden");
+ if (visibilityOverride == new IntPtr(1))
+ {
+ return true;
+ }
+ else if (visibilityOverride == new IntPtr(2))
+ {
+ return false;
+ }
+
if(!SafeNativeMethods.IsWindowVisible(hwnd))
{
return false;
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Win32/UnsafeNativeMethods.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Win32/UnsafeNativeMethods.cs
index 4e34d485888..78af001e011 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Win32/UnsafeNativeMethods.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Win32/UnsafeNativeMethods.cs
@@ -365,5 +365,12 @@ internal struct MENUBARINFO
[DllImport("gdi32.dll", CharSet = CharSet.Auto, SetLastError = true)]
internal static extern bool DeleteObject(IntPtr hrgn);
+ //
+ // Window Property Functions
+ //
+
+ [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+ internal static extern IntPtr GetProp(IntPtr hwnd, string name);
+
}
}
From 9e130d78e95db4c894615d2abb63a822239b3179 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:14:04 +0530
Subject: [PATCH 193/223] fix IME vs. property-changed Binding battle (#5840)
(#6006)
Co-authored-by: Sam Bent
---
.../System/Windows/Data/BindingExpressionBase.cs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs
index 3edb43d727e..7bd783c79da 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs
@@ -1174,7 +1174,7 @@ internal virtual bool Validate(object value, ValidationStep validationStep)
ValidationError oldValidationError = GetValidationErrors(validationStep);
// ignore an error from the implicit DataError rule - this is checked
- // separately (in BindingExpression.Validate).
+ // separately (in BindingExpression.Validate).
if (oldValidationError != null &&
oldValidationError.RuleInError == DataErrorValidationRule.Instance)
{
@@ -1484,6 +1484,15 @@ private void ProcessDirty()
{
if (IsUpdateOnPropertyChanged)
{
+ // cancel a pending UpdateTarget, so that it doesn't negate
+ // the effect of this change to the target value
+ DispatcherOperation op = (DispatcherOperation)GetValue(Feature.UpdateTargetOperation, null);
+ if (op != null)
+ {
+ ClearValue(Feature.UpdateTargetOperation);
+ op.Abort();
+ }
+
if (Helper.IsComposing(Target, TargetProperty))
{
// wait for the IME composition to complete
From 4dda72bb891ab0525edfb3eaa6b1e31428898b74 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:14:15 +0530
Subject: [PATCH 194/223] fix hang when margin is not a multiple of DPI
rounding quantum (#5841) (#6004)
Co-authored-by: Sam Bent
---
.../System/Windows/Controls/ItemsControl.cs | 32 ++++++++++++
.../Controls/VirtualizingStackPanel.cs | 49 ++++++++++++-------
2 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ItemsControl.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ItemsControl.cs
index 76eefa9db57..9f462e26b80 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ItemsControl.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ItemsControl.cs
@@ -3079,6 +3079,38 @@ internal static ElementViewportPosition GetElementViewportPosition(FrameworkElem
return ElementViewportPosition.None;
}
+ // this version also returns the element's layout rectangle (in viewport's coordinates).
+ // VirtualizingStackPanel needs this, to determine the element's scroll offset.
+ internal static ElementViewportPosition GetElementViewportPosition(FrameworkElement viewPort,
+ UIElement element,
+ FocusNavigationDirection axis,
+ bool fullyVisible,
+ bool ignorePerpendicularAxis,
+ out Rect elementRect,
+ out Rect layoutRect)
+ {
+ ElementViewportPosition position = GetElementViewportPosition(
+ viewPort,
+ element,
+ axis,
+ fullyVisible,
+ false,
+ out elementRect);
+
+ if (position == ElementViewportPosition.None)
+ {
+ layoutRect = Rect.Empty;
+ }
+ else
+ {
+ Visual parent = VisualTreeHelper.GetParent(element) as Visual;
+ Debug.Assert(element != viewPort && element.IsArrangeValid && parent != null, "GetElementViewportPosition called in unsupported situation");
+ layoutRect = CorrectCatastrophicCancellation(parent.TransformToAncestor(viewPort)).TransformBounds(element.PreviousArrangeRect);
+ }
+
+ return position;
+ }
+
// in large virtualized hierarchical lists (TreeView or grouping), the transform
// returned by element.TransformToAncestor(viewport) is vulnerable to catastrophic
// cancellation. If element is at the top of the viewport, but embedded in
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
index 0ae813c7da1..17c76adc7e1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
@@ -1189,6 +1189,7 @@ private FrameworkElement ComputeFirstContainerInViewport(
if (fe.IsVisible)
{
Rect elementRect;
+ Rect layoutRect;
// get the vp-position of the element, ignoring the secondary axis
// (DevDiv2 1136036, 1203626 show two different cases why we
@@ -1201,7 +1202,8 @@ private FrameworkElement ComputeFirstContainerInViewport(
direction,
false /*fullyVisible*/,
!isVSP45Compat /*ignorePerpendicularAxis*/,
- out elementRect);
+ out elementRect,
+ out layoutRect);
if (elementPosition == ElementViewportPosition.PartiallyInViewport ||
elementPosition == ElementViewportPosition.CompletelyInViewport)
@@ -1287,20 +1289,35 @@ private FrameworkElement ComputeFirstContainerInViewport(
{
if (direction == FocusNavigationDirection.Down)
{
- firstContainerOffsetFromViewport = elementRect.Y;
- if (!isVSP45Compat)
- {
- firstContainerOffsetFromViewport -= fe.Margin.Top;
- }
- }
+ if (isVSP45Compat)
+ {
+ firstContainerOffsetFromViewport = elementRect.Y;
+ }
+ else
+ {
+ // include the leading margin in the offset. Simply subtracting
+ // the margin doesn't work when layout rounding is in effect, as
+ // we can't deduce how rounding affected the arrangement of the
+ // element and its margin. Instead, just use the layout rect directly.
+ firstContainerOffsetFromViewport = layoutRect.Top;
+ }
+ }
else // (direction == FocusNavigationDirection.Right)
{
- firstContainerOffsetFromViewport = elementRect.X;
- if (!isVSP45Compat)
- {
- firstContainerOffsetFromViewport -= fe.Margin.Left;
- }
- }
+
+ if (isVSP45Compat)
+ {
+ firstContainerOffsetFromViewport = elementRect.X;
+ }
+ else
+ {
+ // include the leading margin in the offset. Simply subtracting
+ // the margin doesn't work when layout rounding is in effect, as
+ // we can't deduce how rounding affected the arrangement of the
+ // element and its margin. Instead, just use the layout rect directly.
+ firstContainerOffsetFromViewport = layoutRect.Left;
+ }
+ }
}
else if (findTopContainer && isTopContainer)
{
@@ -1931,7 +1948,7 @@ public ScrollViewer ScrollOwner
}
set
{
- if (_scrollData == null) EnsureScrollData();
+ EnsureScrollData();
if (value != _scrollData._scrollOwner)
{
ResetScrolling(this);
@@ -9510,10 +9527,6 @@ private int ItemCount
private void EnsureScrollData()
{
if (_scrollData == null) { _scrollData = new ScrollData(); }
- else
- {
- Debug.Assert(_scrollData._scrollOwner != null, "Scrolling an unconnected VSP");
- }
}
private static void ResetScrolling(VirtualizingStackPanel element)
From 69c38e3545434135e8324deab54da17ca15301b6 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:14:26 +0530
Subject: [PATCH 195/223] rect with negative height is not allowed (#5842)
(#6003)
Co-authored-by: Sam Bent
---
.../Controls/VirtualizingStackPanel.cs | 64 ++++++++++++++++---
1 file changed, 56 insertions(+), 8 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
index 17c76adc7e1..bec9fcdb559 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs
@@ -3559,8 +3559,11 @@ protected override void OnItemsChanged(object sender, ItemsChangedEventArgs args
{
ScrollTracer.Trace(this, ScrollTraceOp.ItemsChanged,
args.Action,
- "pos:", args.OldPosition, args.Position,
+ "stpos:", args.Position, Generator.IndexFromGeneratorPosition(args.Position),
+ "oldpos:", args.OldPosition, Generator.IndexFromGeneratorPosition(args.OldPosition),
"count:", args.ItemCount, args.ItemUICount,
+ "ev:", _firstItemInExtendedViewportIndex, "+", _itemsInExtendedViewportCount,
+ "ext:", IsScrolling ? _scrollData._extent : Size.Empty,
MeasureInProgress ? "MeasureInProgress" : String.Empty);
}
@@ -3653,10 +3656,10 @@ protected override bool ShouldItemsChangeAffectLayoutCore(bool areItemChangesLoc
{
case NotifyCollectionChangedAction.Remove:
{
- int startOldIndex = Generator.IndexFromGeneratorPosition(args.OldPosition);
+ int startIndex = Generator.IndexFromGeneratorPosition(args.Position);
shouldItemsChangeAffectLayout = args.ItemUICount > 0 ||
- (startOldIndex < _firstItemInExtendedViewportIndex + _itemsInExtendedViewportCount);
+ (startIndex < _firstItemInExtendedViewportIndex + _itemsInExtendedViewportCount);
}
break;
@@ -3782,6 +3785,7 @@ private void UpdateExtent(bool areItemChangesLocal)
{
bool isHorizontal = (Orientation == Orientation.Horizontal);
bool isVSP45Compat = IsVSP45Compat;
+ bool isTracing = ScrollTracer.IsEnabled && ScrollTracer.IsTracing(this);
ItemsControl itemsControl;
GroupItem groupItem;
@@ -3898,6 +3902,11 @@ private void UpdateExtent(bool areItemChangesLocal)
_scrollData._extent.Height = distance;
}
+ if (isTracing)
+ {
+ ScrollTracer.Trace(this, ScrollTraceOp.UpdateExtent, "ext:", _scrollData._extent);
+ }
+
ScrollOwner.InvalidateScrollInfo();
}
else if (virtualizationInfoProvider != null)
@@ -3916,6 +3925,11 @@ private void UpdateExtent(bool areItemChangesLocal)
pixelSize.Height = distance;
}
+ if (isTracing)
+ {
+ ScrollTracer.Trace(this, ScrollTraceOp.UpdateExtent, "ids.Px:", pixelSize);
+ }
+
itemDesiredSizes = new HierarchicalVirtualizationItemDesiredSizes(
itemDesiredSizes.LogicalSize,
itemDesiredSizes.LogicalSizeInViewport,
@@ -3938,6 +3952,11 @@ private void UpdateExtent(bool areItemChangesLocal)
logicalSize.Height = distance;
}
+ if (isTracing)
+ {
+ ScrollTracer.Trace(this, ScrollTraceOp.UpdateExtent, "ids.Lg:", logicalSize);
+ }
+
itemDesiredSizes = new HierarchicalVirtualizationItemDesiredSizes(
logicalSize,
itemDesiredSizes.LogicalSizeInViewport,
@@ -4787,7 +4806,12 @@ private Rect ExtendViewport(
if (DoubleUtil.GreaterThan(extendedViewport.X + extendedViewport.Width, _scrollData._extent.Width))
{
- extendedViewport.Width = _scrollData._extent.Width - extendedViewport.X;
+ // during Measure the viewport should never start after the extent, but this is possible
+ // during add/remove item
+ #if DBG // can't use Debug.Assert during Measure - the dispatcher is disabled and can't open the dialog
+ Invariant.Assert(!MeasureInProgress || extendedViewport.X <= _scrollData._extent.Width, "viewport starts after extent");
+ #endif
+ extendedViewport.Width = Math.Max(_scrollData._extent.Width - extendedViewport.X, 0.0);
}
}
}
@@ -4822,7 +4846,12 @@ private Rect ExtendViewport(
if (DoubleUtil.GreaterThan(extendedViewport.X + extendedViewport.Width / approxSizeOfLogicalUnit, _scrollData._extent.Width))
{
- extendedViewport.Width = (_scrollData._extent.Width - extendedViewport.X) * approxSizeOfLogicalUnit;
+ // during Measure the viewport should never start after the extent, but this is possible
+ // during add/remove item
+ #if DBG // can't use Debug.Assert during Measure - the dispatcher is disabled and can't open the dialog
+ Invariant.Assert(!MeasureInProgress || extendedViewport.X <= _scrollData._extent.Width, "viewport starts after extent");
+ #endif
+ extendedViewport.Width = Math.Max(_scrollData._extent.Width - extendedViewport.X, 0.0) * approxSizeOfLogicalUnit;
}
}
}
@@ -4893,7 +4922,12 @@ private Rect ExtendViewport(
if (DoubleUtil.GreaterThan(extendedViewport.Y + extendedViewport.Height, _scrollData._extent.Height))
{
- extendedViewport.Height = _scrollData._extent.Height - extendedViewport.Y;
+ // during Measure the viewport should never start after the extent, but this is possible
+ // during add/remove item
+ #if DBG // can't use Debug.Assert during Measure - the dispatcher is disabled and can't open the dialog
+ Invariant.Assert(!MeasureInProgress || extendedViewport.Y <= _scrollData._extent.Height, "viewport starts after extent");
+ #endif
+ extendedViewport.Height = Math.Max(_scrollData._extent.Height - extendedViewport.Y, 0.0);
}
}
}
@@ -4928,7 +4962,12 @@ private Rect ExtendViewport(
if (DoubleUtil.GreaterThan(extendedViewport.Y + extendedViewport.Height / approxSizeOfLogicalUnit, _scrollData._extent.Height))
{
- extendedViewport.Height = (_scrollData._extent.Height - extendedViewport.Y) * approxSizeOfLogicalUnit;
+ // during Measure the viewport should never start after the extent, but this is possible
+ // during add/remove item [DDVSO 1405478]
+ #if DBG // can't use Debug.Assert during Measure - the dispatcher is disabled and can't open the dialog
+ Invariant.Assert(!MeasureInProgress || extendedViewport.Y <= _scrollData._extent.Height, "viewport starts after extent");
+ #endif
+ extendedViewport.Height = Math.Max(_scrollData._extent.Height - extendedViewport.Y, 0.0) * approxSizeOfLogicalUnit;
}
}
}
@@ -11975,7 +12014,7 @@ private class ScrollTracer
{
#region static members
- const int s_StfFormatVersion = 2; // Format of output file
+ const int s_StfFormatVersion = 3; // Format of output file
const int s_MaxTraceRecords = 30000; // max length of in-memory _traceList
const int s_MinTraceRecords = 5000; // keep this many records after flushing
const int s_DefaultLayoutUpdatedThreshold = 20; // see _luThreshold
@@ -12265,6 +12304,12 @@ private static string BuildDetail(object[] args)
"{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}",
"{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12}",
"{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15} {16}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15} {16} {17}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15} {16} {17} {18}",
+ "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15} {16} {17} {18} {19}",
};
#endregion static members
@@ -12740,6 +12785,9 @@ private enum ScrollTraceOp: ushort
/****** Added in Version 1 ******/
SetContainerSize,
SizeChangeDuringAnchorScroll,
+
+ /****** Added in Version 3 ******/
+ UpdateExtent,
}
private class ScrollTraceRecord
From 002e9bb4a03e67522567c015e80d24b3f485ad49 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:14:37 +0530
Subject: [PATCH 196/223] reset ContextMenu whose popup cannot be opened
(#5843) (#5999)
Co-authored-by: Sam Bent
---
.../Windows/Controls/Primitives/Popup.cs | 50 +++++++++++--------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs
index c7649e445ce..e59a33a92f2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs
@@ -266,7 +266,7 @@ private void UpdatePlacementTargetRegistration(UIElement oldValue, UIElement new
// for the the PlacementTarget is separate from that for the Popup itself.
// This causes Popup and its descedents to miss some change notifications.
// Thus a Popup that isnt connected to the tree in any way should be
- // designated standalone and thus IsSelfInheritanceParent = true.
+ // designated standalone and thus IsSelfInheritanceParent = true.
if (!this.IsSelfInheritanceParent)
{
this.SetIsSelfInheritanceParent();
@@ -878,14 +878,14 @@ public static void CreateRootPopup(Popup popup, UIElement child)
}
///
- /// Internal implementation of CreateRootPopup to allow tooltips to
+ /// Internal implementation of CreateRootPopup to allow tooltips to
/// override the popup's placement in case the tooltip comes from keyboard focus.
///
/// The parent popup that the child will be hooked up to.
/// The element to be the child of the popup.
/// Whether to bind TreatMousePlacementAsBottomProperty to the child's FromKeyboard property
internal static void CreateRootPopupInternal(Popup popup, UIElement child, bool bindTreatMousePlacementAsBottomProperty)
- {
+ {
if (popup == null)
{
throw new ArgumentNullException("popup");
@@ -954,7 +954,7 @@ internal static void CreateRootPopupInternal(Popup popup, UIElement child, bool
binding.Mode = BindingMode.OneWay;
binding.Source = child;
popup.SetBinding(CustomPopupPlacementCallbackProperty, binding);
-
+
if (bindTreatMousePlacementAsBottomProperty)
{
binding = new Binding("FromKeyboard");
@@ -1490,6 +1490,12 @@ private void CreateWindow(bool asyncCall)
// We'll defer until later if not already in an async call.
_asyncCreate = Dispatcher.BeginInvoke(DispatcherPriority.Input, new DispatcherOperationCallback(AsyncCreateWindow), this);
}
+ else
+ {
+ // if the target is still not hooked up in the async call, the popup cannot
+ // be opened; raise the CouldClosed event, to inform the original caller
+ FirePopupCouldClose();
+ }
return;
}
@@ -1506,7 +1512,7 @@ private void CreateWindow(bool asyncCall)
// When running in Per-Monitor DPI aware mode, always create a new window
// This ensures that a recycled HWND that is moving from one display
- // to another does not undergo a WM_DPICHANGED event and thus cause a
+ // to another does not undergo a WM_DPICHANGED event and thus cause a
// cascading failure.
if (PopupInitialPlacementHelper.IsPerMonitorDpiScalingActive)
{
@@ -1583,8 +1589,8 @@ private void BuildWindow(Visual targetVisual)
// We many not have attempted to position the popup yet
//
- // If we don't have prior position information and we are currently running in Per-Monitor DPI Aware mode,
- // we should build the window by specifying a point on the current monitor.
+ // If we don't have prior position information and we are currently running in Per-Monitor DPI Aware mode,
+ // we should build the window by specifying a point on the current monitor.
// Doing so ensures that the underlying HWND is created with the right DPI. Otherwise, the HWND that is created at
// (0,0) and then shown on another monitor with a different DPI, will immediately receive a WM_DPICHANGED message. This
// will in turn cause the HWND to be resized, and its layout to be updated. This layout-update can result in the dismissal
@@ -1592,7 +1598,7 @@ private void BuildWindow(Visual targetVisual)
//
// PopupInitialPlacementHelper.GetPlacementOrigin() will return (0,0) when running in SystemAware and Unaware mode.
// When running in Per-Monitor DPI Aware mode, this method will obtain the screen coordinates of the (left, top) of
- // the Display on which the PopupRoot is situated, and return that value here.
+ // the Display on which the PopupRoot is situated, and return that value here.
var origin =
_positionInfo != null
? new NativeMethods.POINT(_positionInfo.X, _positionInfo.Y)
@@ -1876,14 +1882,14 @@ private void OnWindowResize(object sender, AutoResizedEventArgs e)
private void OnDpiChanged(object sender, HwndDpiChangedEventArgs e)
{
- // Popups do not handle layout updates due to DPI changes very well when they are visible.
- // Ignore DPI change induced layout-updates when visible.
- // This brings the behavior of Popups in line with .NET 4.7.2. Currently,
+ // Popups do not handle layout updates due to DPI changes very well when they are visible.
+ // Ignore DPI change induced layout-updates when visible.
+ // This brings the behavior of Popups in line with .NET 4.7.2. Currently,
// there is no reliable way to opt-into the DPI improvements made in .NET 4.8
// wholesale for Popups. By creating the Popups more intelligently on the right
// target monitor, we will vastly improve the DPI scaling of the Popups
// in .NET 4.8. In rare situations where a DPI change requires a visible Popups
- // to adapt and resize itself on-the-fly while continuing to remain visible,
+ // to adapt and resize itself on-the-fly while continuing to remain visible,
// it will fail to adapt to that particular DPI change.
if (IsOpen)
{
@@ -3376,7 +3382,7 @@ internal void BuildWindow(int x, int y, Visual placementTarget,
// add AddAutoResizedEventHandler event handler
newWindow.AutoResized += handler;
- // add the DpiChagnedEventHandler
+ // add the DpiChagnedEventHandler
newWindow.DpiChanged += dpiChangedHandler;
}
@@ -3507,21 +3513,21 @@ internal void DestroyWindow(HwndSourceHook hook, AutoResizedEventHandler onAutoR
#endregion
///
- /// Helper to find the (left, top) of the monitor that contains the placement target, in screen coordinates.
+ /// Helper to find the (left, top) of the monitor that contains the placement target, in screen coordinates.
///
///
/// Normally, the HWND associated with a Popup is created at (0,0), and then 'moved' to the appropriate location.This can
/// lead to a DPI change when (0,0) lies on another monitor with a different DPI. DPI changes typically lead to size changes
/// as well, which can lead to dismissals of Popups. To prevent this, we should create the HWND associated with a Popup
/// on the correct monitor. This helper will identify the origin of the monitor associated with the placement target to help
- /// with this.
+ /// with this.
///
private static class PopupInitialPlacementHelper
{
///
- /// Decides whether this helper should be used.
- /// This helper is used when -
- /// a. WPF supports DPI scaling (HwndTarget.IsPerMonitorDpiScalingEnabled), and
+ /// Decides whether this helper should be used.
+ /// This helper is used when -
+ /// a. WPF supports DPI scaling (HwndTarget.IsPerMonitorDpiScalingEnabled), and
/// b. The process is PMA (HwndTarget.IsProcessPerMonitorDpiAware)
///
///
@@ -3539,10 +3545,10 @@ internal static bool IsPerMonitorDpiScalingActive
return HwndTarget.IsProcessPerMonitorDpiAware.Value;
}
- // WPF supports Per-Monitor scaling, but HwndTarget has not
- // yet been initialized with the first HWND, and therefore
- // HwndTarget.IsProcessPerMonitorDpiAware is not queryable.
- // Let's use the current process' DPI awareness as a proxy.
+ // WPF supports Per-Monitor scaling, but HwndTarget has not
+ // yet been initialized with the first HWND, and therefore
+ // HwndTarget.IsProcessPerMonitorDpiAware is not queryable.
+ // Let's use the current process' DPI awareness as a proxy.
return DpiUtil.GetProcessDpiAwareness(IntPtr.Zero) == NativeMethods.PROCESS_DPI_AWARENESS.PROCESS_PER_MONITOR_DPI_AWARE;
}
}
From f4121eda494d0b17043a001e8afd348404464812 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 18:17:37 +0530
Subject: [PATCH 197/223] ToolTips in popups (or any context where capture is
active) (#5931) (#6063)
* ToolTips in popups (or any context where capture is active) (#5931)
* make SafeArea check work when capture is active
* Update and sync changes with main and #5932
Co-authored-by: Ashish Kumar Singh
* Fix merge errors for #5931 and #5932 (#6078)
* update to make same changes as 5931
Co-authored-by: Sam Bent
---
.../Windows/Controls/PopupControlService.cs | 48 +++++++++++++++++--
1 file changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
index fc602151dfb..01656c8426e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
@@ -90,7 +90,7 @@ private void OnPostProcessInput(object sender, ProcessInputEventArgs e)
if (directlyOver != null)
{
// Process the mouse move
- OnMouseMove(directlyOver, mouseReport);
+ OnMouseMove(directlyOver);
}
}
}
@@ -139,9 +139,9 @@ private void OnPostProcessInput(object sender, ProcessInputEventArgs e)
}
}
- private void OnMouseMove(IInputElement directlyOver, RawMouseInputReport mouseReport)
+ private void OnMouseMove(IInputElement directlyOver)
{
- if (MouseHasLeftSafeArea(mouseReport))
+ if (MouseHasLeftSafeArea())
{
DismissCurrentToolTip();
}
@@ -815,9 +815,9 @@ private void SetSafeArea(ToolTip tooltip)
}
}
- private bool MouseHasLeftSafeArea(RawMouseInputReport mouseReport)
+ private bool MouseHasLeftSafeArea()
{
- return !(SafeArea?.ContainsPoint(mouseReport.InputSource, mouseReport.X, mouseReport.Y) ?? true);
+ return !(SafeArea?.ContainsMousePoint() ?? true);
}
private ConvexHull SafeArea { get; set; }
@@ -1475,6 +1475,44 @@ private void AddPoints(PointList points, in NativeMethods.RECT rect, bool rectIs
}
}
+ // Test whether the current mouse point lies within the convex hull
+ internal bool ContainsMousePoint()
+ {
+ IInputElement rootElement = _source.RootVisual as IInputElement;
+ if (rootElement != null)
+ {
+ // get the coordinates of the current mouse point, relative to our PresentationSource
+ System.Windows.Point pt = Mouse.PrimaryDevice.GetPosition(rootElement);
+
+ // check whether the point lies within the hull
+ return ContainsPoint(_source, (int)pt.X, (int)pt.Y);
+
+ // NOTE: GetPosition doesn't actually return the position of the current mouse point,
+ // but rather the last recorded position. (See MouseDevice.GetScreenPositionFromSystem,
+ // which says that "Win32 has issues reliably returning where the mouse is".)
+ // This causes a small problem when (a) the PresentationSource has capture, e.g.
+ // the popup of a ComboBox, and (b) the mouse moves to a position that lies outside both the
+ // capturing PresentationSource (popup window) and the input-providing PresentationSource
+ // (main window). The MouseDevice only records positions within the input-providing
+ // PresentationSource, so we'll test the position where the mouse left the main window,
+ // rather than the current position.
+ // This means we may leave a tooltip open even when the mouse leaves its SafeArea,
+ // but only when the tooltip belongs to a capturing source, and the "leaving the SafeArea"
+ // action occurs outside the surrounding main window. For our example, it can happen
+ // when the ComboBox is close to the edge of the main window so that a tooltip from its
+ // popup content extends beyond the main window.
+ // This can only be fixed by changing MouseDevice.GetScreenPositionFromSystem to
+ // use a "better way" to find the current mouse position, which allegedly needs work from the OS.
+ // But we can live with this behavior, because
+ // * this is a corner case - tooltips from popup content that extend beyond the main window
+ // * the effect is transient - the tooltip will close when the user dismisses the popup
+ // * there's no accessibility issue - WCAG 2.1 only requires that the tooltip stays open under
+ // proscribed conditions, not that it has to close when the conditions cease to apply
+ }
+ else
+ return false;
+ }
+
// Test whether a given mouse point (x,y) lies within the convex hull
internal bool ContainsPoint(PresentationSource source, int x, int y)
{
From 22eddda6b600c69bd4dabe7f4c130b0d47e421ab Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 19:49:26 +0530
Subject: [PATCH 198/223] Fix merge conflicts
---
.../Windows/Controls/PopupControlService.cs | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
index 01656c8426e..093b32a5f16 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
@@ -561,7 +561,13 @@ private void CloseToolTip(ToolTip tooltip)
///
private void ClearServiceProperties(ToolTip tooltip)
{
- if (tooltip != null)
+ // This is normally called from OnToolTipClosed, after CloseToolTip has closed the tooltip
+ // and waited for the tooltip's Popup to destroy its window asynchronously.
+ // Apps can close the Popup directly (not easily done, and not recommended), which leads to
+ // a call from OnToolTipClosed while tooltip.IsOpen is still true. In that case we need to
+ // leave the properties in place - CloseToolTip needs them (as does the popup if it should
+ // re-open). They will get cleared by OnForceClose, if not earlier.
+ if (tooltip != null && !tooltip.IsOpen)
{
tooltip.ClearValue(OwnerProperty);
tooltip.FromKeyboard = false;
@@ -672,6 +678,7 @@ private void OnForceClose(object sender, EventArgs e)
_forceCloseTimer.Stop();
ToolTip toolTip = (ToolTip)_forceCloseTimer.Tag;
toolTip.ForceClose();
+ ClearServiceProperties(toolTip); // this handles the case where app closed the Popup directly
_forceCloseTimer = null;
}
}
@@ -817,6 +824,18 @@ private void SetSafeArea(ToolTip tooltip)
private bool MouseHasLeftSafeArea()
{
+ // if there is no SafeArea, the mouse didn't leave it
+ if (SafeArea == null)
+ return false;
+
+ // if the current tooltip's owner is no longer being displayed, the safe area is no longer valid
+ // so the mouse has effectively left it
+ DependencyObject owner = GetOwner(CurrentToolTip);
+ PresentationSource presentationSource = (owner != null) ? PresentationSource.CriticalFromVisual(owner) : null;
+ if (presentationSource == null)
+ return true;
+
+ // if the safe area is valid, see if it still contains the mouse point
return !(SafeArea?.ContainsMousePoint() ?? true);
}
From 8abb1e62784f629956f0f5c017f36eae158eee1a Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Mon, 7 Feb 2022 20:38:23 +0530
Subject: [PATCH 199/223] show immediately when replacing current tooltip
(#6058) (#6064)
Co-authored-by: Sam Bent
---
.../Windows/Controls/PopupControlService.cs | 88 ++++++++++++++++---
1 file changed, 78 insertions(+), 10 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
index 093b32a5f16..c60b7d19fcf 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
@@ -153,6 +153,25 @@ private void OnMouseMove(IInputElement directlyOver)
BeginShowToolTip(owner, ToolTipService.TriggerAction.Mouse);
}
+ else
+ {
+ if (PendingToolTipTimer?.Tag == BooleanBoxes.TrueBox)
+ {
+ // the pending tooltip is on a short delay (see BeginShowToolTip)
+ if (CurrentToolTip == null)
+ {
+ // the mouse left the safe area - promote the pending tooltip now
+ PendingToolTipTimer.Stop();
+ PromotePendingToolTipToCurrent(ToolTipService.TriggerAction.Mouse);
+ }
+ else
+ {
+ // the mouse is still in the safe area - restart the timer
+ PendingToolTipTimer.Stop();
+ PendingToolTipTimer.Start();
+ }
+ }
+ }
}
/////////////////////////////////////////////////////////////////////
@@ -314,20 +333,61 @@ private void BeginShowToolTip(DependencyObject o, ToolTipService.TriggerAction t
PendingToolTip = SentinelToolTip(o, triggerAction);
// decide when to promote to current
- int showDelay;
- switch (triggerAction)
+ bool useShortDelay = false;
+ bool showNow = _quickShow;
+ if (!showNow)
{
- case ToolTipService.TriggerAction.Mouse:
- case ToolTipService.TriggerAction.KeyboardFocus:
- showDelay = _quickShow ? 0 : ToolTipService.GetInitialShowDelay(o);
- break;
- case ToolTipService.TriggerAction.KeyboardShortcut:
- default:
- showDelay = 0;
- break;
+ ToolTip toReplace = CurrentToolTip;
+ switch (triggerAction)
+ {
+ case ToolTipService.TriggerAction.Mouse:
+ if (SafeArea != null)
+ {
+ // the mouse has moved over a tooltip owner o, while still
+ // within the safe area of the current tooltip (which must be from mouse).
+ // This is an ambiguous case - the user could be trying to move the
+ // mouse toward the tooltip or they could be trying to move the
+ // mouse over o. There's no way to know the user's intent.
+ // But the expected response is much different: in the first
+ // case we should leave the current tooltip open, in the second
+ // we should replace it with o's tooltip.
+ //
+ // We use a heuristic to compromise between these conflicting expectations.
+ // We'll put the pending request on a timer with a very short interval.
+ // If the user moves the mouse within the interval, we restart the timer;
+ // this keeps the tooltip open as long as the user keeps moving the mouse.
+ // But if the timer expires, we promote the pending request;
+ // this shows o's tooltip shortly after the user stops moving the mouse (or
+ // moves it outside the current safe area).
+ useShortDelay = true;
+ }
+ break;
+ case ToolTipService.TriggerAction.KeyboardFocus:
+ // a focus request shows without delay if the current tooltip also came from keyboard
+ showNow = toReplace?.FromKeyboard ?? false;
+ break;
+ case ToolTipService.TriggerAction.KeyboardShortcut:
+ default:
+ // an explicit keystroke request always shows without delay
+ toReplace = null;
+ showNow = true;
+ break;
+ }
+
+ // replacing a tooltip with BetweenShowDelay=0 should invoke the delay
+ if (toReplace != null && (showNow || useShortDelay))
+ {
+ DependencyObject currentOwner = GetOwner(toReplace);
+ if (ToolTipService.GetBetweenShowDelay(currentOwner) == 0)
+ {
+ showNow = false;
+ useShortDelay = false;
+ }
+ }
}
// promote now, or schedule delayed promotion
+ int showDelay = (showNow ? 0 : useShortDelay ? ShortDelay : ToolTipService.GetInitialShowDelay(o));
if (showDelay == 0)
{
PromotePendingToolTipToCurrent(triggerAction);
@@ -337,6 +397,7 @@ private void BeginShowToolTip(DependencyObject o, ToolTipService.TriggerAction t
PendingToolTipTimer = new DispatcherTimer(DispatcherPriority.Normal);
PendingToolTipTimer.Interval = TimeSpan.FromMilliseconds(showDelay);
PendingToolTipTimer.Tick += new EventHandler((s, e) => { PromotePendingToolTipToCurrent(triggerAction); });
+ PendingToolTipTimer.Tag = BooleanBoxes.Box(useShortDelay);
PendingToolTipTimer.Start();
}
}
@@ -1622,6 +1683,13 @@ class PointList : List
#region Data
+ // see comment in BeginShowTooltip. This should be large enough to
+ // allow continuous mouse-move events, but small enough to switch
+ // tooltips instantly (where "continuous" and "instantly" are the
+ // end-user's perception). The value here is large enough to make the
+ // "SafeAreaOnHyperlink" test pass.
+ static private int ShortDelay = 73;
+
// pending ToolTip
private ToolTip _pendingToolTip;
private DispatcherTimer _pendingToolTipTimer;
From 29d580dc278e480213a8906ab29e3155ebd1a2cc Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:30:44 -0800
Subject: [PATCH 200/223] Merging internal commits for release/6.0 (#6088)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Source msrc from internal
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
Co-authored-by: DotNet Bot
Co-authored-by: dotnet-bot
---
NuGet.config | 2 ++
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
eng/pipeline.yml | 6 +++---
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 59cc6e76c2e..56c6c42245f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,7 @@
+
@@ -18,6 +19,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6dba141430b..34652786922 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 846205b4af05c7a200e1d203536fdc39994b9bd6
+ 5ad241b9633924db40503de19cb502bb0aca7718
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 846205b4af05c7a200e1d203536fdc39994b9bd6
+ 5ad241b9633924db40503de19cb502bb0aca7718
https://github.com/dotnet/runtime
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
diff --git a/eng/Versions.props b/eng/Versions.props
index 73c940f7ebe..bace9fd8405 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,19 +10,19 @@
- 6.0.1-servicing.21567.5
+ 6.0.2-servicing.22064.7
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21567.5
- 6.0.1-servicing.21567.5
+ 6.0.2-servicing.22064.6
+ 6.0.2-servicing.22064.6
- 6.0.1-servicing.21567.5
- 6.0.1
- 6.0.1
+ 6.0.2-servicing.22064.6
+ 6.0.2
+ 6.0.2
6.0.1
6.0.0
6.0.0
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 71907b191e9..1264aab9a4a 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -71,12 +71,12 @@ jobs:
- name: _InternalRuntimeDownloadArgs
value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- - group: DotNet-MSRC-Storage
+ - group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats
- name: _InternalRuntimeDownloadArgs
value: >-
- /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
- /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
+ /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+ /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
# Override some values if we're building internally
From b5fcbc7a45d94b304b0b7aa76755e6b45b6b9ed1 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:31:32 -0800
Subject: [PATCH 201/223] Merging internal commits for release/6.0 (#6092)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms)
- Source msrc from internal
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms)
Co-authored-by: DotNet Bot
Co-authored-by: dotnet-bot
From 26d9524d81062587023ef7d89bc12efcacd77604 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 15:30:10 +0530
Subject: [PATCH 202/223] Update dependencies from
https://github.com/dotnet/arcade build 20220207.2 (#6085)
Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2
Co-authored-by: dotnet-maestro[bot]
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/templates/job/source-build.yml | 15 +++++++++------
global.json | 4 ++--
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34652786922..f7be6e86f76 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 93e08e378eb00a4267ffeca24b6bebb4f6c011ef
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
diff --git a/eng/Versions.props b/eng/Versions.props
index bace9fd8405..91d42100843 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
- 6.0.0-beta.22102.3
- 6.0.0-beta.22102.3
- 6.0.0-beta.22102.3
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index 5023d36dcb3..5cd5325d7b4 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -31,11 +31,6 @@ parameters:
# container and pool.
platform: {}
- # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
- # source-build builds run in Docker, including the default managed platform.
- defaultContainerHostPool:
- vmImage: ubuntu-20.04
-
jobs:
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
container: ${{ parameters.platform.container }}
${{ if eq(parameters.platform.pool, '') }}:
- pool: ${{ parameters.defaultContainerHostPool }}
+ # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+ # source-build builds run in Docker, including the default managed platform.
+ pool:
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ name: NetCore1ESPool-Public
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+ ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/global.json b/global.json
index f388c75c72e..f6a510077e1 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22102.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2"
},
"sdk": {
"version": "6.0.101"
From 9fe7923e527c7f6061134a8d9ea2c9378d76f10a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 17:13:51 +0530
Subject: [PATCH 203/223] [release/6.0] Update dependencies from
dnceng/internal/dotnet-wpf-int (#6086)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220208.2
Microsoft.DotNet.Wpf.DncEng
From Version 6.0.0-rtm.22104.2 -> To Version 6.0.0-rtm.22108.2
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220209.4
Microsoft.DotNet.Wpf.DncEng
From Version 6.0.0-rtm.22104.2 -> To Version 6.0.0-rtm.22109.4
Co-authored-by: dotnet-maestro[bot]
---
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 f7be6e86f76..8f111cac971 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- 962ab77e3d043ec9377feec32e1b26824338e9db
+ a91dc679d9bb06e7d00e7308de518a232702f888
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 91d42100843..a9619476961 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,6 +81,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rtm.22104.2
+ 6.0.0-rtm.22109.4
From 0fb303d2462edc4ead1a80f029ce349e3360e9dc Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Thu, 10 Feb 2022 09:33:36 +0530
Subject: [PATCH 204/223] Revert "[release/6.0] Update dependencies from
dnceng/internal/dotnet-wpf-int (#6086)" (#6100)
This reverts commit 9fe7923e527c7f6061134a8d9ea2c9378d76f10a.
---
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 8f111cac971..f7be6e86f76 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- a91dc679d9bb06e7d00e7308de518a232702f888
+ 962ab77e3d043ec9377feec32e1b26824338e9db
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index a9619476961..91d42100843 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,6 +81,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rtm.22109.4
+ 6.0.0-rtm.22104.2
From 147609fdb81c1328d2bb345732bbf30f95470973 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov
Date: Tue, 15 Feb 2022 18:06:48 +1100
Subject: [PATCH 205/223] Pin assembly versions to prevent revving those in
servicing releases (#6101)
---
eng/Versions.props | 20 +++++-
.../Check-AssemblyVersions.ps1 | 66 +++++++++++++++++++
.../Directory.Build.targets | 44 +++++++++++++
3 files changed, 129 insertions(+), 1 deletion(-)
create mode 100644 packaging/Microsoft.DotNet.Wpf.GitHub/Check-AssemblyVersions.ps1
create mode 100644 packaging/Microsoft.DotNet.Wpf.GitHub/Directory.Build.targets
diff --git a/eng/Versions.props b/eng/Versions.props
index 91d42100843..1ef261e9b7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,25 @@
- 6.0.3
+ 6
+ 0
+ 3
+ $(MajorVersion).$(MinorVersion).$(PatchVersion)
+
+
+ $(MajorVersion).$(MinorVersion).2.0
+
servicing
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Check-AssemblyVersions.ps1 b/packaging/Microsoft.DotNet.Wpf.GitHub/Check-AssemblyVersions.ps1
new file mode 100644
index 00000000000..84061f7fdc7
--- /dev/null
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Check-AssemblyVersions.ps1
@@ -0,0 +1,66 @@
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+ [Parameter(Mandatory=$True, Position=1)]
+ [string] $NuspecFile,
+ [Parameter(Mandatory=$True, Position=2)]
+ [string] $ExpectedAssemblyVersion,
+ [Parameter(Mandatory=$True, Position=3)]
+ [string] $IsServicingRelease,
+ [Parameter(ValueFromRemainingArguments=$true)][String[]] $properties
+)
+
+$servicingRelease = $null;
+[bool]::TryParse($IsServicingRelease, [ref]$servicingRelease) | Out-Null;
+
+[xml] $xmlDoc = Get-Content -Path $NuspecFile -Force;
+
+#
+# Verify that components that are exposed as references in the targeting packs don't have their versions revved.
+# See https://github.com/dotnet/core/issues/7172#issuecomment-1034105137 for more details.
+[xml] $xmlDoc = Get-Content -Path $NuspecFile -Force;
+
+# Iterate over files that MUST NOT have their versions revved with every release
+$nonRevAssemblies = $xmlDoc.package.files.file | `
+ Where-Object {
+ ($_.target.StartsWith('lib\') -or $_.target.StartsWith('ref\')) `
+ -and $_.target.EndsWith('.dll', [System.StringComparison]::OrdinalIgnoreCase) `
+ -and !$_.target.EndsWith('resources.dll', [System.StringComparison]::OrdinalIgnoreCase)
+ } | `
+ Select-Object -Unique src | `
+ Select-Object -ExpandProperty src;
+
+$nonRevAssemblies | `
+ sort-object | `
+ foreach-object {
+ $assembly = $_;
+ [string] $version = ([Reflection.AssemblyName]::GetAssemblyName($assembly).Version).ToString()
+
+ Write-Host "$assembly`: $version"
+ if (![string]::Equals($version, $ExpectedAssemblyVersion)) {
+ throw "$assembly is not versioned correctly. Expected: '$ExpectedAssemblyVersion', found: '$version'."
+ exit -1;
+ }
+ }
+
+# Iterate over files that MUST have their versions revved with every release
+$revAssemblies = $xmlDoc.package.files.file | `
+ Where-Object {
+ $_.target.StartsWith('sdk\analyzers\') `
+ -and $_.target.EndsWith('.dll', [System.StringComparison]::OrdinalIgnoreCase) `
+ -and !$_.target.EndsWith('resources.dll', [System.StringComparison]::OrdinalIgnoreCase)
+ } | `
+ Select-Object -Unique src | `
+ Select-Object -ExpandProperty src;
+
+$revAssemblies | `
+ sort-object | `
+ foreach-object {
+ $assembly = $_;
+ [string] $version = ([Reflection.AssemblyName]::GetAssemblyName($assembly).Version).ToString()
+
+ Write-Host "$assembly`: $version"
+ if ($servicingRelease -and [string]::Equals($version, $ExpectedAssemblyVersion)) {
+ throw "$assembly is not versioned correctly. '$version' is not expected."
+ exit -1;
+ }
+ }
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Directory.Build.targets b/packaging/Microsoft.DotNet.Wpf.GitHub/Directory.Build.targets
new file mode 100644
index 00000000000..8c7d21671a3
--- /dev/null
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Directory.Build.targets
@@ -0,0 +1,44 @@
+
+
+
+
+
+ <_PowerShellExe Condition="'$(_PowerShellExe)' == ''">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe
+ <_ScriptLocation Condition="'$(_ScriptLocation)' == ''">$(MSBuildProjectDirectory)\Check-AssemblyVersions.ps1
+ <_IsServicingRelease>false
+ <_IsServicingRelease Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true
+
+
+
+
+
+ <_NuspecFile Include="@(NuGetPackOutput)" Condition="'%(Extension)' == '.nuspec'" />
+
+
+
+ <_NuspecFilePath>@(_NuspecFile)
+
+ <_NuspecFilePath Condition="'$(_NuspecFilePath)' == '' or !Exists('$(_NuspecFilePath)')">$(NuspecOutputPath)\$(PackageId).$(PackageVersion).nuspec
+
+
+
+
+
+
+
+
+
+
From ae9031af7894d817cf8db277da8d38340a5091a8 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 15 Feb 2022 16:32:59 +0000
Subject: [PATCH 206/223] Merged PR 20942: [internal/release/6.0] Update
dependencies from dnceng/internal/dotnet-winforms
This pull request updates the following dependencies
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20220214.7
- **Date Produced**: February 15, 2022 6:38:20 AM UTC
- **Commit**: 553b0d1a8c7bf45cc27282ff8afbe20f697a6601
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9]
- **Microsoft.Private.Winforms**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10]
- **Microsoft.NETCore.ILAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10]
- **Microsoft.NETCore.App.Ref**: [from 6.0.2 to 6.0.1][10]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.2 to 6.0.1][10]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10]
[9]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5ad241b&targetVersion=GC553b0d1&_a=files
[10]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC839cdfb&targetVersion=GC3a25a7f&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.NETCore.ILDAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
---
NuGet.config | 2 --
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 56c6c42245f..59cc6e76c2e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,6 @@
-
@@ -19,7 +18,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7be6e86f76..79067bd2ba0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 5ad241b9633924db40503de19cb502bb0aca7718
+ 553b0d1a8c7bf45cc27282ff8afbe20f697a6601
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 5ad241b9633924db40503de19cb502bb0aca7718
+ 553b0d1a8c7bf45cc27282ff8afbe20f697a6601
https://github.com/dotnet/runtime
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
+ 3a25a7f1cc446b60678ed25c9d829420d6321eba
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ef261e9b7b..a9764d35ca0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,19 +28,19 @@
- 6.0.2-servicing.22064.7
+ 6.0.3-servicing.22114.7
5.0.0-alpha1.19562.1
- 6.0.2-servicing.22064.6
- 6.0.2-servicing.22064.6
+ 6.0.1-servicing.21567.5
+ 6.0.1-servicing.21567.5
- 6.0.2-servicing.22064.6
- 6.0.2
- 6.0.2
+ 6.0.1-servicing.21567.5
+ 6.0.1
+ 6.0.1
6.0.1
6.0.0
6.0.0
From d974f4b15a6baa1235d4e8e80728b3e3d0899277 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Wed, 16 Feb 2022 00:11:55 +0000
Subject: [PATCH 207/223] [internal/release/6.0] Update dependencies from
dnceng/internal/dotnet-winforms - Coherency Updates: -
Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from
6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from
6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent:
Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to
6.0.3 (parent: Microsoft.Private.Winforms) -
Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.3 (parent:
Microsoft.Private.Winforms) -
VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from
6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent:
Microsoft.Private.Winforms)
---
NuGet.config | 2 ++
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 +++++++---------
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 59cc6e76c2e..45c91fe721c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,7 @@
+
@@ -18,6 +19,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 79067bd2ba0..082574d0b0a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 553b0d1a8c7bf45cc27282ff8afbe20f697a6601
+ ba13948446da002973d174e3d1c8843f844e6fe2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 553b0d1a8c7bf45cc27282ff8afbe20f697a6601
+ ba13948446da002973d174e3d1c8843f844e6fe2
https://github.com/dotnet/runtime
@@ -45,9 +45,9 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 3a25a7f1cc446b60678ed25c9d829420d6321eba
+ 10db7350e1288caf09e684e1b219f8f5b08eca02
diff --git a/eng/Versions.props b/eng/Versions.props
index a9764d35ca0..e01889b0836 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,6 @@
0
3
$(MajorVersion).$(MinorVersion).$(PatchVersion)
-
$(MajorVersion).$(MinorVersion).2.0
-
servicing
@@ -28,20 +26,20 @@
- 6.0.3-servicing.22114.7
+ 6.0.3-servicing.22115.6
5.0.0-alpha1.19562.1
- 6.0.1-servicing.21567.5
- 6.0.1-servicing.21567.5
+ 6.0.3-servicing.22115.5
+ 6.0.3-servicing.22115.5
- 6.0.1-servicing.21567.5
- 6.0.1
- 6.0.1
- 6.0.1
+ 6.0.3-servicing.22115.5
+ 6.0.3
+ 6.0.3
+ 6.0.2
6.0.0
6.0.0
6.0.0
From 560f243910f407df33fd5cdf06e2a857684f4bc7 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Thu, 24 Feb 2022 18:00:58 +0000
Subject: [PATCH 208/223] Merged PR 21411: [internal/release/6.0] Update
dependencies from dnceng/internal/dotnet-winforms
This pull request updates the following dependencies
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20220223.7
- **Date Produced**: February 24, 2022 7:45:12 AM UTC
- **Commit**: 1f426c90a9589dabc16d114aa91bfea9f21f8571
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2]
- **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2]
- **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.2][3]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3]
- **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3]
- **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.3][3]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][3]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3]
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCba13948&targetVersion=GC1f426c9&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10db735&targetVersion=GCc24d9a9&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 26 +++++++++++++-------------
eng/Versions.props | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 45c91fe721c..de234624c1d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,7 +5,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 082574d0b0a..e24efda33b4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ba13948446da002973d174e3d1c8843f844e6fe2
+ 1f426c90a9589dabc16d114aa91bfea9f21f8571
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- ba13948446da002973d174e3d1c8843f844e6fe2
+ 1f426c90a9589dabc16d114aa91bfea9f21f8571
https://github.com/dotnet/runtime
@@ -47,7 +47,7 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,13 +57,13 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
https://github.com/dotnet/runtime
@@ -71,15 +71,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 10db7350e1288caf09e684e1b219f8f5b08eca02
+ c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
diff --git a/eng/Versions.props b/eng/Versions.props
index e01889b0836..b8c19df3be0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,17 +26,17 @@
- 6.0.3-servicing.22115.6
+ 6.0.3-servicing.22123.7
5.0.0-alpha1.19562.1
- 6.0.3-servicing.22115.5
- 6.0.3-servicing.22115.5
+ 6.0.3-servicing.22123.9
+ 6.0.3-servicing.22123.9
- 6.0.3-servicing.22115.5
+ 6.0.3-servicing.22123.9
6.0.3
6.0.3
6.0.2
From 27de5625b97bb372b61799ba46ba7d32c01e7124 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Wed, 2 Mar 2022 01:59:15 -0800
Subject: [PATCH 209/223] Update branding to 6.0.4 (#6193)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ef261e9b7b..1a8ad8c0d09 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
6
0
- 3
+ 4
$(MajorVersion).$(MinorVersion).$(PatchVersion)
-
@@ -19,7 +18,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e24efda33b4..1e20a6faa59 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -49,9 +49,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
- 962ab77e3d043ec9377feec32e1b26824338e9db
+ c8d46e6b93f648dd15d27210af19b62f98205daa
https://github.com/dotnet/runtime
@@ -83,25 +83,25 @@
-
+
https://github.com/dotnet/arcade
- fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
+ 7215d8265a7fbcd022eb72ff7a6e2048444c985f
-
+
https://github.com/dotnet/arcade
- fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
+ 7215d8265a7fbcd022eb72ff7a6e2048444c985f
-
+
https://github.com/dotnet/arcade
- fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
+ 7215d8265a7fbcd022eb72ff7a6e2048444c985f
-
+
https://github.com/dotnet/arcade
- fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
+ 7215d8265a7fbcd022eb72ff7a6e2048444c985f
-
+
https://github.com/dotnet/arcade
- fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
+ 7215d8265a7fbcd022eb72ff7a6e2048444c985f
diff --git a/eng/Versions.props b/eng/Versions.props
index c489b9dba13..a539beda995 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,9 +56,9 @@
- 6.0.0-beta.22107.2
- 6.0.0-beta.22107.2
- 6.0.0-beta.22107.2
+ 6.0.0-beta.22122.7
+ 6.0.0-beta.22122.7
+ 6.0.0-beta.22122.7
@@ -97,6 +97,6 @@
System.Reflection.MetadataLoadContext
- 6.0.0-rtm.22104.2
+ 6.0.0-rtm.22161.2
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
new file mode 100644
index 00000000000..a733a888582
--- /dev/null
+++ b/eng/common/generate-sbom-prep.ps1
@@ -0,0 +1,19 @@
+Param(
+ [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
+)
+
+Write-Host "Creating dir $ManifestDirPath"
+# create directory for sbom manifest to be placed
+if (!(Test-Path -path $ManifestDirPath))
+{
+ New-Item -ItemType Directory -path $ManifestDirPath
+ Write-Host "Successfully created directory $ManifestDirPath"
+}
+else{
+ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
+}
+
+Write-Host "Updating artifact name"
+$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
+Write-Host "Artifact name $artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
new file mode 100644
index 00000000000..f6c77453142
--- /dev/null
+++ b/eng/common/generate-sbom-prep.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+manifest_dir=$1
+
+if [ ! -d "$manifest_dir" ] ; then
+ mkdir -p "$manifest_dir"
+ echo "Sbom directory created." $manifest_dir
+else
+ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
+fi
+
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+echo "Artifact name before : "$artifact_name
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+echo "Artifact name after : "$safe_artifact_name
+export ARTIFACT_NAME=$safe_artifact_name
+echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
+
+exit 0
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 30d1de5835e..547d878da07 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -31,6 +31,10 @@ parameters:
name: ''
preSteps: []
runAsPublic: false
+# Sbom related params
+ enableSbom: true
+ PackageVersion: 6.0.0
+ BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
jobs:
- job: ${{ parameters.name }}
@@ -247,3 +251,9 @@ jobs:
ArtifactName: AssetManifests
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
+
+ - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+ - template: /eng/common/templates/steps/generate-sbom.yml
+ parameters:
+ PackageVersion: ${{ parameters.packageVersion}}
+ BuildDropPath: ${{ parameters.buildDropPath }}
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 70d44735ace..554e71cfc43 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,10 +8,6 @@ parameters:
# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false
- # Optional: Disable component governance detection. In general, component governance
- # should be on for all jobs. Use only in the event of issues.
- disableComponentGovernance: false
-
# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
new file mode 100644
index 00000000000..f4d7937f379
--- /dev/null
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -0,0 +1,44 @@
+# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
+# PackageName - The name of the package this SBOM represents.
+# PackageVersion - The version of the package this SBOM represents.
+# ManifestDirPath - The path of the directory where the generated manifest files will be placed
+
+parameters:
+ PackageVersion: 6.0.0
+ BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+ PackageName: '.NET'
+ ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
+ sbomContinueOnError: true
+
+steps:
+- task: PowerShell@2
+ displayName: Prep for SBOM generation in (Non-linux)
+ condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
+ inputs:
+ filePath: ./eng/common/generate-sbom-prep.ps1
+ arguments: ${{parameters.manifestDirPath}}
+
+# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
+- script: |
+ chmod +x ./eng/common/generate-sbom-prep.sh
+ ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
+ displayName: Prep for SBOM generation in (Linux)
+ condition: eq(variables['Agent.Os'], 'Linux')
+ continueOnError: ${{ parameters.sbomContinueOnError }}
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+ displayName: 'Generate SBOM manifest'
+ continueOnError: ${{ parameters.sbomContinueOnError }}
+ inputs:
+ PackageName: ${{ parameters.packageName }}
+ BuildDropPath: ${{ parameters.buildDropPath }}
+ PackageVersion: ${{ parameters.packageVersion }}
+ ManifestDirPath: ${{ parameters.manifestDirPath }}
+
+- task: PublishPipelineArtifact@1
+ displayName: Publish SBOM manifest
+ continueOnError: ${{parameters.sbomContinueOnError}}
+ inputs:
+ targetPath: '${{parameters.manifestDirPath}}'
+ artifactName: $(ARTIFACT_NAME)
+
diff --git a/global.json b/global.json
index f6a510077e1..77aaba473f9 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7"
},
"sdk": {
"version": "6.0.101"
From fcb07d637abf53791e2c55c63d9207fc3232fe83 Mon Sep 17 00:00:00 2001
From: DotNet Bot
Date: Tue, 15 Mar 2022 18:22:40 +0000
Subject: [PATCH 211/223] Merged PR 21548: [internal/release/6.0] Update
dependencies from dnceng/internal/dotnet-winforms
This pull request updates the following dependencies
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20220314.7
- **Date Produced**: March 14, 2022 11:33:53 PM UTC
- **Commit**: 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7]
- **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7]
- **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][8]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8]
- **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8]
- **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.4][8]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.4][8]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8]
[7]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files
[8]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
---
NuGet.config | 2 ++
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 14 +++++++-------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 59cc6e76c2e..ea5767e2ebc 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,7 @@
+
@@ -18,6 +19,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1e20a6faa59..51b4e97ffc2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 1f426c90a9589dabc16d114aa91bfea9f21f8571
+ 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 1f426c90a9589dabc16d114aa91bfea9f21f8571
+ 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
https://github.com/dotnet/runtime
@@ -45,9 +45,9 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
@@ -57,29 +57,29 @@
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
https://github.com/dotnet/runtime
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
diff --git a/eng/Versions.props b/eng/Versions.props
index a539beda995..c3ff5387524 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,20 +26,20 @@
- 6.0.3-servicing.22123.7
+ 6.0.4-servicing.22164.7
5.0.0-alpha1.19562.1
- 6.0.3-servicing.22123.9
- 6.0.3-servicing.22123.9
+ 6.0.4-servicing.22164.4
+ 6.0.4-servicing.22164.4
- 6.0.3-servicing.22123.9
- 6.0.3
- 6.0.3
- 6.0.2
+ 6.0.4-servicing.22164.4
+ 6.0.4
+ 6.0.4
+ 6.0.3
6.0.0
6.0.0
6.0.0
From ff49ff1d2f7ec3f94054784b75e66db145b74416 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Wed, 13 Apr 2022 14:47:38 +0800
Subject: [PATCH 212/223] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=8A=A0=E4=B8=8A?=
=?UTF-8?q?=E7=A7=81=E6=9C=89=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/Build.yml | 40 +++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 .github/workflows/Build.yml
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
new file mode 100644
index 00000000000..c4a5c3eda58
--- /dev/null
+++ b/.github/workflows/Build.yml
@@ -0,0 +1,40 @@
+name: Build WPF
+
+on: [push]
+
+jobs:
+ BuildDebug:
+
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v1
+ # - name: Install Nuget
+ # uses: nuget/setup-nuget@v1
+ # with:
+ # nuget-version: '5.x'
+ - name: Build
+ run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x64
+ - name: Push
+ uses: actions/upload-artifact@v1
+ with:
+ name: WPF_Debug
+ path: ./artifacts
+
+ BuildRelease:
+
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v1
+ # - name: Install Nuget
+ # uses: nuget/setup-nuget@v1
+ # with:
+ # nuget-version: '5.x'
+ - name: Build
+ run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x64
+ - name: Push
+ uses: actions/upload-artifact@v1
+ with:
+ name: WPF_Release
+ path: ./artifacts
\ No newline at end of file
From 9e1ced6c915f5f3d23c68ee0f0cdca6f10f0faea Mon Sep 17 00:00:00 2001
From: lindexi
Date: Wed, 13 Apr 2022 15:01:12 +0800
Subject: [PATCH 213/223] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BAx86?=
=?UTF-8?q?=E7=9A=84=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/Build.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index c4a5c3eda58..3becf7ad04f 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -14,7 +14,7 @@ jobs:
# with:
# nuget-version: '5.x'
- name: Build
- run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x64
+ run: .\build.cmd -pack -ci -configuration Debug -prepareMachine /p:Platform=x86
- name: Push
uses: actions/upload-artifact@v1
with:
@@ -32,7 +32,7 @@ jobs:
# with:
# nuget-version: '5.x'
- name: Build
- run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x64
+ run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
- name: Push
uses: actions/upload-artifact@v1
with:
From d8b7c3e4e1cf4ba1ece26608c1ddf330435cd59e Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 14 Apr 2022 10:45:19 +0800
Subject: [PATCH 214/223] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=B8=80=E6=AC=A1?=
=?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8C=85=EF=BC=8C=E7=94=A8=E6=9D=A5=E5=81=9A?=
=?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=BE=85=E5=8A=A9=E8=B0=83=E8=AF=95=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/Build.yml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 3becf7ad04f..a89230871a2 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -19,22 +19,22 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: WPF_Debug
- path: ./artifacts
+ path: .
- BuildRelease:
+ # BuildRelease:
- runs-on: windows-latest
+ # runs-on: windows-latest
- steps:
- - uses: actions/checkout@v1
- # - name: Install Nuget
- # uses: nuget/setup-nuget@v1
- # with:
- # nuget-version: '5.x'
- - name: Build
- run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
- - name: Push
- uses: actions/upload-artifact@v1
- with:
- name: WPF_Release
- path: ./artifacts
\ No newline at end of file
+ # steps:
+ # - uses: actions/checkout@v1
+ # # - name: Install Nuget
+ # # uses: nuget/setup-nuget@v1
+ # # with:
+ # # nuget-version: '5.x'
+ # - name: Build
+ # run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
+ # - name: Push
+ # uses: actions/upload-artifact@v1
+ # with:
+ # name: WPF_Release
+ # path: ./artifacts
\ No newline at end of file
From b359bbd08db802406a87ff9f329827b9a6fca1c1 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 14 Apr 2022 10:46:52 +0800
Subject: [PATCH 215/223] =?UTF-8?q?=E5=8F=AA=E5=81=9A=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E5=8C=85=EF=BC=8C=E5=87=8F=E5=B0=91=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/Build.yml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index a89230871a2..f4e91b0fedf 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -19,22 +19,22 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: WPF_Debug
- path: .
+ path: ./artifacts/packages/Debug/NonShipping
- # BuildRelease:
+ BuildRelease:
- # runs-on: windows-latest
+ runs-on: windows-latest
- # steps:
- # - uses: actions/checkout@v1
- # # - name: Install Nuget
- # # uses: nuget/setup-nuget@v1
- # # with:
- # # nuget-version: '5.x'
- # - name: Build
- # run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
- # - name: Push
- # uses: actions/upload-artifact@v1
- # with:
- # name: WPF_Release
- # path: ./artifacts
\ No newline at end of file
+ steps:
+ - uses: actions/checkout@v1
+ # - name: Install Nuget
+ # uses: nuget/setup-nuget@v1
+ # with:
+ # nuget-version: '5.x'
+ - name: Build
+ run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
+ - name: Push
+ uses: actions/upload-artifact@v1
+ with:
+ name: WPF_Release
+ path: ./artifacts/packages/Release/NonShipping
\ No newline at end of file
From 88ea4c01d2e4907872fa67bc124bd793c7d0e9bd Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 14 Apr 2022 10:55:46 +0800
Subject: [PATCH 216/223] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E9=A6=96=E7=AC=94=E8=90=BD=E7=82=B9=E7=9A=84=20DPI=20=E8=AE=A1?=
=?UTF-8?q?=E7=AE=97=E7=9A=84=E9=94=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../System/Windows/Input/Stylus/Wisp/PenContexts.cs | 4 ++--
.../System/Windows/Input/Stylus/Wisp/WispLogic.cs | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs
index 9b2577b6497..35f433daef4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs
@@ -440,7 +440,7 @@ internal void InvokeStylusPluginCollection(RawStylusInputReport inputReport)
{
// Create new RawStylusInput to send
GeneralTransformGroup transformTabletToView = new GeneralTransformGroup();
- transformTabletToView.Children.Add(new MatrixTransform(_stylusLogic.GetTabletToViewTransform(stylusDevice.CriticalActiveSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
+ transformTabletToView.Children.Add(new MatrixTransform(_stylusLogic.GetTabletToViewTransform(stylusDevice.CriticalActiveSource ?? inputReport.InputSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
transformTabletToView.Children.Add(currentPic.ViewToElement); // Make it relative to the element.
transformTabletToView.Freeze(); // Must be frozen for multi-threaded access.
@@ -459,7 +459,7 @@ internal void InvokeStylusPluginCollection(RawStylusInputReport inputReport)
// The transformTabletToView matrix and plugincollection rects though can change based
// off of layout events which is why we need to lock this.
GeneralTransformGroup transformTabletToView = new GeneralTransformGroup();
- transformTabletToView.Children.Add(new MatrixTransform(_stylusLogic.GetTabletToViewTransform(stylusDevice.CriticalActiveSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
+ transformTabletToView.Children.Add(new MatrixTransform(_stylusLogic.GetTabletToViewTransform(stylusDevice.CriticalActiveSource ?? inputReport.InputSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
transformTabletToView.Children.Add(pic.ViewToElement); // Make it relative to the element.
transformTabletToView.Freeze(); // Must be frozen for multi-threaded access.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs
index 9c475d60f25..07fde1dd090 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs
@@ -2670,7 +2670,8 @@ private void VerifyStylusPlugInCollectionTarget(RawStylusInputReport rawStylusIn
// The transformTabletToView matrix and plugincollection rects though can change based
// off of layout events which is why we need to lock this.
GeneralTransformGroup transformTabletToView = new GeneralTransformGroup();
- transformTabletToView.Children.Add(new MatrixTransform(GetTabletToViewTransform(stylusDevice.CriticalActiveSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
+ transformTabletToView.Children.Add(new MatrixTransform(GetTabletToViewTransform(
+ stylusDevice.CriticalActiveSource ?? rawStylusInputReport.InputSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
transformTabletToView.Children.Add(targetPIC.ViewToElement); // Make it relative to the element.
transformTabletToView.Freeze(); // Must be frozen for multi-threaded access.
@@ -2689,7 +2690,7 @@ private void VerifyStylusPlugInCollectionTarget(RawStylusInputReport rawStylusIn
if (originalRSI == null)
{
GeneralTransformGroup transformTabletToView = new GeneralTransformGroup();
- transformTabletToView.Children.Add(new MatrixTransform(GetTabletToViewTransform(stylusDevice.CriticalActiveSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
+ transformTabletToView.Children.Add(new MatrixTransform(GetTabletToViewTransform(stylusDevice.CriticalActiveSource ?? rawStylusInputReport.InputSource, stylusDevice.TabletDevice))); // this gives matrix in measured units (not device)
transformTabletToView.Children.Add(currentTarget.ViewToElement); // Make it relative to the element.
transformTabletToView.Freeze(); // Must be frozen for multi-threaded access.
originalRSI = new RawStylusInput(rawStylusInputReport, transformTabletToView, currentTarget);
From 14a1e0ed973776c3edaf36847f15bdb247aff357 Mon Sep 17 00:00:00 2001
From: Sam Bent
Date: Tue, 5 Apr 2022 10:03:05 -0700
Subject: [PATCH 217/223] use unscaled mouse coordintes for convex hull test
(#6332)
https://github.com/dotnet/wpf/pull/6332
---
.../Windows/Controls/PopupControlService.cs | 79 +++++++++++--------
1 file changed, 48 insertions(+), 31 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
index c60b7d19fcf..b39aea2cb2c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
@@ -1558,39 +1558,56 @@ private void AddPoints(PointList points, in NativeMethods.RECT rect, bool rectIs
// Test whether the current mouse point lies within the convex hull
internal bool ContainsMousePoint()
{
- IInputElement rootElement = _source.RootVisual as IInputElement;
- if (rootElement != null)
+ // get the coordinates of the current mouse point, relative to the Active source
+ PresentationSource mouseSource = Mouse.PrimaryDevice.CriticalActiveSource;
+ System.Windows.Point pt = Mouse.PrimaryDevice.NonRelativePosition;
+
+ // translate the point to our source's coordinates, if necessary
+ // (e.g. if the tooltip's owner comes from a window with capture,
+ // such as the popup of a ComboBox)
+ if (mouseSource != _source)
{
- // get the coordinates of the current mouse point, relative to our PresentationSource
- System.Windows.Point pt = Mouse.PrimaryDevice.GetPosition(rootElement);
-
- // check whether the point lies within the hull
- return ContainsPoint(_source, (int)pt.X, (int)pt.Y);
-
- // NOTE: GetPosition doesn't actually return the position of the current mouse point,
- // but rather the last recorded position. (See MouseDevice.GetScreenPositionFromSystem,
- // which says that "Win32 has issues reliably returning where the mouse is".)
- // This causes a small problem when (a) the PresentationSource has capture, e.g.
- // the popup of a ComboBox, and (b) the mouse moves to a position that lies outside both the
- // capturing PresentationSource (popup window) and the input-providing PresentationSource
- // (main window). The MouseDevice only records positions within the input-providing
- // PresentationSource, so we'll test the position where the mouse left the main window,
- // rather than the current position.
- // This means we may leave a tooltip open even when the mouse leaves its SafeArea,
- // but only when the tooltip belongs to a capturing source, and the "leaving the SafeArea"
- // action occurs outside the surrounding main window. For our example, it can happen
- // when the ComboBox is close to the edge of the main window so that a tooltip from its
- // popup content extends beyond the main window.
- // This can only be fixed by changing MouseDevice.GetScreenPositionFromSystem to
- // use a "better way" to find the current mouse position, which allegedly needs work from the OS.
- // But we can live with this behavior, because
- // * this is a corner case - tooltips from popup content that extend beyond the main window
- // * the effect is transient - the tooltip will close when the user dismisses the popup
- // * there's no accessibility issue - WCAG 2.1 only requires that the tooltip stays open under
- // proscribed conditions, not that it has to close when the conditions cease to apply
+ System.Windows.Point ptScreen = PointUtil.ClientToScreen(pt, mouseSource);
+ pt = PointUtil.ScreenToClient(ptScreen, _source);
}
- else
- return false;
+
+ #if DEBUG
+ // NonRelativePosition returns the mouse point in unscaled screen coords, relative
+ // to the active window's client area (despite the name).
+ // Compute the point a different way, and check that it agrees. The second
+ // way uses public API, but in our case ends up doing a lot of transforms
+ // and multiplications that should simply cancel each other out.
+ System.Windows.Interop.HwndSource hwndSource = _source as System.Windows.Interop.HwndSource;
+ IInputElement rootElement = hwndSource?.RootVisual as IInputElement;
+ Debug.Assert(hwndSource != null && rootElement != null, "expect non-null hwndSource and rootElement");
+ System.Windows.Point pt2 = hwndSource.TransformToDevice(Mouse.PrimaryDevice.GetPosition(rootElement));
+ Debug.Assert(((int)pt.X == (int)Math.Round(pt2.X)) && ((int)pt.Y == (int)Math.Round(pt2.Y)), "got incorrect mouse point");
+ #endif
+
+ // check whether the point lies within the hull
+ return ContainsPoint(_source, (int)pt.X, (int)pt.Y);
+
+ // NOTE: NonRelativePosition doesn't actually return the position of the current mouse point,
+ // but rather the last recorded position. (See MouseDevice.GetScreenPositionFromSystem,
+ // which says that "Win32 has issues reliably returning where the mouse is".)
+ // This causes a small problem when (a) the PresentationSource has capture, e.g.
+ // the popup of a ComboBox, and (b) the mouse moves to a position that lies outside both the
+ // capturing PresentationSource (popup window) and the input-providing PresentationSource
+ // (main window). The MouseDevice only records positions within the input-providing
+ // PresentationSource, so we'll test the position where the mouse left the main window,
+ // rather than the current position.
+ // This means we may leave a tooltip open even when the mouse leaves its SafeArea,
+ // but only when the tooltip belongs to a capturing source, and the "leaving the SafeArea"
+ // action occurs outside the surrounding main window. For our example, it can happen
+ // when the ComboBox is close to the edge of the main window so that a tooltip from its
+ // popup content extends beyond the main window.
+ // This can only be fixed by changing MouseDevice.GetScreenPositionFromSystem to
+ // use a "better way" to find the current mouse position, which allegedly needs work from the OS.
+ // But we can live with this behavior, because
+ // * this is a corner case - tooltips from popup content that extend beyond the main window
+ // * the effect is transient - the tooltip will close when the user dismisses the popup
+ // * there's no accessibility issue - WCAG 2.1 only requires that the tooltip stays open under
+ // proscribed conditions, not that it has to close when the conditions cease to apply
}
// Test whether a given mouse point (x,y) lies within the convex hull
From 3397e4c99913a92b54fdc072cc7effda23bf27c4 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Tue, 22 Dec 2020 19:32:10 +0800
Subject: [PATCH 218/223] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/Common/src/System/SR.cs | 2 ++
.../src/dotnetCampus.WPF/Program.cs | 14 ++++++++
.../dotnet-campus.PublicKey.snk | Bin 0 -> 160 bytes
.../src/dotnetCampus.WPF/dotnet-campus.snk | Bin 0 -> 596 bytes
.../dotnetCampus.WPF/dotnetCampus.WPF.csproj | 9 +++++
.../src/dotnetCampus.WPF/dotnetCampus.WPF.sln | 34 ++++++++++++++++++
6 files changed, 59 insertions(+)
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
diff --git a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
index 0ecaad06f94..5b2b5db760a 100644
--- a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
@@ -6,6 +6,8 @@
using System.Resources;
using System.Runtime.CompilerServices;
+[assembly:InternalsVisibleTo("dotnetCampus.WPF, PublicKey=0024000004800000940000000602000000240000525341310004000001000100256f5cb79140dbc25623807d6823ca4b5b602209eaaf71f064e5926a7039c24351c1e2ad3130e194631307ed36a76ad4b832e237a467fefbd693428c7ecc5d4cc26796f6f8b705311948e00f2be5fa2db52ddff50a5b3eb0acc715b45618c1a92532ae2326529fb9e0f58a44abf31e9b5701994464186d3b9f52169b6e0f80b9")]
+
#if WINDOWS_BASE
namespace MS.Internal.WindowsBase
#elif PRESENTATION_CORE
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
new file mode 100644
index 00000000000..ae9e97c4315
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.CompilerServices;
+
+
+namespace dotnetCampus.WPF
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello World!");
+ }
+ }
+}
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk
new file mode 100644
index 0000000000000000000000000000000000000000..a21f243aa1b954575ec15f1d38b7faf500a46ff6
GIT binary patch
literal 160
zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50096cZ(O&LK-ER^B$X50hvT(
O7;QVBQWl$T4}iI1d_a-_
literal 0
HcmV?d00001
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk
new file mode 100644
index 0000000000000000000000000000000000000000..8251708e309f71ab6f702b832821fe8dcc7b02e8
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096cZ(O&LK-ER^B$X50hvT(7;QVBQWl$T4}iHB
zq&`FG;kp?#ZTb*RSg=)NYMg4=OfD^6w7@&Hl9tWd5lZlIcfwp^3-Zc0_CU>GB8$WM
z@}6}K+lYwPFTwO902FLVW8jlC)=C>8Woal^h4qKdJuU>c~98VTKhEw9sKiw~8
z>LJijo!W)!;B<{T^z=+Ub;;VI;6!yNq=gItW%*yg{N?2%t`Ew;*}C*sz$lfgoo1G$
zVq?%=>Ku1O!jX@=IRL)&G@Wsv@dP8n%ax)jov3gnHO=?wav0b`J
+
+
+ Exe
+ net5.0
+ dotnet-campus.snk
+
+
+
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
new file mode 100644
index 00000000000..71196ac7fb7
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF", "dotnetCampus.WPF.csproj", "{BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.Build.0 = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.Build.0 = Debug|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.ActiveCfg = Release|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.Build.0 = Release|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.ActiveCfg = Release|Any CPU
+ {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+EndGlobal
From f6b5bbbce97c5f9534db5e4b72582f735e1fc53f Mon Sep 17 00:00:00 2001
From: lindexi
Date: Wed, 20 Apr 2022 20:28:53 +0800
Subject: [PATCH 219/223] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/dotnetCampus.WPF/dotnetCampus.WPF.csproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
index 46af5f5ce46..96505041751 100644
--- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
@@ -1,8 +1,8 @@
- Exe
- net5.0
+ net6.0-windows
+ true
dotnet-campus.snk
From 1d7fc3dd5f1569fd8b00aebecc09fd4c8041bb9e Mon Sep 17 00:00:00 2001
From: lindexi
Date: Wed, 20 Apr 2022 21:09:07 +0800
Subject: [PATCH 220/223] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=84=E4=B8=AA?=
=?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/dotnetCampus.WPF/Directory.Build.props | 3 +++
.../src/dotnetCampus.WPF/Directory.Build.targets | 3 +++
.../src/dotnetCampus.WPF/Program.cs | 7 ++++++-
.../src/dotnetCampus.WPF/dotnetCampus.WPF.csproj | 14 ++++++++++++++
4 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props
create mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props
new file mode 100644
index 00000000000..faf2349bae2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props
@@ -0,0 +1,3 @@
+
+
+
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets
new file mode 100644
index 00000000000..faf2349bae2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets
@@ -0,0 +1,3 @@
+
+
+
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
index ae9e97c4315..80ef5a775a1 100644
--- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
@@ -1,5 +1,9 @@
using System;
using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Composition;
+using System.Windows.Navigation;
namespace dotnetCampus.WPF
@@ -8,7 +12,8 @@ class Program
{
static void Main(string[] args)
{
- Console.WriteLine("Hello World!");
+ Application application = new Application();
+ NavigationService applicationNavService = application.NavService;
}
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
index 96505041751..438b3d73c21 100644
--- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
@@ -3,7 +3,21 @@
net6.0-windows
true
+ True
dotnet-campus.snk
+
+
+ ..\..\..\..
+
+ $(Configuration)
+
+ Microsoft.DotNet.Wpf.GitHub.Debug
+ Microsoft.DotNet.Wpf.GitHub
+
+
+
+
+
From 3916f1d7c3c406b0b9d42562fcd14aa7b0c0cfea Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 21 Apr 2022 20:06:57 +0800
Subject: [PATCH 221/223] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=9C=A8?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CustomWpf/CustomWpf.sln | 14 ++++++++
.../Directory.Build.props | 0
.../Directory.Build.targets | 0
.../dotnetCampus.CustomWpf.Lib}/Program.cs | 0
.../dotnet-campus.PublicKey.snk | Bin
.../dotnet-campus.snk | Bin
.../dotnetCampus.WPF.csproj | 2 +-
.../src/dotnetCampus.WPF/dotnetCampus.WPF.sln | 34 ------------------
8 files changed, 15 insertions(+), 35 deletions(-)
create mode 100644 CustomWpf/CustomWpf.sln
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Directory.Build.props (100%)
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Directory.Build.targets (100%)
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/Program.cs (100%)
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnet-campus.PublicKey.snk (100%)
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnet-campus.snk (100%)
rename {src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF => CustomWpf/Lib/dotnetCampus.CustomWpf.Lib}/dotnetCampus.WPF.csproj (95%)
delete mode 100644 src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln
new file mode 100644
index 00000000000..c3cb3c3a7fd
--- /dev/null
+++ b/CustomWpf/CustomWpf.sln
@@ -0,0 +1,14 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.props
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Directory.Build.targets
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/Program.cs
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Program.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.PublicKey.snk
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.PublicKey.snk
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.PublicKey.snk
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.snk
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnet-campus.snk
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnet-campus.snk
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
similarity index 95%
rename from src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
rename to CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
index 438b3d73c21..08f2027c732 100644
--- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.csproj
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
@@ -7,7 +7,7 @@
dotnet-campus.snk
- ..\..\..\..
+ ..\..\
$(Configuration)
diff --git a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln b/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
deleted file mode 100644
index 71196ac7fb7..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/dotnetCampus.WPF/dotnetCampus.WPF.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF", "dotnetCampus.WPF.csproj", "{BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x64.Build.0 = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Debug|x86.Build.0 = Debug|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|Any CPU.Build.0 = Release|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.ActiveCfg = Release|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x64.Build.0 = Release|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.ActiveCfg = Release|Any CPU
- {BD82C9E5-D4D2-4B19-9C73-5CE130FAAEBF}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
-EndGlobal
From d73165ad5475b81d97d0ede10ef969f360d0164a Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 21 Apr 2022 20:23:46 +0800
Subject: [PATCH 222/223] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=89=93=E5=8C=85?=
=?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CustomWpf/CustomWpf.sln | 29 +++++++++++++++++--
CustomWpf/Directory.Build.props | 17 +++++++++++
.../Directory.Build.targets | 0
.../Directory.Build.props | 3 --
.../dotnetCampus.WPF.csproj | 2 +-
.../dotnetCampus.WPF.NuGet/Program.cs | 2 ++
.../dotnetCampus.WPF.NuGet.csproj | 10 +++++++
CustomWpf/build/Version.props | 5 ++++
8 files changed, 62 insertions(+), 6 deletions(-)
create mode 100644 CustomWpf/Directory.Build.props
rename CustomWpf/{Lib/dotnetCampus.CustomWpf.Lib => }/Directory.Build.targets (100%)
delete mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props
create mode 100644 CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs
create mode 100644 CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj
create mode 100644 CustomWpf/build/Version.props
diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln
index c3cb3c3a7fd..fa0ca9fa030 100644
--- a/CustomWpf/CustomWpf.sln
+++ b/CustomWpf/CustomWpf.sln
@@ -1,14 +1,39 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF", "Lib\dotnetCampus.CustomWpf.Lib\dotnetCampus.WPF.csproj", "{39764FE3-C2F9-4772-9BF6-B66923ABEC4C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{FE032A91-A790-4274-A194-02E161D1F14B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packaging", "Packaging", "{27886E90-E328-4AE9-86DA-1F596554D26B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF.NuGet", "Packaging\dotnetCampus.WPF.NuGet\dotnetCampus.WPF.NuGet.csproj", "{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39764FE3-C2F9-4772-9BF6-B66923ABEC4C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {39764FE3-C2F9-4772-9BF6-B66923ABEC4C} = {FE032A91-A790-4274-A194-02E161D1F14B}
+ {FDC9151F-3544-4C68-9D05-D8E4935F1A9F} = {27886E90-E328-4AE9-86DA-1F596554D26B}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {C25E6016-F278-457B-87D6-39EC0E0A6849}
+ EndGlobalSection
EndGlobal
diff --git a/CustomWpf/Directory.Build.props b/CustomWpf/Directory.Build.props
new file mode 100644
index 00000000000..b75437bf1dd
--- /dev/null
+++ b/CustomWpf/Directory.Build.props
@@ -0,0 +1,17 @@
+
+
+
+ latest
+ $(MSBuildThisFileDirectory)bin\$(Configuration)
+ dotnet campus(.NET 职业技术学院)
+
+ dotnet-campus
+ https://github.com/dotnet-campus/dotnetCampus.Ipc
+ https://github.com/dotnet-campus/dotnetCampus.Ipc
+ 包含定制的 WPF 版本
+
+ git
+ Copyright © 2020-2022 dotnet campus, All Rights Reserved.
+
+
+
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets b/CustomWpf/Directory.Build.targets
similarity index 100%
rename from CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.targets
rename to CustomWpf/Directory.Build.targets
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props
deleted file mode 100644
index faf2349bae2..00000000000
--- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
index 08f2027c732..09f0a0f1b11 100644
--- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
@@ -7,7 +7,7 @@
dotnet-campus.snk
- ..\..\
+ ..\..\..\
$(Configuration)
diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs
new file mode 100644
index 00000000000..3751555cbd3
--- /dev/null
+++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/Program.cs
@@ -0,0 +1,2 @@
+// See https://aka.ms/new-console-template for more information
+Console.WriteLine("Hello, World!");
diff --git a/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj
new file mode 100644
index 00000000000..74abf5c9766
--- /dev/null
+++ b/CustomWpf/Packaging/dotnetCampus.WPF.NuGet/dotnetCampus.WPF.NuGet.csproj
@@ -0,0 +1,10 @@
+
+
+
+ Exe
+ net6.0
+ enable
+ enable
+
+
+
diff --git a/CustomWpf/build/Version.props b/CustomWpf/build/Version.props
new file mode 100644
index 00000000000..b7b14edcd63
--- /dev/null
+++ b/CustomWpf/build/Version.props
@@ -0,0 +1,5 @@
+
+
+ 6.0.4
+
+
\ No newline at end of file
From a6c7dca6c9d312f5aeb77f88542d78a372b1257f Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 21 Apr 2022 21:17:46 +0800
Subject: [PATCH 223/223] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CustomWpf/CustomWpf.sln | 19 +++++++++++++++
CustomWpf/Directory.Build.props | 1 +
.../Build/Package.targets | 13 +++++++++++
.../dotnetCampus.WPF.Dependencies.csproj | 17 ++++++++++++++
.../dotnetCampus.WPF.csproj | 3 +--
.../Build/Package.props | 7 ++++++
.../dotnetCampus.WPF.Resource.csproj | 23 +++++++++++++++++++
CustomWpf/NuGet.config | 9 ++++++++
CustomWpf/build/Version.props | 4 ++--
9 files changed, 92 insertions(+), 4 deletions(-)
create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets
create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj
create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props
create mode 100644 CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj
create mode 100644 CustomWpf/NuGet.config
diff --git a/CustomWpf/CustomWpf.sln b/CustomWpf/CustomWpf.sln
index fa0ca9fa030..5be3cf3aedd 100644
--- a/CustomWpf/CustomWpf.sln
+++ b/CustomWpf/CustomWpf.sln
@@ -11,6 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packaging", "Packaging", "{
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF.NuGet", "Packaging\dotnetCampus.WPF.NuGet\dotnetCampus.WPF.NuGet.csproj", "{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnetCampus.WPF.Resource", "Lib\dotnetCampus.CustomWpf.Resource\dotnetCampus.WPF.Resource.csproj", "{D73CB485-6290-4E37-B441-8068E60CBF7E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{315B416C-6CDA-4CD5-9666-69C8272CD80E}"
+ ProjectSection(SolutionItems) = preProject
+ build\Version.props = build\Version.props
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnetCampus.WPF.Dependencies", "Lib\dotnetCampus.CustomWpf.Dependencies\dotnetCampus.WPF.Dependencies.csproj", "{39E01A9E-C352-4B7E-96CA-612A07937470}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,6 +34,14 @@ Global
{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FDC9151F-3544-4C68-9D05-D8E4935F1A9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D73CB485-6290-4E37-B441-8068E60CBF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D73CB485-6290-4E37-B441-8068E60CBF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D73CB485-6290-4E37-B441-8068E60CBF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D73CB485-6290-4E37-B441-8068E60CBF7E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {39E01A9E-C352-4B7E-96CA-612A07937470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39E01A9E-C352-4B7E-96CA-612A07937470}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39E01A9E-C352-4B7E-96CA-612A07937470}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39E01A9E-C352-4B7E-96CA-612A07937470}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -32,6 +49,8 @@ Global
GlobalSection(NestedProjects) = preSolution
{39764FE3-C2F9-4772-9BF6-B66923ABEC4C} = {FE032A91-A790-4274-A194-02E161D1F14B}
{FDC9151F-3544-4C68-9D05-D8E4935F1A9F} = {27886E90-E328-4AE9-86DA-1F596554D26B}
+ {D73CB485-6290-4E37-B441-8068E60CBF7E} = {FE032A91-A790-4274-A194-02E161D1F14B}
+ {39E01A9E-C352-4B7E-96CA-612A07937470} = {FE032A91-A790-4274-A194-02E161D1F14B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C25E6016-F278-457B-87D6-39EC0E0A6849}
diff --git a/CustomWpf/Directory.Build.props b/CustomWpf/Directory.Build.props
index b75437bf1dd..961a10f9fc0 100644
--- a/CustomWpf/Directory.Build.props
+++ b/CustomWpf/Directory.Build.props
@@ -14,4 +14,5 @@
Copyright © 2020-2022 dotnet campus, All Rights Reserved.
+
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets
new file mode 100644
index 00000000000..c99690af8b8
--- /dev/null
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/Build/Package.targets
@@ -0,0 +1,13 @@
+
+
+
+ $(RuntimeIdentifier)
+ win-x86
+
+
+
+
+
+
+
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj
new file mode 100644
index 00000000000..63906a8bab0
--- /dev/null
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Dependencies/dotnetCampus.WPF.Dependencies.csproj
@@ -0,0 +1,17 @@
+
+
+
+ net6.0
+
+ false
+ true
+
+
+
+
+
+
+
+
+
+
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
index 09f0a0f1b11..b7d289f1a7e 100644
--- a/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Lib/dotnetCampus.WPF.csproj
@@ -6,8 +6,8 @@
True
dotnet-campus.snk
-
..\..\..\
+
$(Configuration)
@@ -17,7 +17,6 @@
-
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props
new file mode 100644
index 00000000000..f932a8463d7
--- /dev/null
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/Build/Package.props
@@ -0,0 +1,7 @@
+
+
+ $(MSBuildThisFileDirectory)..\Assets\
+
+
+
+
diff --git a/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj
new file mode 100644
index 00000000000..092ccde4276
--- /dev/null
+++ b/CustomWpf/Lib/dotnetCampus.CustomWpf.Resource/dotnetCampus.WPF.Resource.csproj
@@ -0,0 +1,23 @@
+
+
+
+ net6.0
+ false
+ true
+
+ ..\..\..\
+
+
+ $(Configuration)
+
+ Microsoft.DotNet.Wpf.GitHub.Debug
+ Microsoft.DotNet.Wpf.GitHub
+
+ $(WpfRepoRoot)\artifacts\packaging\$(WpfConfig)\$(WpfOuputFolder)
+
+
+
+
+
+
+
diff --git a/CustomWpf/NuGet.config b/CustomWpf/NuGet.config
new file mode 100644
index 00000000000..f578cf96933
--- /dev/null
+++ b/CustomWpf/NuGet.config
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CustomWpf/build/Version.props b/CustomWpf/build/Version.props
index b7b14edcd63..c66636f9398 100644
--- a/CustomWpf/build/Version.props
+++ b/CustomWpf/build/Version.props
@@ -1,5 +1,5 @@
- 6.0.4
+ 6.0.4-alpha01-001232332
-
\ No newline at end of file
+