From c89370850a3b350ece775f3b933c088aa4ab6137 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 00:17:38 +0000
Subject: [PATCH 001/109] Update dependencies from
https://github.com/dotnet/winforms build 20220613.1 (#6676)
[main] 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 893c5ad0904..84bffb633ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 645aaf13ddf9e00a670f261dc88975fef8956da5
+ 5a29b584e52a18d591be0051f4d89bf0f4a5c2f6
-
+
https://github.com/dotnet/winforms
- 645aaf13ddf9e00a670f261dc88975fef8956da5
+ 5a29b584e52a18d591be0051f4d89bf0f4a5c2f6
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index b333e087928..ce262b2c81b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22310.1
+ 7.0.0-preview.6.22313.1
From a052401e6a864a05c1e3d4677a71061237701412 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 01:51:45 +0000
Subject: [PATCH 002/109] Update dependencies from
https://github.com/dotnet/winforms build 20220613.2 (#6677)
[main] 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 84bffb633ff..33f9e440080 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 5a29b584e52a18d591be0051f4d89bf0f4a5c2f6
+ 28562c6795aa56eda7b31b5eec48ac1018342fd2
-
+
https://github.com/dotnet/winforms
- 5a29b584e52a18d591be0051f4d89bf0f4a5c2f6
+ 28562c6795aa56eda7b31b5eec48ac1018342fd2
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index ce262b2c81b..4abd5a117cb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22313.1
+ 7.0.0-preview.6.22313.2
From 79a349b4c2846a735a545aa7c5c64739fe596155 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:24:00 +0000
Subject: [PATCH 003/109] Update dependencies from
https://github.com/dotnet/winforms build 20220613.3 (#6678)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22308.8 to 7.0.0-preview.6.22312.5 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 33f9e440080..c0d3a018e70 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 28562c6795aa56eda7b31b5eec48ac1018342fd2
+ 758beec8e24d248b86c7a373de22ecb0a98408e5
-
+
https://github.com/dotnet/winforms
- 28562c6795aa56eda7b31b5eec48ac1018342fd2
+ 758beec8e24d248b86c7a373de22ecb0a98408e5
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
-
+
https://github.com/dotnet/runtime
- 3cc587e1d037b054e785f1e758edec8490fa62ea
+ a0b426dc781be2f3e38bb13856d15e2fa595a589
diff --git a/eng/Versions.props b/eng/Versions.props
index 4abd5a117cb..b44cbdddbd4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.6.22313.2
+ 7.0.0-preview.6.22313.3
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
- 7.0.0-preview.6.22308.8
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22312.5
From 611b64d8ccbf2089110d5634b0e825aaa24d2b80 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 03:13:03 +0000
Subject: [PATCH 004/109] Update dependencies from
https://github.com/dotnet/winforms build 20220613.5 (#6679)
[main] 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 c0d3a018e70..95a92d807ca 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 758beec8e24d248b86c7a373de22ecb0a98408e5
+ 1ea8dd5a07c26574842e303fcef59c5172a39efb
-
+
https://github.com/dotnet/winforms
- 758beec8e24d248b86c7a373de22ecb0a98408e5
+ 1ea8dd5a07c26574842e303fcef59c5172a39efb
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index b44cbdddbd4..85c5d194b6e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22313.3
+ 7.0.0-preview.6.22313.5
From 60211010c1f26a5cd50baa66c0d3426f8d201e87 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Tue, 14 Jun 2022 01:26:15 -0400
Subject: [PATCH 005/109] Fix build when using source generators (#6534)
Fixes dotnet/wpf#6522
---
.../Microsoft.WinFX.targets | 3 ++-
.../Windows/GenerateTemporaryTargetAssembly.cs | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 903018db4bf..69112522630 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -441,6 +441,7 @@
MSBuildBinPath="$(MSBuildBinPath)"
ReferencePathTypeName="ReferencePath"
CompileTypeName="Compile"
+ AnalyzerTypeName="Analyzer"
GeneratedCodeFiles="@(_GeneratedCodeFiles)"
ReferencePath="@(ReferencePath)"
BaseIntermediateOutputPath="$(BaseIntermediateOutputPath)"
@@ -449,7 +450,7 @@
CompileTargetName="$(_CompileTargetNameForLocalType)"
GenerateTemporaryTargetAssemblyDebuggingInformation="$(GenerateTemporaryTargetAssemblyDebuggingInformation)"
IncludePackageReferencesDuringMarkupCompilation="$(IncludePackageReferencesDuringMarkupCompilation)"
- Analyzers="$(Analyzers)"
+ Analyzers="@(Analyzer)"
TemporaryTargetAssemblyProjectName="$(_TemporaryTargetAssemblyProjectName)"
MSBuildProjectExtensionsPath="$(MSBuildProjectExtensionsPath)"
>
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 3be2dc23773..3cb7ac44c50 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
@@ -263,6 +263,9 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
// Add GeneratedCodeFiles to Compile item list.
AddNewItems(xmlProjectDoc, CompileTypeName, GeneratedCodeFiles);
+ // Add Analyzers to Analyzer item list.
+ AddNewItems(xmlProjectDoc, AnalyzerTypeName, Analyzers);
+
// Replace implicit SDK imports with explicit SDK imports
ReplaceImplicitImports(xmlProjectDoc);
@@ -274,7 +277,6 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
( nameof(BaseIntermediateOutputPath), BaseIntermediateOutputPath ),
( nameof(MSBuildProjectExtensionsPath), MSBuildProjectExtensionsPath ),
( "_TargetAssemblyProjectName", Path.GetFileNameWithoutExtension(CurrentProject) ),
- ( nameof(Analyzers), Analyzers )
};
AddNewProperties(xmlProjectDoc, properties);
@@ -481,9 +483,20 @@ public bool GenerateTemporaryTargetAssemblyDebuggingInformation
/// Required for Source Generator support. May be null.
///
///
- public string Analyzers
+ public ITaskItem[] Analyzers
{ get; set; }
+ ///
+ /// AnalyzerTypeName
+ /// The appropriate item name which can be accepted by managed compiler task.
+ /// It is "Analyzer" for now.
+ ///
+ /// Adding this property is to make the type name configurable, if it is changed,
+ /// No code is required to change in this task, but set a new type name in project file.
+ ///
+ [Required]
+ public string AnalyzerTypeName { get; set; }
+
///
/// BaseIntermediateOutputPath
///
From 7b1c1b6a358b872dbc7a5e394be32cc05d8a1072 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 21:07:33 +0000
Subject: [PATCH 006/109] Update dependencies from
https://github.com/dotnet/winforms build 20220614.4 (#6683)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22312.5 to 7.0.0-preview.6.22313.8 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 95a92d807ca..f27a8cdadd3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 1ea8dd5a07c26574842e303fcef59c5172a39efb
+ 8f52930d4edbe7316df431cb4810a735eb52182d
-
+
https://github.com/dotnet/winforms
- 1ea8dd5a07c26574842e303fcef59c5172a39efb
+ 8f52930d4edbe7316df431cb4810a735eb52182d
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
-
+
https://github.com/dotnet/runtime
- a0b426dc781be2f3e38bb13856d15e2fa595a589
+ 367193d0854a75e258ff57f913b8f640c8dbb751
diff --git a/eng/Versions.props b/eng/Versions.props
index 85c5d194b6e..e26dc31244d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.6.22313.5
+ 7.0.0-preview.6.22314.4
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
- 7.0.0-preview.6.22312.5
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22313.8
From 23efb2b9a3391a666f8b576601adcc177f0bfbe2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Jun 2022 13:02:06 +0000
Subject: [PATCH 007/109] Update dependencies from
https://github.com/dotnet/arcade build 20220614.8 (#6688)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f27a8cdadd3..95085e9da97 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 569a3f07467a9ebf55b78bbf92ab10b85e597819
+ 696eeede14b91aebe0069dc2e4a91cf594d2073e
-
+
https://github.com/dotnet/arcade
- 569a3f07467a9ebf55b78bbf92ab10b85e597819
+ 696eeede14b91aebe0069dc2e4a91cf594d2073e
-
+
https://github.com/dotnet/arcade
- 569a3f07467a9ebf55b78bbf92ab10b85e597819
+ 696eeede14b91aebe0069dc2e4a91cf594d2073e
-
+
https://github.com/dotnet/arcade
- 569a3f07467a9ebf55b78bbf92ab10b85e597819
+ 696eeede14b91aebe0069dc2e4a91cf594d2073e
-
+
https://github.com/dotnet/arcade
- 569a3f07467a9ebf55b78bbf92ab10b85e597819
+ 696eeede14b91aebe0069dc2e4a91cf594d2073e
diff --git a/eng/Versions.props b/eng/Versions.props
index e26dc31244d..dc2956ab708 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22313.1
- 7.0.0-beta.22313.1
+ 7.0.0-beta.22314.8
+ 7.0.0-beta.22314.8
diff --git a/global.json b/global.json
index 3364d065b19..8c8514d34cc 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22313.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22313.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22314.8",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22314.8"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From b6d5f2dfaa6c1971be42759125ed7569eb807ced Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Jun 2022 23:26:24 +0000
Subject: [PATCH 008/109] Update dependencies from
https://github.com/dotnet/winforms build 20220615.3 (#6690)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22313.8 to 7.0.0-preview.6.22314.11 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 95085e9da97..e5809f908b5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 8f52930d4edbe7316df431cb4810a735eb52182d
+ c72e202daa0656fbecee52a4630b0c81550f742d
-
+
https://github.com/dotnet/winforms
- 8f52930d4edbe7316df431cb4810a735eb52182d
+ c72e202daa0656fbecee52a4630b0c81550f742d
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
-
+
https://github.com/dotnet/runtime
- 367193d0854a75e258ff57f913b8f640c8dbb751
+ eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
diff --git a/eng/Versions.props b/eng/Versions.props
index dc2956ab708..a3494bb6c6b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.6.22314.4
+ 7.0.0-preview.6.22315.3
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
- 7.0.0-preview.6.22313.8
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22314.11
From 87b27e544ea7f538555bd89b893045347e6a796e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 07:45:49 +0000
Subject: [PATCH 009/109] Update dependencies from
https://github.com/dotnet/winforms build 20220616.1 (#6694)
[main] 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 e5809f908b5..6d47c19b39d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- c72e202daa0656fbecee52a4630b0c81550f742d
+ 2f1225cb8724192dbd4170c5e37641b3fbe6dd02
-
+
https://github.com/dotnet/winforms
- c72e202daa0656fbecee52a4630b0c81550f742d
+ 2f1225cb8724192dbd4170c5e37641b3fbe6dd02
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index a3494bb6c6b..5cdadc1048b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22315.3
+ 7.0.0-preview.6.22316.1
From b8f0c611afae7b06726a4ffb4b5d76eea1f2aaa4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 09:00:54 +0000
Subject: [PATCH 010/109] Update dependencies from
https://github.com/dotnet/winforms build 20220617.1 (#6695)
[main] 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 6d47c19b39d..265da259054 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 2f1225cb8724192dbd4170c5e37641b3fbe6dd02
+ 6ed2b018fc372647905a04985b6c801f4f3c5274
-
+
https://github.com/dotnet/winforms
- 2f1225cb8724192dbd4170c5e37641b3fbe6dd02
+ 6ed2b018fc372647905a04985b6c801f4f3c5274
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5cdadc1048b..957701e1283 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22316.1
+ 7.0.0-preview.6.22317.1
From 0511890624d6ca21930c01017125a9b769a81197 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 09:28:41 +0000
Subject: [PATCH 011/109] Update dependencies from
https://github.com/dotnet/winforms build 20220617.2 (#6696)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22314.11 to 7.0.0-preview.6.22315.2 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 265da259054..a152cd7c1c5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 6ed2b018fc372647905a04985b6c801f4f3c5274
+ ae99c750977752b0d719f9ebd3f06b9a1e9e70db
-
+
https://github.com/dotnet/winforms
- 6ed2b018fc372647905a04985b6c801f4f3c5274
+ ae99c750977752b0d719f9ebd3f06b9a1e9e70db
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
-
+
https://github.com/dotnet/runtime
- eeb0c1551b5fc9ccd6ceeaf5d2b1504afab249d7
+ 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
diff --git a/eng/Versions.props b/eng/Versions.props
index 957701e1283..7d87a7eef9a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.6.22317.1
+ 7.0.0-preview.6.22317.2
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
- 7.0.0-preview.6.22314.11
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22315.2
From e0961a02a5caa90e4c03c7c5875766254e21ee42 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 09:55:06 +0000
Subject: [PATCH 012/109] Update dependencies from
https://github.com/dotnet/winforms build 20220617.3 (#6697)
[main] 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 a152cd7c1c5..8c6239fefd3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- ae99c750977752b0d719f9ebd3f06b9a1e9e70db
+ b49db1e2b72f718460cf0983241178e16c5c1c04
-
+
https://github.com/dotnet/winforms
- ae99c750977752b0d719f9ebd3f06b9a1e9e70db
+ b49db1e2b72f718460cf0983241178e16c5c1c04
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7d87a7eef9a..813fbdc27b1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.6.22317.2
+ 7.0.0-preview.6.22317.3
From aff06da8b6705ac706a4e8f772bffa7c7512be94 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 13:02:44 +0000
Subject: [PATCH 013/109] Update dependencies from
https://github.com/dotnet/arcade build 20220616.2 (#6699)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8c6239fefd3..a04b4543ea9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 696eeede14b91aebe0069dc2e4a91cf594d2073e
+ ccfe6da198c5f05534863bbb1bff66e830e0c6ab
-
+
https://github.com/dotnet/arcade
- 696eeede14b91aebe0069dc2e4a91cf594d2073e
+ ccfe6da198c5f05534863bbb1bff66e830e0c6ab
-
+
https://github.com/dotnet/arcade
- 696eeede14b91aebe0069dc2e4a91cf594d2073e
+ ccfe6da198c5f05534863bbb1bff66e830e0c6ab
-
+
https://github.com/dotnet/arcade
- 696eeede14b91aebe0069dc2e4a91cf594d2073e
+ ccfe6da198c5f05534863bbb1bff66e830e0c6ab
-
+
https://github.com/dotnet/arcade
- 696eeede14b91aebe0069dc2e4a91cf594d2073e
+ ccfe6da198c5f05534863bbb1bff66e830e0c6ab
diff --git a/eng/Versions.props b/eng/Versions.props
index 813fbdc27b1..1bc6d6bf568 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22314.8
- 7.0.0-beta.22314.8
+ 7.0.0-beta.22316.2
+ 7.0.0-beta.22316.2
diff --git a/global.json b/global.json
index 8c8514d34cc..40ed826634a 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22314.8",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22314.8"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22316.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22316.2"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From 442cd2f6642c342d4793653ab65335a581a97795 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Fri, 17 Jun 2022 10:43:29 -0400
Subject: [PATCH 014/109] Remove duplicate Microsoft.Private.Winforms (#6648)
---
.../src/PresentationUI/PresentationUI.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
index a2335ec4161..e2ce4ea7e84 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
@@ -216,7 +216,6 @@
-
From b43302b7c61c2565f39a12239d6d516c79026928 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com>
Date: Fri, 17 Jun 2022 20:13:53 +0530
Subject: [PATCH 015/109] Fixing the C++/CLI projects failing due to NU1504
(#6698)
---
eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 10 ++++++++++
.../DirectWriteForwarder/DirectWriteForwarder.vcxproj | 5 +++++
.../src/System.Printing/System.Printing.vcxproj | 5 +++++
3 files changed, 20 insertions(+)
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index f1a7de9a9bb..ad973b35172 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -353,6 +353,16 @@ using namespace System::Runtime::Versioning;
+
+
+
+
+
+
true
.NETCoreApp
Unknown
+
+ true
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
index f71cf035853..737d4e34452 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -31,6 +31,11 @@
.NETCoreApp
v6.0
Unknown
+
+ true
From 722b3566d54f850afb430fb41ad85344e39cc82a Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Thu, 23 Jun 2022 12:20:14 +0530
Subject: [PATCH 016/109] Update copy-wpf.ps1
---
eng/copy-wpf.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
index b204ae4b91b..df91275ea8c 100644
--- a/eng/copy-wpf.ps1
+++ b/eng/copy-wpf.ps1
@@ -63,7 +63,7 @@ function CopyManagedBinariesToLocation($location, $localBinLocation)
# x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net6.0
$PackageName = "Microsoft.DotNet.Wpf.GitHub"
- $BinaryLocationInPackage = "net6.0"
+ $BinaryLocationInPackage = "net7.0"
CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage
}
@@ -153,7 +153,7 @@ elseif($testhost)
else
{
$runtimeIdentifer = "win-$arch"
- $location = [System.IO.Path]::Combine($destination, "bin\Debug\net6.0", $runtimeIdentifer, "publish")
+ $location = [System.IO.Path]::Combine($destination, "bin\Debug\net7.0", $runtimeIdentifer, "publish")
if(![System.IO.Directory]::Exists($location))
{
Write-Host "App publishing directory unavailable: " $location -ForegroundColor Red
From 43c995b519fc75236053cc1f5f1f6eef6beb851e Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Fri, 24 Jun 2022 10:57:25 +0530
Subject: [PATCH 017/109] Fix build error temporarily to unblock (#6718)
---
.../System.Printing/System.Printing.vcxproj | 66 +++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
index 737d4e34452..c673eddd146 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -238,4 +238,70 @@
unknownrev
+
+
+
+ <_Temporary Remove="@(_Temporary)"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_Temporary Include ="@(EmbeddedResource)" Condition="'%(EmbeddedResource.ManifestResourceName)' != '' "/>
+ <_Temporary>
+ $(TargetPath)
+ $(ProjectPath)
+
+
+
+
+
+
+
+
+ <_Temporary Remove="@(_Temporary)"/>
+ <_OutOfDateEmbeddedResource Remove="@(_OutOfDateEmbeddedResource)" />
+
+
From 4016c1527a94022f89dd1486edf6b02d731e9baf Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Jun 2022 05:54:03 +0000
Subject: [PATCH 018/109] [main] Update dependencies from dotnet/winforms
(#6708)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22315.2 to 7.0.0-preview.6.22321.8 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a04b4543ea9..53afa72e1e0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- b49db1e2b72f718460cf0983241178e16c5c1c04
+ 2a49ce37b41877a48337f0e063511ecf7a7f8c6e
-
+
https://github.com/dotnet/winforms
- b49db1e2b72f718460cf0983241178e16c5c1c04
+ 2a49ce37b41877a48337f0e063511ecf7a7f8c6e
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
-
+
https://github.com/dotnet/runtime
- 53e52f28cdc9b800a4b04fee2f200e4087fcfd58
+ fdc3b51da075066a5da489be2c169be85dbc117f
diff --git a/eng/Versions.props b/eng/Versions.props
index 1bc6d6bf568..98a54691b77 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.6.22317.3
+ 7.0.0-preview.7.22323.1
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
- 7.0.0-preview.6.22315.2
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22321.8
From 1a92f3fc4e6b075edb562c39d5664c5c660539e6 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:29:09 +0530
Subject: [PATCH 019/109] Update Branding to prerelease 7 (#6705)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 98a54691b77..2f54c8767b8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,7 @@
0
0
preview
- 6
+ 7
$(MajorVersion).$(MinorVersion).$(PatchVersion)
- 7.0.0-beta.22316.2
- 7.0.0-beta.22316.2
+ 7.0.0-beta.22322.3
+ 7.0.0-beta.22322.3
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index 09a223989f7..3eb7e2d5f84 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/eng/common/templates/steps/send-to-helix.yml
@@ -3,7 +3,7 @@ parameters:
HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
- HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
+ HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
HelixConfiguration: '' # optional -- additional property attached to a job
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
@@ -12,7 +12,7 @@ parameters:
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
- XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
+ XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects
XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
@@ -22,14 +22,14 @@ parameters:
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
- HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
+ HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
steps:
- - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
+ - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
env:
BuildConfig: $(_BuildConfig)
@@ -59,7 +59,7 @@ steps:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
- - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
+ - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
env:
BuildConfig: $(_BuildConfig)
diff --git a/global.json b/global.json
index 40ed826634a..b6928fe2df4 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22316.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22316.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22322.3"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From 7aae9c1ee115b2bfb2aa1fb834ee7909c8902a4b Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Fri, 24 Jun 2022 02:39:35 -0400
Subject: [PATCH 021/109] Fix wpf-debug.targets (#6709)
---
eng/wpf-debug.targets | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eng/wpf-debug.targets b/eng/wpf-debug.targets
index ddeceee3f8a..fc97596bc23 100644
--- a/eng/wpf-debug.targets
+++ b/eng/wpf-debug.targets
@@ -16,7 +16,8 @@
$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\'))\artifacts\packaging
x64\
- $(WpfPackagesCommonPath)\$(WpfConfig)\$(WpfPlatformTargetArtifactsDirectory)Microsoft.DotNet.Wpf.GitHub.$(WpfConfig)
+ .$(WpfConfig)
+ $(WpfArtifactsPackagesCommonPath)\$(WpfConfig)\$(WpfPlatformTargetArtifactsDirectory)Microsoft.DotNet.Wpf.GitHub$(WPFArtifactsPathSuffix)
From 0c475b26ee0d00de2b071c1cc109de77a0fb4376 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Jun 2022 13:04:49 +0000
Subject: [PATCH 022/109] Update dependencies from
https://github.com/dotnet/arcade build 20220623.2 (#6721)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
eng/common/tools.ps1 | 2 +-
eng/common/tools.sh | 2 +-
global.json | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6d8e35d2ee2..4c4dd32e148 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- eaa4673f2a82355f7cd2f1c1243578be2e961d0f
+ 9dbd4ef3347980e68875996239f3272efb85dd04
-
+
https://github.com/dotnet/arcade
- eaa4673f2a82355f7cd2f1c1243578be2e961d0f
+ 9dbd4ef3347980e68875996239f3272efb85dd04
-
+
https://github.com/dotnet/arcade
- eaa4673f2a82355f7cd2f1c1243578be2e961d0f
+ 9dbd4ef3347980e68875996239f3272efb85dd04
-
+
https://github.com/dotnet/arcade
- eaa4673f2a82355f7cd2f1c1243578be2e961d0f
+ 9dbd4ef3347980e68875996239f3272efb85dd04
-
+
https://github.com/dotnet/arcade
- eaa4673f2a82355f7cd2f1c1243578be2e961d0f
+ 9dbd4ef3347980e68875996239f3272efb85dd04
diff --git a/eng/Versions.props b/eng/Versions.props
index 4438f742838..237f85a0a38 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22322.3
- 7.0.0-beta.22322.3
+ 7.0.0-beta.22323.2
+ 7.0.0-beta.22323.2
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 423bd962e96..395b43eebb6 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -573,7 +573,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 17f0a365805..c110d0ed410 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
- _InitializeBuildToolFramework="netcoreapp3.1"
+ _InitializeBuildToolFramework="net7.0"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
diff --git a/global.json b/global.json
index b6928fe2df4..dcf71dba645 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22322.3"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22323.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22323.2"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From 7ca035c4ea843c121ec650b3015d5bafc59dca08 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Jun 2022 14:26:05 +0000
Subject: [PATCH 023/109] Update dependencies from
https://github.com/dotnet/winforms build 20220624.1 (#6722)
[main] 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 4c4dd32e148..7a9ccdd821a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 2a49ce37b41877a48337f0e063511ecf7a7f8c6e
+ 010f5d5fd22eb77ce119409d9a52b8d6bcfb368a
-
+
https://github.com/dotnet/winforms
- 2a49ce37b41877a48337f0e063511ecf7a7f8c6e
+ 010f5d5fd22eb77ce119409d9a52b8d6bcfb368a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 237f85a0a38..b618e842edc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22323.1
+ 7.0.0-preview.7.22324.1
From d4797f1ec6de9347c3725150b5dcacc307859749 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 25 Jun 2022 12:57:39 +0000
Subject: [PATCH 024/109] Update dependencies from
https://github.com/dotnet/arcade build 20220624.1 (#6723)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7a9ccdd821a..56f83a2b834 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 9dbd4ef3347980e68875996239f3272efb85dd04
+ d4623961318d0d6e013389bb9f1269492b5384b0
-
+
https://github.com/dotnet/arcade
- 9dbd4ef3347980e68875996239f3272efb85dd04
+ d4623961318d0d6e013389bb9f1269492b5384b0
-
+
https://github.com/dotnet/arcade
- 9dbd4ef3347980e68875996239f3272efb85dd04
+ d4623961318d0d6e013389bb9f1269492b5384b0
-
+
https://github.com/dotnet/arcade
- 9dbd4ef3347980e68875996239f3272efb85dd04
+ d4623961318d0d6e013389bb9f1269492b5384b0
-
+
https://github.com/dotnet/arcade
- 9dbd4ef3347980e68875996239f3272efb85dd04
+ d4623961318d0d6e013389bb9f1269492b5384b0
diff --git a/eng/Versions.props b/eng/Versions.props
index b618e842edc..652ad9c2b75 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22323.2
- 7.0.0-beta.22323.2
+ 7.0.0-beta.22324.1
+ 7.0.0-beta.22324.1
diff --git a/global.json b/global.json
index dcf71dba645..7ca0a9374e6 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22323.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22323.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22324.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22324.1"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From 7e342fa729f54ef5619c65a0a9c33bfc7ea4d78c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 13:01:47 +0000
Subject: [PATCH 025/109] Update dependencies from
https://github.com/dotnet/arcade build 20220627.1 (#6724)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 56f83a2b834..25f6deaade7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- d4623961318d0d6e013389bb9f1269492b5384b0
+ 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
-
+
https://github.com/dotnet/arcade
- d4623961318d0d6e013389bb9f1269492b5384b0
+ 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
-
+
https://github.com/dotnet/arcade
- d4623961318d0d6e013389bb9f1269492b5384b0
+ 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
-
+
https://github.com/dotnet/arcade
- d4623961318d0d6e013389bb9f1269492b5384b0
+ 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
-
+
https://github.com/dotnet/arcade
- d4623961318d0d6e013389bb9f1269492b5384b0
+ 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
diff --git a/eng/Versions.props b/eng/Versions.props
index 652ad9c2b75..c42c90b1320 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22324.1
- 7.0.0-beta.22324.1
+ 7.0.0-beta.22327.1
+ 7.0.0-beta.22327.1
diff --git a/global.json b/global.json
index 7ca0a9374e6..eca459069f7 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22324.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22324.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.1"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From 9d89d03bd826ef1f5e6a2937a3b7c6755fcfa1f9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 00:07:58 +0000
Subject: [PATCH 026/109] Update dependencies from
https://github.com/dotnet/winforms build 20220627.1 (#6726)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22321.8 to 7.0.0-preview.6.22326.1 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 25f6deaade7..55035e4decb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 010f5d5fd22eb77ce119409d9a52b8d6bcfb368a
+ cdf211d78c0afdf17a7991cf9e1aa939dcf9252a
-
+
https://github.com/dotnet/winforms
- 010f5d5fd22eb77ce119409d9a52b8d6bcfb368a
+ cdf211d78c0afdf17a7991cf9e1aa939dcf9252a
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
-
+
https://github.com/dotnet/runtime
- fdc3b51da075066a5da489be2c169be85dbc117f
+ c9f80fdde29c71ac87971383c77a1a5e665fadb9
diff --git a/eng/Versions.props b/eng/Versions.props
index c42c90b1320..463bbd9bc1a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.7.22324.1
+ 7.0.0-preview.7.22327.1
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
- 7.0.0-preview.6.22321.8
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22326.1
From 884c9b61a58fae8eea00ae28707056c9738c4778 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 00:46:49 +0000
Subject: [PATCH 027/109] Update dependencies from
https://github.com/dotnet/winforms build 20220627.3 (#6728)
[main] 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 55035e4decb..312498b2eec 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- cdf211d78c0afdf17a7991cf9e1aa939dcf9252a
+ 569f45998d01c0700324705d2e01449590b33c86
-
+
https://github.com/dotnet/winforms
- cdf211d78c0afdf17a7991cf9e1aa939dcf9252a
+ 569f45998d01c0700324705d2e01449590b33c86
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 463bbd9bc1a..9294566478c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22327.1
+ 7.0.0-preview.7.22327.3
From 88a56c3a5e9396410768597079cf242a88fb1908 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 02:46:51 +0000
Subject: [PATCH 028/109] Update dependencies from
https://github.com/dotnet/winforms build 20220627.4 (#6730)
[main] 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 312498b2eec..b585615585e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 569f45998d01c0700324705d2e01449590b33c86
+ 250c0e19a97314f897fdac7cc3c83912ad97f6a0
-
+
https://github.com/dotnet/winforms
- 569f45998d01c0700324705d2e01449590b33c86
+ 250c0e19a97314f897fdac7cc3c83912ad97f6a0
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 9294566478c..e5bab5c2cc3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22327.3
+ 7.0.0-preview.7.22327.4
From cd16f23624082e6478b1f96eee7f93b08e2da211 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 13:06:33 +0000
Subject: [PATCH 029/109] Update dependencies from
https://github.com/dotnet/arcade build 20220627.2 (#6731)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b585615585e..ebd608593f5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
+ a264eb13fea14125f3ef8d4056586cd66fa55309
-
+
https://github.com/dotnet/arcade
- 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
+ a264eb13fea14125f3ef8d4056586cd66fa55309
-
+
https://github.com/dotnet/arcade
- 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
+ a264eb13fea14125f3ef8d4056586cd66fa55309
-
+
https://github.com/dotnet/arcade
- 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
+ a264eb13fea14125f3ef8d4056586cd66fa55309
-
+
https://github.com/dotnet/arcade
- 640c1cc2a140b322c4f30f6d6b85f35f0c4c7313
+ a264eb13fea14125f3ef8d4056586cd66fa55309
diff --git a/eng/Versions.props b/eng/Versions.props
index e5bab5c2cc3..5d7a7bf611a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22327.1
- 7.0.0-beta.22327.1
+ 7.0.0-beta.22327.2
+ 7.0.0-beta.22327.2
diff --git a/global.json b/global.json
index eca459069f7..89ebf656570 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.2"
},
"sdk": {
"version": "7.0.100-preview.2.22153.17"
From e5a6e67bdc55df9ec506554cc0ff1facc2e1781a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Jun 2022 14:32:39 +0000
Subject: [PATCH 030/109] Update dependencies from
https://github.com/dotnet/winforms build 20220629.1 (#6740)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22326.1 to 7.0.0-preview.6.22328.6 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ebd608593f5..4d5b3cab202 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 250c0e19a97314f897fdac7cc3c83912ad97f6a0
+ 1b85e6090d5d79e442a650d033400e3c3e432ddc
-
+
https://github.com/dotnet/winforms
- 250c0e19a97314f897fdac7cc3c83912ad97f6a0
+ 1b85e6090d5d79e442a650d033400e3c3e432ddc
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
-
+
https://github.com/dotnet/runtime
- c9f80fdde29c71ac87971383c77a1a5e665fadb9
+ 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
diff --git a/eng/Versions.props b/eng/Versions.props
index 5d7a7bf611a..4fc50f8654f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.7.22327.4
+ 7.0.0-preview.7.22329.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
- 7.0.0-preview.6.22326.1
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22328.6
From 05bede4281a15276de6d179fe2edcac0ad86cb1d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 00:58:28 +0000
Subject: [PATCH 031/109] Update dependencies from
https://github.com/dotnet/winforms build 20220629.2 (#6741)
[main] 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 4d5b3cab202..2653651cc3f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 1b85e6090d5d79e442a650d033400e3c3e432ddc
+ 87aeda130c5c5720d657405e4c749a32d60a413a
-
+
https://github.com/dotnet/winforms
- 1b85e6090d5d79e442a650d033400e3c3e432ddc
+ 87aeda130c5c5720d657405e4c749a32d60a413a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 4fc50f8654f..e5f2ade3ed3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22329.1
+ 7.0.0-preview.7.22329.2
From 860c6b03899b61bdf0bfdad831c769c5807aa0d8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 07:11:16 +0000
Subject: [PATCH 032/109] Update dependencies from
https://github.com/dotnet/winforms build 20220629.3 (#6742)
[main] 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 2653651cc3f..3dacff2fe1d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 87aeda130c5c5720d657405e4c749a32d60a413a
+ 830db4987800a6a8b0f1f5784a837f009d8523a6
-
+
https://github.com/dotnet/winforms
- 87aeda130c5c5720d657405e4c749a32d60a413a
+ 830db4987800a6a8b0f1f5784a837f009d8523a6
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index e5f2ade3ed3..0ba5927d7f6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22329.2
+ 7.0.0-preview.7.22329.3
From 778224f37d9b4300cdc91be9a204307eb8ea483b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 14:25:39 +0000
Subject: [PATCH 033/109] Update dependencies from
https://github.com/dotnet/winforms build 20220630.1 (#6743)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22328.6 to 7.0.0-preview.6.22329.5 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3dacff2fe1d..a0f12eb2744 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 830db4987800a6a8b0f1f5784a837f009d8523a6
+ b98ed477ef2236cda135e406f801a4af6573c5ee
-
+
https://github.com/dotnet/winforms
- 830db4987800a6a8b0f1f5784a837f009d8523a6
+ b98ed477ef2236cda135e406f801a4af6573c5ee
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
-
+
https://github.com/dotnet/runtime
- 4537ce8b0d3a6e60d7d90fc146e6b4c4e4a23371
+ 0402550585f54e88707af55652111ace793ef27f
diff --git a/eng/Versions.props b/eng/Versions.props
index 0ba5927d7f6..2094aa5908b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.7.22329.3
+ 7.0.0-preview.7.22330.1
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
- 7.0.0-preview.6.22328.6
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22329.5
From 2a0ab7ed09888e3f1991965632c128d83a7c772a Mon Sep 17 00:00:00 2001
From: Anjali Sheel
Date: Fri, 1 Jul 2022 15:46:16 +0530
Subject: [PATCH 034/109] Fix for Bug 1493635: MenuItems with IsCheckable and
StaysOpenOnClick set to true do not announce to Narrator when IsChecked is
changed (#6706)
* Fix for Bug 1493635: MenuItems with IsCheckable and StaysOpenOnClick set to true do not announce to Narrator when IsChecked is changed
* Fix for Bug 1493635: MenuItems with IsCheckable and StaysOpenOnClick set to true do not announce to Narrator when IsChecked is changed
* Fix for Bug 1493635: MenuItems with IsCheckable and StaysOpenOnClick set to true do not announce to Narrator when IsChecked is changed
* Fix for Bug 1493635: MenuItems with IsCheckable and StaysOpenOnClick set to true do not announce to Narrator when IsChecked is changed
* Fix for Bug 1493635: MenuItems with IsCheckable and StaysOpenOnClick set to true do not announce to Narrator when IsChecked is changed
---
.../Automation/Peers/MenuItemAutomationPeer.cs | 9 +++++++++
.../System/Windows/Controls/MenuItem.cs | 11 ++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
index 0cf50a7b53d..07edb2ad590 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
@@ -316,6 +316,15 @@ internal void RaiseExpandCollapseAutomationEvent(bool oldValue, bool newValue)
newValue ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed);
}
+ internal void RaiseToggleStatePropertyChangedEvent(bool oldValue, bool newValue)
+ {
+ RaisePropertyChangedEvent(TogglePatternIdentifiers.ToggleStateProperty,
+ oldValue ? ConvertToToggleState(oldValue) : ConvertToToggleState(newValue),
+ newValue ? ConvertToToggleState(oldValue) : ConvertToToggleState(newValue));
+ }
+
+ private static ToggleState ConvertToToggleState(bool value) => value ? ToggleState.On : ToggleState.Off;
+
// Return the base without the AccessKey character
///
override protected string GetNameCore()
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
index 18b01f43097..5891c18c4fc 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
@@ -946,7 +946,10 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha
{
MenuItem menuItem = (MenuItem) d;
- if ((bool) e.NewValue)
+ bool oldValue = (bool)e.OldValue;
+ bool newValue = (bool)e.NewValue;
+
+ if (newValue)
{
menuItem.OnChecked(new RoutedEventArgs(CheckedEvent));
}
@@ -954,6 +957,12 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha
{
menuItem.OnUnchecked(new RoutedEventArgs(UncheckedEvent));
}
+
+ MenuItemAutomationPeer peer = UIElementAutomationPeer.FromElement(menuItem) as MenuItemAutomationPeer;
+ if (peer != null)
+ {
+ peer.RaiseToggleStatePropertyChangedEvent(oldValue, newValue);
+ }
}
///
From 7caa234418ecc65bd89b8274a98527b2ca7183de Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:29:51 +0000
Subject: [PATCH 035/109] Update dependencies from
https://github.com/dotnet/winforms build 20220701.1 (#6745)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22329.5 to 7.0.0-preview.6.22330.8 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a0f12eb2744..6bc8af9dd73 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- b98ed477ef2236cda135e406f801a4af6573c5ee
+ 4fb09b088910d793a611dcb02002c57a5f2cc825
-
+
https://github.com/dotnet/winforms
- b98ed477ef2236cda135e406f801a4af6573c5ee
+ 4fb09b088910d793a611dcb02002c57a5f2cc825
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
-
+
https://github.com/dotnet/runtime
- 0402550585f54e88707af55652111ace793ef27f
+ 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
diff --git a/eng/Versions.props b/eng/Versions.props
index 2094aa5908b..c40e22d7db0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.7.22330.1
+ 7.0.0-preview.7.22351.1
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
- 7.0.0-preview.6.22329.5
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22330.8
From 5798d29cb873eb42d87fc93b9e2904eee25bcc65 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 21:37:15 +0000
Subject: [PATCH 036/109] Update dependencies from
https://github.com/dotnet/winforms build 20220701.3 (#6747)
[main] 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 6bc8af9dd73..3bdb634d8f1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 4fb09b088910d793a611dcb02002c57a5f2cc825
+ ca1199eb6cfaf8ecd26ee429761764ea264dd2f5
-
+
https://github.com/dotnet/winforms
- 4fb09b088910d793a611dcb02002c57a5f2cc825
+ ca1199eb6cfaf8ecd26ee429761764ea264dd2f5
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c40e22d7db0..330704fa5d6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22351.1
+ 7.0.0-preview.7.22351.3
From cff28a8495c4fd8998093ad8ae4d63870c498df5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 23:25:07 +0000
Subject: [PATCH 037/109] Update dependencies from
https://github.com/dotnet/winforms build 20220701.4 (#6748)
[main] 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 3bdb634d8f1..843ebd6521f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- ca1199eb6cfaf8ecd26ee429761764ea264dd2f5
+ 984f88f7e78d2074948a08bb95bab5b6b2f92db0
-
+
https://github.com/dotnet/winforms
- ca1199eb6cfaf8ecd26ee429761764ea264dd2f5
+ 984f88f7e78d2074948a08bb95bab5b6b2f92db0
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 330704fa5d6..5d5733c389b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22351.3
+ 7.0.0-preview.7.22351.4
From 2fd8b6c6e559e90f3bc45c265840c2ba6b85c62b Mon Sep 17 00:00:00 2001
From: Anjali Sheel
Date: Mon, 4 Jul 2022 17:17:30 +0530
Subject: [PATCH 038/109] Added NoInlining attribute (#6750)
---
.../System/Windows/Automation/Peers/MenuItemAutomationPeer.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
index 07edb2ad590..10bce1bcb12 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
@@ -316,6 +316,7 @@ internal void RaiseExpandCollapseAutomationEvent(bool oldValue, bool newValue)
newValue ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed);
}
+ [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
internal void RaiseToggleStatePropertyChangedEvent(bool oldValue, bool newValue)
{
RaisePropertyChangedEvent(TogglePatternIdentifiers.ToggleStateProperty,
From 8713149eea087a4ad4d59133bb2176c1c78cb51e Mon Sep 17 00:00:00 2001
From: lindexi
Date: Mon, 4 Jul 2022 19:48:33 +0800
Subject: [PATCH 039/109] Remove unused local variable `node3Bounds` in
MS.Internal.Ink.StrokeNode.GetPointsAtMiddleSegment (#4256)
---
.../src/PresentationCore/MS/internal/Ink/StrokeNode.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs
index 56224c40b17..1552dc7978b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs
@@ -441,7 +441,6 @@ out bool missingIntersection
{
Rect node1Bounds = _operations.GetNodeBounds(previous._lastNode);
Rect node2Bounds = _operations.GetNodeBounds(_lastNode);
- Rect node3Bounds = _operations.GetNodeBounds(_thisNode);
#if DEBUG_RENDERING_FEEDBACK
if (showFeedback)
{
From 4baece9906bc391c34289744e861c99b6e2f428c Mon Sep 17 00:00:00 2001
From: lindexi
Date: Mon, 4 Jul 2022 19:51:55 +0800
Subject: [PATCH 040/109] Remove the unused local variable in
PointerTabletDevice.cs (#6209)
---
.../Windows/Input/Stylus/Pointer/PointerTabletDevice.cs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
index 9dc2bbeafc7..1a72a293563 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
@@ -121,13 +121,9 @@ private void BuildStylusDevices()
///
/// Updates the various size parameters for drag/drop/tap.
///
- ///
- ///
internal void UpdateSizeDeltas()
{
// Query default settings for mouse drag and double tap (with minimum of 1x1 size).
- Size mouseDragDefault = new Size(Math.Max(1, MS.Win32.SafeSystemMetrics.DragDeltaX / 2),
- Math.Max(1, MS.Win32.SafeSystemMetrics.DragDeltaY / 2));
Size mouseDoubleTapDefault = new Size(Math.Max(1, MS.Win32.SafeSystemMetrics.DoubleClickDeltaX / 2),
Math.Max(1, MS.Win32.SafeSystemMetrics.DoubleClickDeltaY / 2));
From b296f3bf8e66e27044d5f4cd22a3b498f2cdb305 Mon Sep 17 00:00:00 2001
From: paulozemek <102049106+paulozemek@users.noreply.github.com>
Date: Mon, 4 Jul 2022 04:52:08 -0700
Subject: [PATCH 041/109] Avoid excessive calls to the PropertyValues index
getter. (#6293)
Co-authored-by: Paulo Zemek
---
.../System/Windows/FrameworkElementFactory.cs | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElementFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElementFactory.cs
index 098464626e2..fe9618a378e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElementFactory.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElementFactory.cs
@@ -547,11 +547,12 @@ internal object GetValue(DependencyProperty dp)
// Scan for record
for (int i = 0; i < PropertyValues.Count; i++)
{
- if (PropertyValues[i].ValueType == PropertyValueType.Set &&
- PropertyValues[i].Property == dp)
+ var propertyValue = PropertyValues[i];
+ if (propertyValue.ValueType == PropertyValueType.Set &&
+ propertyValue.Property == dp)
{
// Found a Set record, return the value
- return PropertyValues[i].ValueInternal;
+ return propertyValue.ValueInternal;
}
}
@@ -840,10 +841,11 @@ internal DependencyObject InstantiateTree(
for (int i = 0; i < PropertyValues.Count; i++)
{
- if (PropertyValues[i].ValueType == PropertyValueType.Set)
+ var propertyValue = PropertyValues[i];
+ if (propertyValue.ValueType == PropertyValueType.Set)
{
// Get the value out of the table.
- object o = PropertyValues[i].ValueInternal;
+ object o = propertyValue.ValueInternal;
// If it's a freezable that can't be frozen, it's probably not sharable,
@@ -860,22 +862,19 @@ internal DependencyObject InstantiateTree(
if (me != null)
{
ProvideValueServiceProvider serviceProvider = new ProvideValueServiceProvider();
- serviceProvider.SetData( treeNodeVisual3D, PropertyValues[i].Property );
+ serviceProvider.SetData( treeNodeVisual3D, propertyValue.Property );
o = me.ProvideValue( serviceProvider );
}
// Finally, set the value onto the object.
- treeNodeVisual3D.SetValue(PropertyValues[i].Property, o);
+ treeNodeVisual3D.SetValue(propertyValue.Property, o);
}
-
else
{
// We don't support resource references, triggers, etc within the 3D content
- throw new NotSupportedException(SR.Get(SRID.Template3DValueOnly, PropertyValues[i].Property) );
-
+ throw new NotSupportedException(SR.Get(SRID.Template3DValueOnly, propertyValue.Property) );
}
-
}
}
@@ -1276,10 +1275,11 @@ private bool IsValueDefined(DependencyProperty dp)
{
for (int i = 0; i < PropertyValues.Count; i++)
{
- if (PropertyValues[i].Property == dp &&
- (PropertyValues[i].ValueType == PropertyValueType.Set ||
- PropertyValues[i].ValueType == PropertyValueType.Resource ||
- PropertyValues[i].ValueType == PropertyValueType.TemplateBinding))
+ var propertyValue = PropertyValues[i];
+ if (propertyValue.Property == dp &&
+ (propertyValue.ValueType == PropertyValueType.Set ||
+ propertyValue.ValueType == PropertyValueType.Resource ||
+ propertyValue.ValueType == PropertyValueType.TemplateBinding))
{
return true;
}
From c308dfcad75d7b491ea88d39118fb8aee70d6b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ku=C4=8Dera?=
<10546952+miloush@users.noreply.github.com>
Date: Mon, 4 Jul 2022 12:52:27 +0100
Subject: [PATCH 042/109] Ignore NotImplementedException from ITaskbarList
(#6547)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Jan Kučera
---
.../MS/Internal/AppModel/ShellProvider.cs | 3 ++-
.../System/Windows/Window.cs | 15 +++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs
index 77be9f5aa05..fc75ec3c999 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs
@@ -697,7 +697,8 @@ internal interface ITaskbarList
///
/// This function must be called first to validate use of other members.
///
- void HrInit();
+ [PreserveSig]
+ HRESULT HrInit();
///
/// This function adds a tab for hwnd to the taskbar.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
index 26177c8a9a2..1ce83b3b582 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
@@ -637,7 +637,7 @@ private void HandleTaskbarListError(HRESULT hr)
// Explorer being non-responsive should be a transient issue. Post back to apply the full TaskbarItemInfo.
_taskbarRetryTimer.Start();
}
- else if (hr == (HRESULT)Win32Error.ERROR_INVALID_WINDOW_HANDLE)
+ else if (hr == (HRESULT)Win32Error.ERROR_INVALID_WINDOW_HANDLE || hr == HRESULT.E_NOTIMPL)
{
// We'll get this when Explorer's not running. This means there's no Shell to integrate with.
if (TraceShell.IsEnabled)
@@ -6292,6 +6292,7 @@ private void ApplyTaskbarItemInfo()
return;
}
+ HRESULT hr = HRESULT.S_OK;
if (_taskbarList == null)
{
// If we don't have a handle and there isn't a TaskbarItemInfo, then we don't have anything to apply or remove.
@@ -6304,12 +6305,19 @@ private void ApplyTaskbarItemInfo()
try
{
taskbarList = (ITaskbarList)Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid(CLSID.TaskbarList)));
- taskbarList.HrInit();
+
+ hr = taskbarList.HrInit();
+ if (hr != HRESULT.S_OK)
+ {
+ // Taskbar not available (no user logged in, running under terminal service, custom shell, etc.)
+ HandleTaskbarListError(hr);
+ return;
+ }
// This QI will only work on Win7.
_taskbarList = (ITaskbarList3)taskbarList;
taskbarList = null;
-}
+ }
finally
{
Utilities.SafeRelease(ref taskbarList);
@@ -6334,7 +6342,6 @@ private void ApplyTaskbarItemInfo()
}
// Apply (or clear) all aspects of the TaskbarItemInfo to this Window.
- HRESULT hr = HRESULT.S_OK;
hr = RegisterTaskbarThumbButtons();
if (hr.Succeeded)
From 2564e40f77db66c4178b338dde16c64be98a601e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ku=C4=8Dera?=
<10546952+miloush@users.noreply.github.com>
Date: Mon, 4 Jul 2022 12:52:41 +0100
Subject: [PATCH 043/109] TextBox_ContextMenu_Cut (#6614)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Jan Kučera
---
.../src/PresentationFramework/Resources/xlf/Strings.cs.xlf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
index 3eb07936096..078c07e8ec6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
@@ -5595,7 +5595,7 @@ Chcete ho nahradit?
@@ -14,9 +12,7 @@
-
- $(GenerateResourcesSRNamespace).$(GenerateResourcesResourcesClassName)
-
+
Common\System\SR.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj
index b7e7fd0b359..95c5a0f9700 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj
@@ -6,8 +6,6 @@
$(NoWarn);0618
$(DefineConstants);AUTOMATION
false
- MS.Internal.Automation
- SRID
AnyCPU;x64;arm64
From ae9becb522162f85ea139d8df07210ab3e692bf7 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov
Date: Mon, 4 Jul 2022 17:54:05 +0600
Subject: [PATCH 045/109] Fix QueryInsertEmbedded parameter type (#6622)
* Fix QueryInsertEmbedded parameter type
* Fix compilation error
---
.../PresentationFramework/System/Windows/Documents/TextStore.cs | 2 +-
.../src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextStore.cs
index eca91af6199..ac7c8d4ab04 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextStore.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextStore.cs
@@ -586,7 +586,7 @@ public void GetEmbedded(int index, ref Guid guidService, ref Guid riid, out obje
}
// See msdn's ITextStoreACP documentation for a full description.
- public void QueryInsertEmbedded(ref Guid guidService, int formatEtc, out bool insertable)
+ public void QueryInsertEmbedded(ref Guid guidService, IntPtr formatEtc, out bool insertable)
{
#if true
//
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
index 4de87412c39..aa4fd7786ef 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
@@ -1630,7 +1630,7 @@ void SetText(SetTextFlags flags, int start, int end,
//HRESULT QueryInsertEmbedded([in] const GUID *pguidService,
// [in] const FORMATETC *pFormatEtc,
// [out] BOOL *pfInsertable);
- void QueryInsertEmbedded(ref Guid guidService, int /*ref Win32.FORMATETC*/ formatEtc, [MarshalAs(UnmanagedType.Bool)] out bool insertable);
+ void QueryInsertEmbedded(ref Guid guidService, IntPtr /*ref Win32.FORMATETC*/ formatEtc, [MarshalAs(UnmanagedType.Bool)] out bool insertable);
///
//HRESULT InsertEmbedded([in] DWORD dwFlags,
From fbccdb2287a08136e40462914f8ec84aa4b53517 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov
Date: Mon, 4 Jul 2022 17:54:15 +0600
Subject: [PATCH 046/109] Remove sorcery for getting consistent names in the
traces (#6656)
That helps for trimming
---
.../src/PresentationCore/MS/internal/MediaTrace.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs
index 8a85e3ad181..44325b9a8b3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs
@@ -15,7 +15,8 @@ namespace MS.Internal
internal class MediaTrace : IDisposable
{
- public static MediaTrace NodeFlag = new MediaTrace("Node Flags"); public static MediaTrace NodeOp = new MediaTrace("Node Operations");
+ public static MediaTrace NodeFlag = new MediaTrace("Node Flags");
+ public static MediaTrace NodeOp = new MediaTrace("Node Operations");
public static MediaTrace NodeCreation = new MediaTrace("Node creation");
public static MediaTrace DrawingContextOp = new MediaTrace("Drawing Context Op");
public static MediaTrace ContainerOp = new MediaTrace("Drawing Visual Operations Operations");
@@ -72,7 +73,7 @@ static MediaTrace()
public MediaTrace(string switchName)
{
- _switch = new BooleanSwitch(switchName, "[" + SafeSecurityHelper.GetAssemblyPartialName(Assembly.GetCallingAssembly()) + "]");
+ _switch = new BooleanSwitch(switchName, "[PresentationCore]");
}
public MediaTrace(string switchName, bool initialState) : this(switchName)
From 4256bf2a2747a3702d0227be53dfc36c379c4a5d Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov
Date: Mon, 4 Jul 2022 17:54:28 +0600
Subject: [PATCH 047/109] Fix ZeroForNow parameter (#6657)
`int` is not the same as `const TF_HALTCOND *` on x64 arch
---
.../Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
index aa4fd7786ef..389a273ea5b 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsTextServices.cs
@@ -1972,14 +1972,14 @@ void SetText(int ec, /*SetTextFlags*/ int flags,
// [out] LONG *pcch,
// [in, unique] const TF_HALTCOND *pHalt);
///
- void ShiftStart(int ec, int count, out int result, int ZeroForNow); // "ZeroForNow" should be a struct ptr if we ever use this
+ void ShiftStart(int ec, int count, out int result, IntPtr pHalt);
//HRESULT ShiftEnd([in] TfEditCookie ec,
// [in] LONG cchReq,
// [out] LONG *pcch,
// [in, unique] const TF_HALTCOND *pHalt);
///
- void ShiftEnd(int ec, int count, out int result, int ZeroForNow); // "ZeroForNow" should be a struct ptr if we ever use this
+ void ShiftEnd(int ec, int count, out int result, IntPtr pHalt);
//HRESULT ShiftStartToRange([in] TfEditCookie ec,
// [in] ITfRange *pRange,
@@ -2117,14 +2117,14 @@ void SetText(int ec, /*SetTextFlags*/ int flags,
// [out] LONG *pcch,
// [in, unique] const TF_HALTCOND *pHalt);
///
- void ShiftStart(int ec, int count, out int result, int ZeroForNow); // "ZeroForNow" should be a struct ptr if we ever use this
+ void ShiftStart(int ec, int count, out int result, IntPtr pHalt);
//HRESULT ShiftEnd([in] TfEditCookie ec,
// [in] LONG cchReq,
// [out] LONG *pcch,
// [in, unique] const TF_HALTCOND *pHalt);
///
- void ShiftEnd(int ec, int count, out int result, int ZeroForNow); // "ZeroForNow" should be a struct ptr if we ever use this
+ void ShiftEnd(int ec, int count, out int result, IntPtr pHalt);
//HRESULT ShiftStartToRange([in] TfEditCookie ec,
// [in] ITfRange *pRange,
From 0bb367cb2139c5e265992ddef3ca35432a227e49 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Mon, 4 Jul 2022 08:22:23 -0400
Subject: [PATCH 048/109] Replace resource constants with properties in
UIAutomationClient (#6620)
Contributes to dotnet/wpf#1
Co-authored-by: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com>
---
eng/WpfArcadeSdk/tools/SystemResources.props | 2 +
.../Automation/HwndProxyElementProvider.cs | 50 +++++++++----------
.../MS/Internal/Automation/Misc.cs | 10 ++--
.../MS/Internal/Automation/ProxyManager.cs | 8 +--
.../MS/Internal/Automation/UiaCoreApi.cs | 2 +-
.../src/UIAutomation/UIAutomationClient/SR.cs | 21 --------
.../System/Windows/Automation/AndCondition.cs | 2 +-
.../System/Windows/Automation/Automation.cs | 16 +++---
.../Windows/Automation/AutomationElement.cs | 30 +++++------
.../System/Windows/Automation/CacheRequest.cs | 8 +--
.../Automation/ItemContainerPattern.cs | 4 +-
.../System/Windows/Automation/OrCondition.cs | 2 +-
.../Windows/Automation/PropertyCondition.cs | 6 +--
.../Windows/Automation/RangeValuePattern.cs | 2 +-
.../Windows/Automation/Text/TextRange.cs | 8 +--
.../System/Windows/Automation/TextPattern.cs | 4 +-
.../System/Windows/Automation/ValuePattern.cs | 2 +-
.../UIAutomationClient.csproj | 1 -
18 files changed, 79 insertions(+), 99 deletions(-)
delete mode 100644 src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/SR.cs
diff --git a/eng/WpfArcadeSdk/tools/SystemResources.props b/eng/WpfArcadeSdk/tools/SystemResources.props
index ca2691d8ebf..262b83a0f4c 100644
--- a/eng/WpfArcadeSdk/tools/SystemResources.props
+++ b/eng/WpfArcadeSdk/tools/SystemResources.props
@@ -12,6 +12,7 @@
<_GenerateResourcesCodeAsConstants>true
+ <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='UIAutomationClient'">false
<_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='UIAutomationProvider'">false
<_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='System.Xaml'">false
<_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='WindowsBase'">false
@@ -30,6 +31,7 @@
$(_GenerateResourcesCodeAsConstants)
MS.Utility.SRID
+ System.SR
MS.Internal.Automation.SR
System.SR
MS.Internal.WindowsBase.SR
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 cf13ed68e2e..5761b99f882 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
@@ -307,7 +307,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
{
// you can't really do anything to a disabled window
if ( IsBitSet(GetWindowStyle(), SafeNativeMethods.WS_DISABLED) )
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
// If already in the normal state, do not need to do anything.
if (((IWindowProvider)this).VisualState == WindowVisualState.Normal)
@@ -323,7 +323,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
// get the WINDOWPLACEMENT information
if (!Misc.GetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
wp.showCmd = UnsafeNativeMethods.SW_RESTORE;
@@ -332,7 +332,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
// sending SC_RESTORE puts it back to maximized instead of normal.
if (!Misc.SetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
return;
@@ -341,7 +341,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
case WindowVisualState.Minimized:
{
if (!((IWindowProvider)this).Minimizable)
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
// If already minimzed, do not need to do anything.
if (((IWindowProvider)this).VisualState == WindowVisualState.Minimized)
@@ -353,7 +353,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
if (!Misc.PostMessage(_hwnd, UnsafeNativeMethods.WM_SYSCOMMAND, (IntPtr)UnsafeNativeMethods.SC_MINIMIZE, IntPtr.Zero))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
return;
@@ -362,7 +362,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
case WindowVisualState.Maximized:
{
if ( ! ((IWindowProvider)this).Maximizable )
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
// If already maximized, do not need to do anything.
if (((IWindowProvider)this).VisualState == WindowVisualState.Maximized)
@@ -374,7 +374,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
if (!Misc.PostMessage(_hwnd, UnsafeNativeMethods.WM_SYSCOMMAND, (IntPtr)UnsafeNativeMethods.SC_MAXIMIZE, IntPtr.Zero))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
return;
@@ -383,7 +383,7 @@ void IWindowProvider.SetVisualState( WindowVisualState state )
default:
{
Debug.Assert(false,"unexpected switch() case:");
- throw new ArgumentException(SR.Get(SRID.UnexpectedWindowState),"state");
+ throw new ArgumentException(SR.UnexpectedWindowState,"state");
}
}
@@ -396,7 +396,7 @@ void IWindowProvider.Close()
if (!Misc.PostMessage(_hwnd, UnsafeNativeMethods.WM_SYSCOMMAND, (IntPtr)UnsafeNativeMethods.SC_CLOSE, IntPtr.Zero))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
}
@@ -640,7 +640,7 @@ bool IWindowProvider.IsTopmost
void ITransformProvider.Move( double x, double y )
{
if ( ! ((ITransformProvider)this).CanMove )
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
int extendedStyle = GetWindowExStyle();
if ( IsBitSet(extendedStyle, SafeNativeMethods.WS_EX_MDICHILD) )
@@ -651,7 +651,7 @@ void ITransformProvider.Move( double x, double y )
NativeMethods.HWND hwndParent = SafeNativeMethods.GetAncestor(NativeMethods.HWND.Cast(_hwnd), SafeNativeMethods.GA_PARENT);
if (!MapWindowPoints(NativeMethods.HWND.NULL, hwndParent, ref point, 1))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
x = point.x;
y = point.y;
@@ -660,7 +660,7 @@ void ITransformProvider.Move( double x, double y )
NativeMethods.RECT currentRect = new NativeMethods.RECT();
if (!Misc.GetWindowRect(_hwnd, out currentRect))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
int currentHeight = currentRect.bottom - currentRect.top;
int currentWidth = currentRect.right - currentRect.left;
@@ -684,7 +684,7 @@ void ITransformProvider.Move( double x, double y )
NativeMethods.RECT parentRect = new NativeMethods.RECT();
if (!Misc.GetClientRect(hwndParent, out parentRect))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
// If to far to the right move left edge to be visible.
// Move the left edge back the diffance of it and the parent's client area right side plus a little more to be visible.
@@ -706,7 +706,7 @@ void ITransformProvider.Move( double x, double y )
// putting the window in the wrong place
if (!Misc.SetWindowPos(_hwnd, NativeMethods.HWND.NULL, (int)x, (int)y, 0, 0, UnsafeNativeMethods.SWP_NOSIZE | UnsafeNativeMethods.SWP_NOZORDER | UnsafeNativeMethods.SWP_NOACTIVATE))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
UnsafeNativeMethods.WINDOWPLACEMENT wp = new UnsafeNativeMethods.WINDOWPLACEMENT();
@@ -716,13 +716,13 @@ void ITransformProvider.Move( double x, double y )
// terms of the workarea.
if (!Misc.GetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
int style = GetWindowStyle();
if (style == 0)
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
if ( IsBitSet(style, SafeNativeMethods.WS_MINIMIZE) )
{
@@ -736,7 +736,7 @@ void ITransformProvider.Move( double x, double y )
// it will place the window on the primary monitor at a location closest to the taget.
if (!Misc.SetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
}
else
@@ -745,7 +745,7 @@ void ITransformProvider.Move( double x, double y )
if (!Misc.GetWindowRect(_hwnd, out currentRect))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
// Use SetWindowPlacement to move the window because it handles the case where the
@@ -753,7 +753,7 @@ void ITransformProvider.Move( double x, double y )
// it will place the window on the primary monitor at a location closest to the taget.
if (!Misc.SetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
// check to make sure SetWindowPlacement has not changed the size of our window
@@ -762,7 +762,7 @@ void ITransformProvider.Move( double x, double y )
if (!Misc.GetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
int newHeight = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
@@ -775,7 +775,7 @@ void ITransformProvider.Move( double x, double y )
if (!Misc.SetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
}
}
@@ -790,7 +790,7 @@ void ITransformProvider.Resize( double width, double height )
int heightInt = (int) height;
if ( ! ((ITransformProvider)this).CanResize )
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
UnsafeNativeMethods.MINMAXINFO minMaxInfo = default;
@@ -827,7 +827,7 @@ void ITransformProvider.Resize( double width, double height )
// get the WINDOWPLACEMENT information
if (!Misc.GetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
// Calculate the new right and bottom for how the user wants the window resized and update the struct
@@ -839,7 +839,7 @@ void ITransformProvider.Resize( double width, double height )
// it will place the window on the primary monitor at a location closes to the taget.
if (!Misc.SetWindowPlacement(_hwnd, ref wp))
{
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
}
@@ -848,7 +848,7 @@ void ITransformProvider.Rotate( double degrees )
if (!SafeNativeMethods.IsWindow(_hwnd))
throw new ElementNotAvailableException();
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
bool ITransformProvider.CanMove
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/Misc.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/Misc.cs
index f15e0bad80b..8ca36354209 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/Misc.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/Misc.cs
@@ -149,7 +149,7 @@ internal static object WrapInterfaceOnClientSide(AutomationElement el, SafePatte
if (!Schema.GetPatternInfo(pattern, out pi))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedPattern));
+ throw new ArgumentException(SR.UnsupportedPattern);
}
if (pi.ClientSideWrapper == null)
@@ -180,7 +180,7 @@ internal static void ValidateArgumentNonNull(object obj, string argName)
// Throw an argument Exception with a generic error
internal static void ThrowInvalidArgument(string argName)
{
- throw new ArgumentException(SR.Get(SRID.GenericInvalidArgument, argName));
+ throw new ArgumentException(SR.Format(SR.GenericInvalidArgument, argName));
}
// Check that specified condition is true; if not, throw exception
@@ -188,7 +188,7 @@ internal static void ValidateArgument(bool cond, string reason)
{
if (!cond)
{
- throw new ArgumentException(SR.Get(reason));
+ throw new ArgumentException(SR.GetResourceString(reason, null));
}
}
@@ -206,7 +206,7 @@ internal static void ValidateCached(bool cached)
{
if (!cached)
{
- throw new InvalidOperationException(SR.Get(SRID.CacheRequestNeedCache));
+ throw new InvalidOperationException(SR.CacheRequestNeedCache);
}
}
@@ -215,7 +215,7 @@ internal static void ValidateCurrent(SafePatternHandle hPattern)
{
if (hPattern.IsInvalid)
{
- throw new InvalidOperationException(SR.Get(SRID.CacheRequestNeedLiveForProperties));
+ throw new InvalidOperationException(SR.CacheRequestNeedLiveForProperties);
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/ProxyManager.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/ProxyManager.cs
index f9c018e8795..342383fca1b 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/ProxyManager.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/ProxyManager.cs
@@ -61,20 +61,20 @@ internal static void RegisterProxyAssembly ( AssemblyName assemblyName )
}
catch(System.IO.FileNotFoundException)
{
- throw new ProxyAssemblyNotLoadedException(SR.Get(SRID.Assembly0NotFound,assemblyName));
+ throw new ProxyAssemblyNotLoadedException(SR.Format(SR.Assembly0NotFound,assemblyName));
}
string typeName = assemblyName.Name + ".UIAutomationClientSideProviders";
Type t = a.GetType( typeName );
if( t == null )
{
- throw new ProxyAssemblyNotLoadedException(SR.Get(SRID.CouldNotFindType0InAssembly1, typeName, assemblyName));
+ throw new ProxyAssemblyNotLoadedException(SR.Format(SR.CouldNotFindType0InAssembly1, typeName, assemblyName));
}
FieldInfo fi = t.GetField("ClientSideProviderDescriptionTable", BindingFlags.Static | BindingFlags.Public);
if (fi == null || fi.FieldType != typeof(ClientSideProviderDescription[]))
{
- throw new ProxyAssemblyNotLoadedException(SR.Get(SRID.CouldNotFindRegisterMethodOnType0InAssembly1, typeName, assemblyName));
+ throw new ProxyAssemblyNotLoadedException(SR.Format(SR.CouldNotFindRegisterMethodOnType0InAssembly1, typeName, assemblyName));
}
ClientSideProviderDescription[] table = fi.GetValue(null) as ClientSideProviderDescription[];
@@ -734,7 +734,7 @@ private static void AddToProxyDescriptionTable(ClientSideProviderDescription[] p
{
if( pi.ImageName != null || pi.Flags != 0 )
{
- throw new ArgumentException(SR.Get(SRID.NonclientClassnameCannotBeUsedWithFlagsOrImagename));
+ throw new ArgumentException(SR.NonclientClassnameCannotBeUsedWithFlagsOrImagename);
}
_pseudoProxies[j] = pi.ClientSideProviderFactoryCallback;
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/UiaCoreApi.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/UiaCoreApi.cs
index a34e0540fd6..9bd1528bc0b 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/UiaCoreApi.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/UiaCoreApi.cs
@@ -1185,7 +1185,7 @@ private static void CheckError(int hr)
{
string description;
if (!UiaGetErrorDescription(out description))
- description = SR.Get(SRID.UnknownCoreAPIError);
+ description = SR.UnknownCoreAPIError;
switch (hr)
{
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/SR.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/SR.cs
deleted file mode 100644
index 8b17d2a2423..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/SR.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Resources;
-
-namespace System
-{
- internal static partial class SR
- {
- public static string Get(string name)
- {
- return GetResourceString(name, null);
- }
-
- public static string Get(string name, params object[] args)
- {
- return Format(GetResourceString(name, null), args);
- }
- }
-}
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AndCondition.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AndCondition.cs
index fa5afd42fd9..be0166d52b4 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AndCondition.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AndCondition.cs
@@ -37,7 +37,7 @@ public class AndCondition : Condition
public AndCondition( params Condition [ ] conditions )
{
Misc.ValidateArgumentNonNull( conditions, "conditions" );
- Misc.ValidateArgument( conditions.Length >= 2, SRID.MustBeAtLeastTwoConditions );
+ Misc.ValidateArgument( conditions.Length >= 2, nameof(SR.MustBeAtLeastTwoConditions) );
foreach( Condition condition in conditions )
{
Misc.ValidateArgumentNonNull( condition, "conditions" );
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs
index 8bd06637cf8..c9c598c2639 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs
@@ -137,9 +137,9 @@ AutomationEventHandler eventHandler
{
Misc.ValidateArgumentNonNull(element, "element" );
Misc.ValidateArgumentNonNull(eventHandler, "eventHandler" );
- Misc.ValidateArgument( eventId != AutomationElement.AutomationFocusChangedEvent, SRID.EventIdMustNotBeAutomationFocusChanged );
- Misc.ValidateArgument( eventId != AutomationElement.StructureChangedEvent,SRID.EventIdMustNotBeStructureChanged );
- Misc.ValidateArgument( eventId != AutomationElement.AutomationPropertyChangedEvent, SRID.EventIdMustNotBeAutomationPropertyChanged );
+ Misc.ValidateArgument( eventId != AutomationElement.AutomationFocusChangedEvent, nameof(SR.EventIdMustNotBeAutomationFocusChanged) );
+ Misc.ValidateArgument( eventId != AutomationElement.StructureChangedEvent, nameof(SR.EventIdMustNotBeStructureChanged) );
+ Misc.ValidateArgument( eventId != AutomationElement.AutomationPropertyChangedEvent, nameof(SR.EventIdMustNotBeAutomationPropertyChanged) );
if (eventId == WindowPattern.WindowClosedEvent)
{
@@ -184,7 +184,7 @@ AutomationEventHandler eventHandler
if ( !paramsValidated )
{
- throw new ArgumentException( SR.Get( SRID.ParamsNotApplicableToWindowClosedEvent ) );
+ throw new ArgumentException( SR.ParamsNotApplicableToWindowClosedEvent );
}
}
@@ -208,9 +208,9 @@ AutomationEventHandler eventHandler
{
Misc.ValidateArgumentNonNull(element, "element" );
Misc.ValidateArgumentNonNull(eventHandler, "eventHandler" );
- Misc.ValidateArgument( eventId != AutomationElement.AutomationFocusChangedEvent, SRID.EventIdMustNotBeAutomationFocusChanged );
- Misc.ValidateArgument( eventId != AutomationElement.StructureChangedEvent, SRID.EventIdMustNotBeStructureChanged );
- Misc.ValidateArgument( eventId != AutomationElement.AutomationPropertyChangedEvent, SRID.EventIdMustNotBeAutomationPropertyChanged );
+ Misc.ValidateArgument( eventId != AutomationElement.AutomationFocusChangedEvent, nameof(SR.EventIdMustNotBeAutomationFocusChanged) );
+ Misc.ValidateArgument( eventId != AutomationElement.StructureChangedEvent, nameof(SR.EventIdMustNotBeStructureChanged) );
+ Misc.ValidateArgument( eventId != AutomationElement.AutomationPropertyChangedEvent, nameof(SR.EventIdMustNotBeAutomationPropertyChanged) );
// Remove the client-side listener for for this event
ClientEventManager.RemoveListener( eventId, element, eventHandler );
@@ -235,7 +235,7 @@ public static void AddAutomationPropertyChangedEventHandler(
Misc.ValidateArgumentNonNull(properties, "properties" );
if (properties.Length == 0)
{
- throw new ArgumentException( SR.Get(SRID.AtLeastOnePropertyMustBeSpecified) );
+ throw new ArgumentException( SR.AtLeastOnePropertyMustBeSpecified );
}
// Check that no properties are interpreted properties
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs
index 1c146f64ee2..c9a9d4d5dba 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs
@@ -333,7 +333,7 @@ public override int GetHashCode()
{
// Hash codes need to be unique if the runtime ids are null we will end up
// handing out duplicates so throw an exception.
- throw new InvalidOperationException(SR.Get(SRID.OperationCannotBePerformed));
+ throw new InvalidOperationException(SR.OperationCannotBePerformed);
}
for (int i = 0; i < id.Length; i++)
@@ -431,7 +431,7 @@ public static AutomationElement FromPoint(Point pt)
/// element representing root node of specified window
public static AutomationElement FromHandle(IntPtr hwnd)
{
- Misc.ValidateArgument(hwnd != IntPtr.Zero, SRID.HwndMustBeNonNULL);
+ Misc.ValidateArgument(hwnd != IntPtr.Zero, nameof(SR.HwndMustBeNonNULL));
SafeNodeHandle hnode = UiaCoreApi.UiaNodeFromHandle(hwnd);
if (hnode.IsInvalid)
@@ -508,7 +508,7 @@ public object GetCurrentPropertyValue(AutomationProperty property, bool ignoreDe
AutomationPropertyInfo pi;
if (!Schema.GetPropertyInfo(property, out pi))
{
- return new ArgumentException(SR.Get(SRID.UnsupportedProperty));
+ return new ArgumentException(SR.UnsupportedProperty);
}
object value;
@@ -560,7 +560,7 @@ public object GetCurrentPattern(AutomationPattern pattern)
object retObject;
if (!TryGetCurrentPattern(pattern, out retObject))
{
- throw new InvalidOperationException(SR.Get(SRID.UnsupportedPattern));
+ throw new InvalidOperationException(SR.UnsupportedPattern);
}
return retObject;
@@ -683,7 +683,7 @@ public object GetCachedPattern(AutomationPattern pattern)
object patternObject;
if (!TryGetCachedPattern(pattern, out patternObject))
{
- throw new InvalidOperationException(SR.Get(SRID.UnsupportedPattern));
+ throw new InvalidOperationException(SR.UnsupportedPattern);
}
return patternObject;
}
@@ -717,7 +717,7 @@ public bool TryGetCachedPattern(AutomationPattern pattern, out object patternObj
AutomationPatternInfo pi;
if (!Schema.GetPatternInfo(pattern, out pi))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedPattern));
+ throw new ArgumentException(SR.UnsupportedPattern);
}
patternObject = pi.ClientSideWrapper(this, hPattern, true);
@@ -866,7 +866,7 @@ public void SetFocus()
}
else
{
- throw new InvalidOperationException(SR.Get(SRID.SetFocusFailed));
+ throw new InvalidOperationException(SR.SetFocusFailed);
}
}
@@ -928,7 +928,7 @@ public Point GetClickablePoint()
{
Point pt;
if ( !TryGetClickablePoint( out pt ) )
- throw new NoClickablePointException(SR.Get(SRID.LogicalElementNoClickablePoint));
+ throw new NoClickablePointException(SR.LogicalElementNoClickablePoint);
return pt;
}
@@ -1046,7 +1046,7 @@ public AutomationElement CachedParent
// PRESHARP will flag this as a warning 56503/6503: Property get methods should not throw exceptions
// We've spec'd as throwing an Exception, and that's what we do PreSharp shouldn't complain
#pragma warning suppress 6503
- throw new InvalidOperationException(SR.Get(SRID.CachedPropertyNotRequested));
+ throw new InvalidOperationException(SR.CachedPropertyNotRequested);
}
return _cachedParent;
@@ -1078,7 +1078,7 @@ public AutomationElementCollection CachedChildren
// PRESHARP will flag this as a warning 56503/6503: Property get methods should not throw exceptions
// We've spec'd as throwing an Exception, and that's what we do PreSharp shouldn't complain
#pragma warning suppress 6503
- throw new InvalidOperationException(SR.Get(SRID.CachedPropertyNotRequested));
+ throw new InvalidOperationException(SR.CachedPropertyNotRequested);
}
// Build up an array to return - first count the children,
@@ -1120,7 +1120,7 @@ internal void CheckElement()
{
if (_hnode == null || _hnode.IsInvalid)
{
- throw new InvalidOperationException(SR.Get(SRID.CacheRequestNeedElementReference));
+ throw new InvalidOperationException(SR.CacheRequestNeedElementReference);
}
}
@@ -1222,7 +1222,7 @@ object LookupCachedValue(AutomationIdentifier id, bool throwIfNotRequested, bool
{
if (throwIfNotRequested)
{
- throw new InvalidOperationException(SR.Get(SRID.CachedPropertyNotRequested));
+ throw new InvalidOperationException(SR.CachedPropertyNotRequested);
}
else
{
@@ -1253,7 +1253,7 @@ object LookupCachedValue(AutomationIdentifier id, bool throwIfNotRequested, bool
{
if (throwIfNotRequested)
{
- throw new InvalidOperationException(SR.Get(SRID.CachedPropertyNotRequested));
+ throw new InvalidOperationException(SR.CachedPropertyNotRequested);
}
else
{
@@ -1302,11 +1302,11 @@ private UiaCoreApi.UiaCacheResponse[] Find(TreeScope scope, Condition condition,
Misc.ValidateArgumentNonNull(condition, "condition");
if (scope == 0)
{
- throw new ArgumentException(SR.Get(SRID.TreeScopeNeedAtLeastOne));
+ throw new ArgumentException(SR.TreeScopeNeedAtLeastOne);
}
if ((scope & ~(TreeScope.Element | TreeScope.Children | TreeScope.Descendants)) != 0)
{
- throw new ArgumentException(SR.Get(SRID.TreeScopeElementChildrenDescendantsOnly));
+ throw new ArgumentException(SR.TreeScopeElementChildrenDescendantsOnly);
}
// Set up a find struct...
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/CacheRequest.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/CacheRequest.cs
index 801ce403291..a3b08d49d1a 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/CacheRequest.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/CacheRequest.cs
@@ -198,7 +198,7 @@ public void Pop()
// (no lock needed here, since this is per-thread state)
if (_threadStack == null || _threadStack.Count == 0 || _threadStack.Peek() != this)
{
- throw new InvalidOperationException(SR.Get(SRID.CacheReqestCanOnlyPopTop));
+ throw new InvalidOperationException(SR.CacheReqestCanOnlyPopTop);
}
_threadStack.Pop();
@@ -303,12 +303,12 @@ public TreeScope TreeScope
{
if (value == 0)
{
- throw new ArgumentException(SR.Get(SRID.TreeScopeNeedAtLeastOne));
+ throw new ArgumentException(SR.TreeScopeNeedAtLeastOne);
}
if ((value & ~(TreeScope.Element | TreeScope.Children | TreeScope.Descendants)) != 0)
{
- throw new ArgumentException(SR.Get(SRID.TreeScopeElementChildrenDescendantsOnly));
+ throw new ArgumentException(SR.TreeScopeElementChildrenDescendantsOnly);
}
lock (_instanceLock)
@@ -472,7 +472,7 @@ void CheckAccess()
// is never explicitly added to the stack)
if (_refCount != 0 || this == DefaultCacheRequest)
{
- throw new InvalidOperationException(SR.Get(SRID.CacheReqestCantModifyWhileActive));
+ throw new InvalidOperationException(SR.CacheReqestCantModifyWhileActive);
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ItemContainerPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ItemContainerPattern.cs
index f60b69add3e..dddd626c4be 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ItemContainerPattern.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ItemContainerPattern.cs
@@ -130,7 +130,7 @@ private object PropertyValueValidateAndMap(AutomationProperty property, object v
AutomationPropertyInfo info;
if (!Schema.GetPropertyInfo(property, out info))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedProperty));
+ throw new ArgumentException(SR.UnsupportedProperty);
}
// Check type is appropriate: NotSupported is allowed against any property,
@@ -141,7 +141,7 @@ private object PropertyValueValidateAndMap(AutomationProperty property, object v
((value == null && expectedType.IsValueType)
|| (value != null && !expectedType.IsAssignableFrom(value.GetType()))))
{
- throw new ArgumentException(SR.Get(SRID.PropertyConditionIncorrectType, property.ProgrammaticName, expectedType.Name));
+ throw new ArgumentException(SR.Format(SR.PropertyConditionIncorrectType, property.ProgrammaticName, expectedType.Name));
}
// Some types are handled differently in managed vs unmanaged - handle those here...
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/OrCondition.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/OrCondition.cs
index d18d6dfd424..4f34d4fefd2 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/OrCondition.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/OrCondition.cs
@@ -36,7 +36,7 @@ public class OrCondition : Condition
public OrCondition( params Condition [ ] conditions )
{
Misc.ValidateArgumentNonNull( conditions, "conditions" );
- Misc.ValidateArgument( conditions.Length >= 2, SRID.MustBeAtLeastTwoConditions );
+ Misc.ValidateArgument( conditions.Length >= 2, nameof(SR.MustBeAtLeastTwoConditions) );
foreach( Condition condition in conditions )
{
Misc.ValidateArgumentNonNull( condition, "conditions" );
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/PropertyCondition.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/PropertyCondition.cs
index 2c3eb8a13ca..99cd9ae1f66 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/PropertyCondition.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/PropertyCondition.cs
@@ -127,7 +127,7 @@ void Init(AutomationProperty property, object val, PropertyConditionFlags flags
AutomationPropertyInfo info;
if (!Schema.GetPropertyInfo(property, out info))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedProperty));
+ throw new ArgumentException(SR.UnsupportedProperty);
}
// Check type is appropriate: NotSupported is allowed against any property,
@@ -138,12 +138,12 @@ void Init(AutomationProperty property, object val, PropertyConditionFlags flags
((val == null && expectedType.IsValueType)
|| (val != null && !expectedType.IsAssignableFrom(val.GetType()))))
{
- throw new ArgumentException(SR.Get(SRID.PropertyConditionIncorrectType, property.ProgrammaticName, expectedType.Name));
+ throw new ArgumentException(SR.Format(SR.PropertyConditionIncorrectType, property.ProgrammaticName, expectedType.Name));
}
if ((flags & PropertyConditionFlags.IgnoreCase) != 0)
{
- Misc.ValidateArgument(val is string, SRID.IgnoreCaseRequiresString);
+ Misc.ValidateArgument(val is string, nameof(SR.IgnoreCaseRequiresString));
}
// Some types are handled differently in managed vs unmanaged - handle those here...
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs
index 84a5e02754f..1bdb319fef9 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs
@@ -98,7 +98,7 @@ public void SetValue(double value)
object readOnly = _el.GetCurrentPropertyValue(IsReadOnlyProperty);
if (readOnly is bool && (bool)readOnly)
{
- throw new InvalidOperationException(SR.Get(SRID.ValueReadonly));
+ throw new InvalidOperationException(SR.ValueReadonly);
}
UiaCoreApi.RangeValuePattern_SetValue(_hPattern, value);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Text/TextRange.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Text/TextRange.cs
index 69617d53889..bbf611a432d 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Text/TextRange.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Text/TextRange.cs
@@ -184,12 +184,12 @@ public TextPatternRange FindAttribute(AutomationTextAttribute attribute, object
AutomationAttributeInfo ai;
if(!Schema.GetAttributeInfo(attribute, out ai))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedAttribute));
+ throw new ArgumentException(SR.UnsupportedAttribute);
}
if (value.GetType() != ai.Type)
{
- throw new ArgumentException(SR.Get(SRID.TextAttributeValueWrongType, attribute, ai.Type.Name, value.GetType().Name), "value");
+ throw new ArgumentException(SR.Format(SR.TextAttributeValueWrongType, attribute, ai.Type.Name, value.GetType().Name), "value");
}
// note: if we implement attributes whose values are logical elements, patterns,
@@ -221,7 +221,7 @@ public TextPatternRange FindText(string text, bool backward, bool ignoreCase)
// Therefore we can not use IsNullOrEmpty() here, suppress the warning.
Misc.ValidateArgumentNonNull(text, "text");
#pragma warning suppress 6507
- Misc.ValidateArgument(text.Length != 0, SRID.TextMustNotBeNullOrEmpty);
+ Misc.ValidateArgument(text.Length != 0, nameof(SR.TextMustNotBeNullOrEmpty));
SafeTextRangeHandle hResultTextRange = UiaCoreApi.TextRange_FindText(_hTextRange, text, backward, ignoreCase);
return Wrap(hResultTextRange, _pattern);
@@ -240,7 +240,7 @@ public object GetAttributeValue(AutomationTextAttribute attribute)
AutomationAttributeInfo ai;
if(!Schema.GetAttributeInfo(attribute, out ai))
{
- throw new ArgumentException(SR.Get(SRID.UnsupportedAttribute));
+ throw new ArgumentException(SR.UnsupportedAttribute);
}
object obj = UiaCoreApi.TextRange_GetAttributeValue(_hTextRange, attribute.Id);
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TextPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TextPattern.cs
index 733218f99fa..67ff3918810 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TextPattern.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TextPattern.cs
@@ -223,7 +223,7 @@ public TextPatternRange RangeFromPoint(Point screenLocation)
Rect rect = (Rect)_element.GetCurrentPropertyValue(AutomationElement.BoundingRectangleProperty);
if (screenLocation.X < rect.Left || screenLocation.X >= rect.Right || screenLocation.Y < rect.Top || screenLocation.Y >= rect.Bottom)
{
- throw new ArgumentException(SR.Get(SRID.ScreenCoordinatesOutsideBoundingRect));
+ throw new ArgumentException(SR.ScreenCoordinatesOutsideBoundingRect);
}
SafeTextRangeHandle hTextRange = UiaCoreApi.TextPattern_RangeFromPoint(_hPattern, screenLocation);
@@ -278,7 +278,7 @@ static internal object Wrap(AutomationElement el, SafePatternHandle hPattern, bo
{
if (hPattern.IsInvalid)
{
- throw new InvalidOperationException(SR.Get(SRID.CantPrefetchTextPattern));
+ throw new InvalidOperationException(SR.CantPrefetchTextPattern);
}
return new TextPattern(el, hPattern);
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs
index 39090b33724..35b18747ddd 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs
@@ -85,7 +85,7 @@ public void SetValue( string value )
object readOnly = _el.GetCurrentPropertyValue(IsReadOnlyProperty);
if (readOnly is bool && (bool)readOnly)
{
- throw new InvalidOperationException(SR.Get(SRID.ValueReadonly));
+ throw new InvalidOperationException(SR.ValueReadonly);
}
UiaCoreApi.ValuePattern_SetValue(_hPattern, value);
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
index 8280a6a14e2..c4e5ad37a38 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
@@ -17,7 +17,6 @@
-
Common\System\SR.cs
From 52db6defd3dc565232e29dc5eb8b8772bd06f175 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 18:56:58 +0000
Subject: [PATCH 049/109] Update dependencies from
https://github.com/dotnet/winforms build 20220705.1 (#6754)
[main] 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 843ebd6521f..49e1e21d257 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 984f88f7e78d2074948a08bb95bab5b6b2f92db0
+ 5972c29ef057fe95563646f2810735795c899a4f
-
+
https://github.com/dotnet/winforms
- 984f88f7e78d2074948a08bb95bab5b6b2f92db0
+ 5972c29ef057fe95563646f2810735795c899a4f
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5d5733c389b..69dabbca1d5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22351.4
+ 7.0.0-preview.7.22355.1
From ac7a876b198ccf9f25d7c1cbc9cb933a3db7b752 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 7 Jul 2022 18:31:14 +0000
Subject: [PATCH 050/109] Update dependencies from
https://github.com/dotnet/winforms build 20220707.1 (#6765)
[main] 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 49e1e21d257..11eb9d43216 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 5972c29ef057fe95563646f2810735795c899a4f
+ 147100a5b09d15cfc598a072b84113c2530d7896
-
+
https://github.com/dotnet/winforms
- 5972c29ef057fe95563646f2810735795c899a4f
+ 147100a5b09d15cfc598a072b84113c2530d7896
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 69dabbca1d5..227c54ba741 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22355.1
+ 7.0.0-preview.7.22357.1
From e76cb7b5c8f0769b0e57b0b0374b73155475dd18 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 7 Jul 2022 20:27:45 +0000
Subject: [PATCH 051/109] Update dependencies from
https://github.com/dotnet/winforms build 20220707.2 (#6767)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22330.8 to 7.0.0-preview.6.22356.9 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 11eb9d43216..3c29619fd2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 147100a5b09d15cfc598a072b84113c2530d7896
+ 67bbe0551b46defdea8ddac62c8aab6130721ed7
-
+
https://github.com/dotnet/winforms
- 147100a5b09d15cfc598a072b84113c2530d7896
+ 67bbe0551b46defdea8ddac62c8aab6130721ed7
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
ab994681e79233817a7e7c8d2697a1ee023dc1e0
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
-
+
https://github.com/dotnet/runtime
- 8cb93a27a49404bc3d8a6b26ae2b8007db7e44c8
+ 889404f6900ffb39bb33a66fa9e624191cab217c
diff --git a/eng/Versions.props b/eng/Versions.props
index 227c54ba741..e595af141e5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-preview.7.22357.1
+ 7.0.0-preview.7.22357.2
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
- 7.0.0-preview.6.22330.8
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
+ 7.0.0-preview.6.22356.9
From 2c7a7e8e69e375e7668c58324570a4470008b523 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Mon, 11 Jul 2022 20:09:30 +0800
Subject: [PATCH 052/109] Fix document format (#6773)
---
Documentation/report-on-adding-new-property.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/report-on-adding-new-property.md b/Documentation/report-on-adding-new-property.md
index d4f6bc404b6..3228d733860 100644
--- a/Documentation/report-on-adding-new-property.md
+++ b/Documentation/report-on-adding-new-property.md
@@ -118,6 +118,6 @@ Finally, we need to declare everything created above in the reference file.
Starting with the peers changed: [DataGridCellItem](https://github.com/dotnet/wpf/pull/4751/files#diff-8c5e1efe3927fbf477c421d45b1896e23bbedbd69d8770ce9e994c223bff0414R2406-R2421), [DateTime](https://github.com/dotnet/wpf/pull/4751/files#diff-8c5e1efe3927fbf477c421d45b1896e23bbedbd69d8770ce9e994c223bff0414R2545-R2560) and [Item](https://github.com/dotnet/wpf/pull/4751/files#diff-8c5e1efe3927fbf477c421d45b1896e23bbedbd69d8770ce9e994c223bff0414R2802-R2816) automation peers. And the new method in WindowAutomationPeer.
- ## Testing
+## Testing
- After that, the new properties should be now possible to be set in a WPF project. Also, will be seen in AccessibilityInsights.
\ No newline at end of file
+After that, the new properties should be now possible to be set in a WPF project. Also, will be seen in AccessibilityInsights.
\ No newline at end of file
From 6824841e707bf906a0c52739c93168c31a07b989 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Mon, 11 Jul 2022 21:00:54 +0800
Subject: [PATCH 053/109] Add comment to Wpf.Cpp.props code (#6774)
---
eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index 4088a444ffa..f0fedfd0830 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -3,7 +3,7 @@
15.0
Unicode
-
+
v143
From bfa3febe6c7530b086bda27d294b4594c721697a Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh
Date: Tue, 12 Jul 2022 09:01:30 +0530
Subject: [PATCH 054/109] update branding to rc1 (#6776)
---
eng/Versions.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index e595af141e5..9b0ab736cff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,8 +4,8 @@
7
0
0
- preview
- 7
+ rc
+ 1
$(MajorVersion).$(MinorVersion).$(PatchVersion)
- 7.0.0-beta.22327.2
- 7.0.0-beta.22327.2
+ 7.0.0-beta.22358.3
+ 7.0.0-beta.22358.3
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 25e97ac0077..afdd1750290 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -10,9 +10,7 @@ Param(
Set-StrictMode -Version 2.0
$ErrorActionPreference = "Stop"
-. $PSScriptRoot\tools.ps1
-
-Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
+. $PSScriptRoot\pipeline-logging-functions.ps1
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
$exclusions = @{ Exclusions = @() }
@@ -28,7 +26,7 @@ $jsonFiles = @()
$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
$jsonTemplateFiles | ForEach-Object {
$null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
-
+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
$jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
@@ -46,7 +44,7 @@ if ($allXlfFiles) {
}
$langXlfFiles | ForEach-Object {
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
-
+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
@@ -59,7 +57,7 @@ $locJson = @{
LanguageSet = $LanguageSet
LocItems = @(
$locFiles | ForEach-Object {
- $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
+ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
@@ -108,10 +106,10 @@ else {
if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
-
+
exit 1
}
else {
Write-Host "Generated LocProject.json and current LocProject.json are identical."
}
-}
\ No newline at end of file
+}
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 24a5e65de1b..8d48ec5680f 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -87,6 +87,7 @@ try {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name
$ToolVersion = $_.Value
+ $InstalledTools = @{}
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
if ($ToolVersion -eq "latest") {
@@ -111,9 +112,10 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
+ $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
- exit 0
+ return $InstalledTools
} else {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 6d7ba15e5f2..4b99a9cad3b 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
# Set default versions
if [[ -z "$majorVersion" ]]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
- if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+ if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
for version in "${versions[@]}"; do
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 395b43eebb6..9638c63c725 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -635,7 +635,7 @@ function InitializeNativeTools() {
InstallDirectory = "$ToolsDir"
}
}
- if (Test-Path variable:NativeToolsOnMachine) {
+ if ($env:NativeToolsOnMachine) {
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
$nativeArgs += @{ PathPromotion = $true }
}
diff --git a/global.json b/global.json
index 89ebf656570..37e519fec80 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "7.0.100-preview.2.22153.17",
+ "dotnet": "7.0.100-preview.5.22307.18",
"runtimes": {
"dotnet": [
"2.1.7",
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3"
},
"sdk": {
- "version": "7.0.100-preview.2.22153.17"
+ "version": "7.0.100-preview.5.22307.18"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
From 11d0f328042c68b5a3965f2958ddf26ce6184e1b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 23:01:16 +0000
Subject: [PATCH 058/109] Update dependencies from
https://github.com/dotnet/winforms build 20220712.1 (#6786)
[main] 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 6bcc21ac4df..efa9c89c881 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 67bbe0551b46defdea8ddac62c8aab6130721ed7
+ 99708eb4dd54806cac8e085a2a22eb524c693616
-
+
https://github.com/dotnet/winforms
- 67bbe0551b46defdea8ddac62c8aab6130721ed7
+ 99708eb4dd54806cac8e085a2a22eb524c693616
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7deeedd6747..3f9929371ee 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22357.2
+ 7.0.0-preview.7.22362.1
From 4c4f1384cbf2e847f7e15cb0ec68f699f64b2edc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 02:53:38 +0000
Subject: [PATCH 059/109] Update dependencies from
https://github.com/dotnet/winforms build 20220712.5 (#6787)
[main] 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 efa9c89c881..adbb8adb509 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 99708eb4dd54806cac8e085a2a22eb524c693616
+ 4a89efc79e2c5a43d208a61d23df4d961b9fefca
-
+
https://github.com/dotnet/winforms
- 99708eb4dd54806cac8e085a2a22eb524c693616
+ 4a89efc79e2c5a43d208a61d23df4d961b9fefca
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 3f9929371ee..e5505864cef 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22362.1
+ 7.0.0-preview.7.22362.5
From 43adc20ecf6a7327b7e1dda911a564533f392261 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt
Date: Wed, 13 Jul 2022 13:58:18 +0200
Subject: [PATCH 060/109] Use regular resource lookup for FocusVisualStyle
(#1165)
* Use regular resource lookup for FocusVisualStyle
* Fixing parameter mistake
* Update src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs
Co-authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
* Update src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs
Co-authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Co-authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
---
.../System/Windows/Input/KeyboardNavigation.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs
index 53b12fcbdff..a9a4cf409d3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Input/KeyboardNavigation.cs
@@ -903,7 +903,7 @@ private void ShowFocusVisual(DependencyObject element)
// then we load the default FocusVisualStyle from ResourceDictionary.
if (fvs == FrameworkElement.DefaultFocusVisualStyle)
{
- fvs = SystemResources.FindResourceInternal(SystemParameters.FocusVisualStyleKey) as Style;
+ fvs = FrameworkElement.FindResourceInternal(fe, fce: null, SystemParameters.FocusVisualStyleKey) as Style;
}
if (fvs != null)
@@ -930,7 +930,7 @@ private void ShowFocusVisual(DependencyObject element)
// then we load the default FocusVisualStyle from ResourceDictionary.
if (fvs == FrameworkElement.DefaultFocusVisualStyle)
{
- fvs = SystemResources.FindResourceInternal(SystemParameters.FocusVisualStyleKey) as Style;
+ fvs = FrameworkElement.FindResourceInternal(fe: null, fce, SystemParameters.FocusVisualStyleKey) as Style;
}
if (fvs != null)
From 9526c3a41947846ae919cec755d340f7a8480c1d Mon Sep 17 00:00:00 2001
From: lindexi
Date: Wed, 13 Jul 2022 19:58:37 +0800
Subject: [PATCH 061/109] Remove the custom HashSet class (#3738)
---
.../System/Xaml/XamlObjectReader.cs | 35 -------------------
1 file changed, 35 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlObjectReader.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlObjectReader.cs
index 83d4ab6a32c..62b67a71df0 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlObjectReader.cs
+++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlObjectReader.cs
@@ -3001,41 +3001,6 @@ public override void FindNamespace(SerializerContext context)
}
}
- // need to implement our own Set class to alleviate ties to System.Core.dll
- // HashSet lives in System.Core.dll
- class HashSet
- {
- Dictionary dictionary;
-
- public HashSet()
- {
- dictionary = new Dictionary();
- }
-
- public HashSet(IEqualityComparer comparer)
- {
- dictionary = new Dictionary(comparer);
- }
-
- public bool Contains(T member)
- {
- return dictionary.ContainsKey(member);
- }
-
- public bool Add(T member)
- {
- if (Contains(member))
- {
- return false;
- }
- else
- {
- dictionary.Add(member, true);
- return true;
- }
- }
- }
-
private class PartiallyOrderedList : IEnumerable
where TValue : class
{
From 5769bbfd15d34e2ec98f44406862d831a514a895 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt
Date: Wed, 13 Jul 2022 13:58:55 +0200
Subject: [PATCH 062/109] Replacing expensive type checks with "is" checks
(#4964)
* Replacing "IsInstanceOfType" with "is"
* Replacing type check helpers with "is"
* Removing todo
* Applying suggested changes
* Removing unused DType fields
* Adding back exceptions for invalid types
---
.../MS/internal/SynchronizedInputHelper.cs | 9 +-
.../MS/internal/UIElementHelper.cs | 2 +-
.../Windows/Input/Command/CommandManager.cs | 8 +-
.../Windows/Input/Command/RoutedCommand.cs | 12 +-
.../System/Windows/Input/InputElement.cs | 68 ++++------
.../System/Windows/Input/InputManager.cs | 12 +-
.../System/Windows/Input/KeyboardDevice.cs | 48 ++++---
.../System/Windows/Input/MouseDevice.cs | 112 +++++++++--------
.../Input/Stylus/Pointer/PointerLogic.cs | 94 ++++++++------
.../Windows/Input/Stylus/Wisp/WispLogic.cs | 118 ++++++++++--------
.../Input/Stylus/Wisp/WispStylusDevice.cs | 52 ++++----
.../Windows/Media/Effects/ShaderEffect.cs | 9 +-
.../System/Windows/Media/VisualTreeHelper.cs | 7 +-
.../System/Windows/PresentationSource.cs | 44 ++++---
.../System/Windows/UIElement.cs | 4 +-
.../System/Windows/UIElement3D.cs | 4 +-
.../Annotations/Anchoring/PathNode.cs | 9 +-
.../MS/Internal/FrameworkObject.cs | 34 +----
.../MS/Internal/Helper.cs | 8 +-
.../MS/Internal/Ink/ClipboardProcessor.cs | 4 +-
.../MS/Internal/PrePostDescendentsWalker.cs | 2 +-
.../System/Windows/BroadcastEventHelper.cs | 24 ++--
.../Windows/Controls/PopupControlService.cs | 12 +-
.../Controls/Primitives/DatePickerTextBox.cs | 2 +-
.../System/Windows/DescendentsWalker.cs | 31 ++---
.../System/Windows/DescendentsWalkerBase.cs | 3 +-
.../System/Windows/FrameworkElement.cs | 6 +-
.../Generated/FrameworkContentElement.cs | 13 --
.../Windows/Generated/FrameworkElement.cs | 13 --
.../Windows/Media/Animation/Storyboard.cs | 4 +-
.../System/Windows/StyleHelper.cs | 8 +-
.../System/Windows/TreeWalkHelper.cs | 2 +-
.../ReachDocumentSequenceSerializer.cs | 2 +-
.../ReachDocumentSequenceSerializerAsync.cs | 2 +-
.../manager/ReachFixedDocumentSerializer.cs | 2 +-
.../ReachFixedDocumentSerializerAsync.cs | 2 +-
.../manager/ReachFixedPageSerializer.cs | 2 +-
.../manager/ReachFixedPageSerializerAsync.cs | 2 +-
.../manager/XpsOMFixedPageSerializer.cs | 2 +-
39 files changed, 379 insertions(+), 413 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs
index 3d020a8e1cc..28cfd0a05ef 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs
@@ -297,21 +297,18 @@ internal static RoutedEvent[] MapInputTypeToRoutedEvents(SynchronizedInputType i
internal static void RaiseAutomationEvents()
{
- if (InputElement.IsUIElement(InputManager.ListeningElement))
+ if (InputManager.ListeningElement is UIElement e)
{
- UIElement e = (UIElement)InputManager.ListeningElement;
//Raise InputDiscarded automation event
SynchronizedInputHelper.RaiseAutomationEvent(e.GetAutomationPeer());
}
- else if (InputElement.IsContentElement(InputManager.ListeningElement))
+ else if (InputManager.ListeningElement is ContentElement ce)
{
- ContentElement ce = (ContentElement)InputManager.ListeningElement;
//Raise InputDiscarded automation event
SynchronizedInputHelper.RaiseAutomationEvent(ce.GetAutomationPeer());
}
- else if (InputElement.IsUIElement3D(InputManager.ListeningElement))
+ else if (InputManager.ListeningElement is UIElement3D e3D)
{
- UIElement3D e3D = (UIElement3D)InputManager.ListeningElement;
//Raise InputDiscarded automation event
SynchronizedInputHelper.RaiseAutomationEvent(e3D.GetAutomationPeer());
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs
index 4496a6a014f..b699b840377 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs
@@ -141,7 +141,7 @@ internal static DependencyObject GetUIParent(DependencyObject child, bool contin
[FriendAccessAllowed]
internal static bool IsUIElementOrUIElement3D(DependencyObject o)
{
- return (o is UIElement || o is UIElement3D);
+ return (o is UIElement or UIElement3D);
}
[FriendAccessAllowed]
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs
index a429d5dcc6f..3a0454e3212 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs
@@ -352,9 +352,9 @@ internal static void TranslateInput(IInputElement targetElement, InputEventArgs
// Determine UIElement/ContentElement/Neither type
DependencyObject targetElementAsDO = targetElement as DependencyObject;
- bool isUIElement = InputElement.IsUIElement(targetElementAsDO);
- bool isContentElement = !isUIElement && InputElement.IsContentElement(targetElementAsDO);
- bool isUIElement3D = !isUIElement && !isContentElement && InputElement.IsUIElement3D(targetElementAsDO);
+ bool isUIElement = targetElementAsDO is UIElement;
+ bool isContentElement = !isUIElement && targetElementAsDO is ContentElement;
+ bool isUIElement3D = !isUIElement && !isContentElement && targetElementAsDO is UIElement3D;
// Step 1: Check local input bindings
InputBindingCollection localInputBindings = null;
@@ -370,6 +370,7 @@ internal static void TranslateInput(IInputElement targetElement, InputEventArgs
{
localInputBindings = ((UIElement3D)targetElement).InputBindingsInternal;
}
+
if (localInputBindings != null)
{
InputBinding inputBinding = localInputBindings.FindMatch(targetElement, inputEventArgs);
@@ -423,6 +424,7 @@ internal static void TranslateInput(IInputElement targetElement, InputEventArgs
{
localCommandBindings = ((UIElement3D)targetElement).CommandBindingsInternal;
}
+
if (localCommandBindings != null)
{
command = localCommandBindings.FindMatch(targetElement, inputEventArgs);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
index bf6a5f44320..a7c543e83fb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
@@ -362,17 +362,17 @@ private void CriticalCanExecuteWrapper(object parameter, IInputElement target, b
// both of which derive from DO
DependencyObject targetAsDO = (DependencyObject)target;
- if (InputElement.IsUIElement(targetAsDO))
+ if (targetAsDO is UIElement uie)
{
- ((UIElement)targetAsDO).RaiseEvent(args, trusted);
+ uie.RaiseEvent(args, trusted);
}
- else if (InputElement.IsContentElement(targetAsDO))
+ else if (targetAsDO is ContentElement ce)
{
- ((ContentElement)targetAsDO).RaiseEvent(args, trusted);
+ ce.RaiseEvent(args, trusted);
}
- else if (InputElement.IsUIElement3D(targetAsDO))
+ else if (targetAsDO is UIElement3D uie3D)
{
- ((UIElement3D)targetAsDO).RaiseEvent(args, trusted);
+ uie3D.RaiseEvent(args, trusted);
}
}
internal bool ExecuteCore(object parameter, IInputElement target, bool userInitiated)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs
index 5881358c6ec..80b780a9016 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs
@@ -25,62 +25,42 @@ internal static bool IsValid(IInputElement e)
internal static bool IsValid(DependencyObject o)
{
- return IsUIElement(o) || IsContentElement(o) || IsUIElement3D(o);
+ return o is UIElement or ContentElement or UIElement3D;
}
- // Returns whether the given DynamicObject is a UIElement or not.
- internal static bool IsUIElement(DependencyObject o)
- {
- return UIElementType.IsInstanceOfType(o);
- }
-
- // Returns whether the given DynamicObject is a UIElement3D or not.
- internal static bool IsUIElement3D(DependencyObject o)
- {
- return UIElement3DType.IsInstanceOfType(o);
- }
-
- // Returns whether the given DynamicObject is a ContentElement or not.
- internal static bool IsContentElement(DependencyObject o)
- {
- return ContentElementType.IsInstanceOfType(o);
- }
-
// Returns the containing input element of the given DynamicObject.
// If onlyTraverse2D is set to true, then we stop once we see a 3D object and return null
internal static DependencyObject GetContainingUIElement(DependencyObject o, bool onlyTraverse2D)
{
DependencyObject container = null;
- Visual v;
- Visual3D v3D;
if(o != null)
{
- if(IsUIElement(o))
+ if(o is UIElement)
{
container = o;
}
- else if (IsUIElement3D(o) && !onlyTraverse2D)
+ else if (o is UIElement3D && !onlyTraverse2D)
{
container = o;
}
- else if(IsContentElement(o))
+ else if(o is ContentElement contentElement)
{
- DependencyObject parent = ContentOperations.GetParent((ContentElement)o);
+ DependencyObject parent = ContentOperations.GetParent(contentElement);
if(parent != null)
{
container = GetContainingUIElement(parent, onlyTraverse2D);
}
else
{
- parent = ((ContentElement)o).GetUIParentCore();
+ parent = contentElement.GetUIParentCore();
if(parent != null)
{
container = GetContainingUIElement(parent, onlyTraverse2D);
}
}
}
- else if ((v = o as Visual) != null)
+ else if (o is Visual v)
{
DependencyObject parent = VisualTreeHelper.GetParent(v);
if(parent != null)
@@ -88,7 +68,7 @@ internal static DependencyObject GetContainingUIElement(DependencyObject o, bool
container = GetContainingUIElement(parent, onlyTraverse2D);
}
}
- else if (!onlyTraverse2D && (v3D = o as Visual3D) != null)
+ else if (!onlyTraverse2D && o is Visual3D v3D)
{
DependencyObject parent = VisualTreeHelper.GetParent(v3D);
if (parent != null)
@@ -113,24 +93,22 @@ internal static DependencyObject GetContainingUIElement(DependencyObject o)
internal static IInputElement GetContainingInputElement(DependencyObject o, bool onlyTraverse2D)
{
IInputElement container = null;
- Visual v;
- Visual3D v3D;
if(o != null)
{
- if(IsUIElement(o))
+ if(o is UIElement uiElement)
{
- container = (UIElement) o;
+ container = uiElement;
}
- else if(IsContentElement(o))
+ else if(o is ContentElement contentElement)
{
- container = (ContentElement) o;
+ container = contentElement;
}
- else if (IsUIElement3D(o) && !onlyTraverse2D)
+ else if (o is UIElement3D uIElement3D && !onlyTraverse2D)
{
- container = (UIElement3D)o;
+ container = uIElement3D;
}
- else if((v = o as Visual) != null)
+ else if(o is Visual v)
{
DependencyObject parent = VisualTreeHelper.GetParent(v);
if(parent != null)
@@ -138,7 +116,7 @@ internal static IInputElement GetContainingInputElement(DependencyObject o, bool
container = GetContainingInputElement(parent, onlyTraverse2D);
}
}
- else if (!onlyTraverse2D && (v3D = o as Visual3D) != null)
+ else if (!onlyTraverse2D && o is Visual3D v3D)
{
DependencyObject parent = VisualTreeHelper.GetParent(v3D);
if (parent != null)
@@ -165,24 +143,24 @@ internal static DependencyObject GetContainingVisual(DependencyObject o)
if(o != null)
{
- if(IsUIElement(o))
+ if(o is UIElement uiElement)
{
- v = (Visual)o;
+ v = uiElement;
}
- else if (IsUIElement3D(o))
+ else if (o is Visual3D visual3D)
{
- v = (Visual3D)o;
+ v = visual3D;
}
- else if(IsContentElement(o))
+ else if(o is ContentElement contentElement)
{
- DependencyObject parent = ContentOperations.GetParent((ContentElement)o);
+ DependencyObject parent = ContentOperations.GetParent(contentElement);
if(parent != null)
{
v = GetContainingVisual(parent);
}
else
{
- parent = ((ContentElement)o).GetUIParentCore();
+ parent = contentElement.GetUIParentCore();
if(parent != null)
{
v = GetContainingVisual(parent);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs
index 351358837ae..aa38d9298e7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs
@@ -801,22 +801,16 @@ private bool ProcessStagingArea()
{
if (eventSource != null)
{
- if (InputElement.IsUIElement(eventSource))
+ if (eventSource is UIElement e)
{
- UIElement e = (UIElement)eventSource;
-
e.RaiseEvent(input, true); // Call the "trusted" flavor of RaiseEvent.
}
- else if (InputElement.IsContentElement(eventSource))
+ else if (eventSource is ContentElement ce)
{
- ContentElement ce = (ContentElement)eventSource;
-
ce.RaiseEvent(input, true);// Call the "trusted" flavor of RaiseEvent.
}
- else if (InputElement.IsUIElement3D(eventSource))
+ else if (eventSource is UIElement3D e3D)
{
- UIElement3D e3D = (UIElement3D)eventSource;
-
e3D.RaiseEvent(input, true); // Call the "trusted" flavor of RaiseEvent
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
index 65372e43a3d..df63f9cbd89 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
@@ -420,45 +420,53 @@ private void ChangeFocus(DependencyObject focus, int timestamp)
if(oldFocus != null)
{
o = oldFocus;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _isEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _isVisibleChangedEventHandler;
- ((UIElement)o).FocusableChanged -= _focusableChangedEventHandler;
+ uie.IsEnabledChanged -= _isEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _isVisibleChangedEventHandler;
+ uie.FocusableChanged -= _focusableChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _isEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _isEnabledChangedEventHandler;
// NOTE: there is no IsVisible property for ContentElements.
- ((ContentElement)o).FocusableChanged -= _focusableChangedEventHandler;
+ ce.FocusableChanged -= _focusableChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged -= _isEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _isVisibleChangedEventHandler;
+ uie3D.FocusableChanged -= _focusableChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged -= _isEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _isVisibleChangedEventHandler;
- ((UIElement3D)o).FocusableChanged -= _focusableChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, o.GetType()));
}
}
if(_focus != null)
{
o = _focus;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _isEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _isVisibleChangedEventHandler;
- ((UIElement)o).FocusableChanged += _focusableChangedEventHandler;
+ uie.IsEnabledChanged += _isEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _isVisibleChangedEventHandler;
+ uie.FocusableChanged += _focusableChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _isEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _isEnabledChangedEventHandler;
// NOTE: there is no IsVisible property for ContentElements.
- ((ContentElement)o).FocusableChanged += _focusableChangedEventHandler;
+ ce.FocusableChanged += _focusableChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged += _isEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _isVisibleChangedEventHandler;
+ uie3D.FocusableChanged += _focusableChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged += _isEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _isVisibleChangedEventHandler;
- ((UIElement3D)o).FocusableChanged += _focusableChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, o.GetType()));
}
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
index d8233c586b4..4559f01778c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
@@ -739,17 +739,17 @@ private object ReevaluateCaptureAsync(object arg)
// First, check things like IsEnabled, IsVisible, etc. on a
// UIElement vs. ContentElement basis.
//
- if (InputElement.IsUIElement(dependencyObject))
+ if (dependencyObject is UIElement uie)
{
- killCapture = !ValidateUIElementForCapture((UIElement)_mouseCapture);
+ killCapture = !ValidateUIElementForCapture(uie);
}
- else if (InputElement.IsContentElement(dependencyObject))
+ else if (dependencyObject is ContentElement ce)
{
- killCapture = !ValidateContentElementForCapture((ContentElement)_mouseCapture);
+ killCapture = !ValidateContentElementForCapture(ce);
}
- else if (InputElement.IsUIElement3D(dependencyObject))
+ else if (dependencyObject is UIElement3D uie3D)
{
- killCapture = !ValidateUIElement3DForCapture((UIElement3D)_mouseCapture);
+ killCapture = !ValidateUIElement3DForCapture(uie3D);
}
//
@@ -993,51 +993,51 @@ private void ChangeMouseOver(IInputElement mouseOver, int timestamp)
if(oldMouseOver != null)
{
o = oldMouseOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- ((UIElement3D)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ uie3D.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
}
if(_mouseOver != null)
{
o = _mouseOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- ((UIElement3D)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ uie3D.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
}
}
@@ -1087,51 +1087,51 @@ private void ChangeMouseCapture(IInputElement mouseCapture, IMouseInputProvider
if (oldMouseCapture != null)
{
o = oldMouseCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- ((UIElement3D)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ uie3D.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
}
if (_mouseCapture != null)
{
o = _mouseCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- ((UIElement3D)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ uie3D.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
}
}
@@ -1538,9 +1538,13 @@ private void PreNotifyInput(object sender, NotifyInputEventArgs e)
// If we are over something else (like a raw visual)
// find the containing element.
if (!InputElement.IsValid(mouseOver))
+ {
mouseOver = InputElement.GetContainingInputElement(mouseOver as DependencyObject);
+ }
if ((rawMouseOver != null) && !InputElement.IsValid(rawMouseOver))
+ {
rawMouseOver = InputElement.GetContainingInputElement(rawMouseOver as DependencyObject);
+ }
}
break;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
index 437e2e6732e..6f29645dcc8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
@@ -530,48 +530,52 @@ internal override void UpdateStylusCapture(StylusDeviceBase stylusDevice, IInput
if (oldCapture != null)
{
o = oldCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement element)
{
- UIElement element = o as UIElement;
element.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
element.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
element.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
- ((ContentElement)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ }
+ else if (o is UIElement3D element3D)
+ {
+ element3D.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ element3D.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ element3D.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
else
{
- UIElement3D element = o as UIElement3D;
- element.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
- element.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- element.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, oldCapture.GetType()));
}
}
if (_stylusCapture != null)
{
o = _stylusCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement element)
{
- UIElement element = o as UIElement;
element.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
element.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
element.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
- ((ContentElement)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ }
+ else if (o is UIElement3D element3D)
+ {
+ element3D.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ element3D.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ element3D.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
else
{
- UIElement3D element = o as UIElement3D;
- element.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
- element.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- element.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusCapture.GetType()));
}
}
@@ -613,55 +617,59 @@ internal override void UpdateOverProperty(StylusDeviceBase stylusDevice, IInputE
if (oldOver != null)
{
o = oldOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement element)
{
- UIElement element = o as UIElement;
element.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
element.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
element.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D element3D)
+ {
+ element3D.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ element3D.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ element3D.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
else
{
- UIElement3D element = o as UIElement3D;
- element.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- element.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- element.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, oldOver.GetType()));
}
}
if (_stylusOver != null)
{
o = _stylusOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement element)
{
- UIElement element = o as UIElement;
element.IsEnabledChanged += _overIsEnabledChangedEventHandler;
element.IsVisibleChanged += _overIsVisibleChangedEventHandler;
element.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D element3D)
+ {
+ element3D.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ element3D.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ element3D.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
else
{
- UIElement3D element = o as UIElement3D;
- element.IsEnabledChanged += _overIsEnabledChangedEventHandler;
- element.IsVisibleChanged += _overIsVisibleChangedEventHandler;
- element.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusOver.GetType()));
}
}
@@ -783,17 +791,21 @@ private object ReevaluateCaptureAsync(object arg)
// First, check things like IsEnabled, IsVisible, etc. on a
// UIElement vs. ContentElement basis.
//
- if (InputElement.IsUIElement(dependencyObject))
+ if (dependencyObject is UIElement uie)
+ {
+ killCapture = !ValidateUIElementForCapture(uie);
+ }
+ else if (dependencyObject is ContentElement ce)
{
- killCapture = !ValidateUIElementForCapture((UIElement)_stylusCapture);
+ killCapture = !ValidateContentElementForCapture(ce);
}
- else if (InputElement.IsContentElement(dependencyObject))
+ else if (dependencyObject is UIElement3D uie3D)
{
- killCapture = !ValidateContentElementForCapture((ContentElement)_stylusCapture);
+ killCapture = !ValidateUIElement3DForCapture(uie3D);
}
else
{
- killCapture = !ValidateUIElement3DForCapture((UIElement3D)_stylusCapture);
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusCapture.GetType()));
}
//
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 8735271cfeb..2667ba183d6 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
@@ -2059,51 +2059,59 @@ internal override void UpdateStylusCapture(StylusDeviceBase stylusDevice, IInput
if (oldCapture != null)
{
o = oldCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged -= _captureIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _captureIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged -= _captureIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, oldCapture.GetType()));
}
}
if (_stylusCapture != null)
{
o = _stylusCapture as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged += _captureIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _captureIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged += _captureIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _captureIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged += _captureIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusCapture.GetType()));
}
}
@@ -2139,51 +2147,59 @@ internal override void UpdateOverProperty(StylusDeviceBase stylusDevice, IInputE
if (oldOver != null)
{
o = oldOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, oldOver.GetType()));
}
}
if (_stylusOver != null)
{
o = _stylusOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusOver.GetType()));
}
}
@@ -2409,17 +2425,21 @@ private object ReevaluateCaptureAsync(object arg)
// First, check things like IsEnabled, IsVisible, etc. on a
// UIElement vs. ContentElement basis.
//
- if (InputElement.IsUIElement(dependencyObject))
+ if (dependencyObject is UIElement uie)
+ {
+ killCapture = !ValidateUIElementForCapture(uie);
+ }
+ else if (dependencyObject is ContentElement ce)
{
- killCapture = !ValidateUIElementForCapture((UIElement)_stylusCapture);
+ killCapture = !ValidateContentElementForCapture(ce);
}
- else if (InputElement.IsContentElement(dependencyObject))
+ else if (dependencyObject is UIElement3D uie3D)
{
- killCapture = !ValidateContentElementForCapture((ContentElement)_stylusCapture);
+ killCapture = !ValidateUIElement3DForCapture(uie3D);
}
else
{
- killCapture = !ValidateUIElement3DForCapture((UIElement3D)_stylusCapture);
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusCapture.GetType()));
}
//
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
index bf933843a7c..1f3125ee99d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
@@ -418,51 +418,59 @@ private void UpdateOverProperty(IInputElement oldOver, IInputElement newOver)
if (oldOver != null)
{
o = oldOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged -= _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged -= _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged -= _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged -= _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged -= _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, oldOver.GetType()));
}
}
if (_stylusOver != null)
{
o = _stylusOver as DependencyObject;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- ((UIElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ uie.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
- else if (InputElement.IsContentElement(o))
+ else if (o is ContentElement ce)
{
- ((ContentElement)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ ce.IsEnabledChanged += _overIsEnabledChangedEventHandler;
// NOTE: there are no IsVisible or IsHitTestVisible properties for ContentElements.
//
- // ((ContentElement)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- // ((ContentElement)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ // ce.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ // ce.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ }
+ else if (o is UIElement3D uie3D)
+ {
+ uie3D.IsEnabledChanged += _overIsEnabledChangedEventHandler;
+ uie3D.IsVisibleChanged += _overIsVisibleChangedEventHandler;
+ uie3D.IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
}
else
{
- ((UIElement3D)o).IsEnabledChanged += _overIsEnabledChangedEventHandler;
- ((UIElement3D)o).IsVisibleChanged += _overIsVisibleChangedEventHandler;
- ((UIElement3D)o).IsHitTestVisibleChanged += _overIsHitTestVisibleChangedEventHandler;
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, _stylusOver.GetType()));
}
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs
index d7b8a191096..6e4f4fa01bb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs
@@ -436,11 +436,10 @@ private void UpdateShaderSampler(DependencyProperty dp, object newValue, int reg
if (newValue != null)
{
- if (!(typeof(VisualBrush).IsInstanceOfType(newValue) ||
- typeof(BitmapCacheBrush).IsInstanceOfType(newValue) ||
- typeof(ImplicitInputBrush).IsInstanceOfType(newValue) ||
- typeof(ImageBrush).IsInstanceOfType(newValue))
- )
+ if (newValue is not VisualBrush
+ and not BitmapCacheBrush
+ and not ImplicitInputBrush
+ and not ImageBrush)
{
// Note that if the type of the brush is ImplicitInputBrush and the value is non null, the value is actually
// Effect.ImplicitInput. This is because ImplicitInputBrush is internal and the user can only get to the singleton
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs
index 3d8d9e3b2db..a9356fdfe5f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs
@@ -254,14 +254,11 @@ internal static bool IsAncestorOf(DependencyObject ancestor, DependencyObject de
while ((current != null) && (current != ancestor) && !stopType.IsInstanceOfType(current))
{
- Visual visual;
- Visual3D visual3D;
-
- if ((visual = current as Visual) != null)
+ if (current is Visual visual)
{
current = visual.InternalVisualParent;
}
- else if ((visual3D = current as Visual3D) != null)
+ else if (current is Visual3D visual3D)
{
current = visual3D.InternalVisualParent;
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
index 330d77a2f4c..41515937df3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
@@ -145,9 +145,8 @@ public static void AddSourceChangedHandler(IInputElement element, SourceChangedE
{
FrugalObjectList info;
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- UIElement uie = o as UIElement;
uie.AddHandler(SourceChangedEvent, handler);
info = uie.EventHandlersStore[SourceChangedEvent];
if (1 == info.Count)
@@ -156,9 +155,8 @@ public static void AddSourceChangedHandler(IInputElement element, SourceChangedE
AddElementToWatchList(uie);
}
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- UIElement3D uie3D = o as UIElement3D;
uie3D.AddHandler(SourceChangedEvent, handler);
info = uie3D.EventHandlersStore[SourceChangedEvent];
if (1 == info.Count)
@@ -167,13 +165,18 @@ public static void AddSourceChangedHandler(IInputElement element, SourceChangedE
AddElementToWatchList(uie3D);
}
}
- else
+ else if (o is ContentElement ce)
{
- ContentElement ce = o as ContentElement;
ce.AddHandler(SourceChangedEvent, handler);
info = ce.EventHandlersStore[SourceChangedEvent];
if (1 == info.Count)
+ {
AddElementToWatchList(ce);
+ }
+ }
+ else
+ {
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, o.GetType()));
}
}
}
@@ -211,9 +214,8 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
EventHandlersStore store;
// Either UIElement or ContentElement.
- if (InputElement.IsUIElement(o))
+ if (o is UIElement uie)
{
- UIElement uie = o as UIElement;
uie.RemoveHandler(SourceChangedEvent, handler);
store = uie.EventHandlersStore;
if (store != null)
@@ -226,9 +228,8 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
RemoveElementFromWatchList(uie);
}
}
- else if (InputElement.IsUIElement3D(o))
+ else if (o is UIElement3D uie3D)
{
- UIElement3D uie3D = o as UIElement3D;
uie3D.RemoveHandler(SourceChangedEvent, handler);
store = uie3D.EventHandlersStore;
if (store != null)
@@ -241,9 +242,8 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
RemoveElementFromWatchList(uie3D);
}
}
- else
+ else if (o is ContentElement ce)
{
- ContentElement ce = o as ContentElement;
ce.RemoveHandler(SourceChangedEvent, handler);
store = ce.EventHandlersStore;
if (store != null)
@@ -255,6 +255,10 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
RemoveElementFromWatchList(ce);
}
}
+ else
+ {
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, o.GetType()));
+ }
}
}
@@ -548,7 +552,7 @@ protected void ClearContentRenderedListeners()
/// Event Args.
internal static void OnVisualAncestorChanged(DependencyObject uie, AncestorChangedEventArgs e)
{
- Debug.Assert(InputElement.IsUIElement3D(uie) || InputElement.IsUIElement(uie));
+ Debug.Assert(uie is UIElement3D or UIElement);
if (true == (bool)uie.GetValue(GetsSourceChangedEventProperty))
{
@@ -740,17 +744,21 @@ private static bool UpdateSourceOfElement(DependencyObject doTarget,
SourceChangedEventArgs args = new SourceChangedEventArgs(cachedSource, realSource);
args.RoutedEvent=SourceChangedEvent;
- if (InputElement.IsUIElement(doTarget))
+ if (doTarget is UIElement uiElement)
{
- ((UIElement)doTarget).RaiseEvent(args);
+ uiElement.RaiseEvent(args);
}
- else if (InputElement.IsContentElement(doTarget))
+ else if (doTarget is ContentElement contentElement)
+ {
+ contentElement.RaiseEvent(args);
+ }
+ else if (doTarget is UIElement3D uiElement3D)
{
- ((ContentElement)doTarget).RaiseEvent(args);
+ uiElement3D.RaiseEvent(args);
}
else
{
- ((UIElement3D)doTarget).RaiseEvent(args);
+ throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, doTarget.GetType()));
}
calledOut = true;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs
index 14e0a26b6d4..49d9a88f4f3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs
@@ -1443,7 +1443,7 @@ protected internal override void OnVisualParentChanged(DependencyObject oldParen
{
DependencyObject parent = _parent;
- if (!InputElement.IsUIElement(parent) && !InputElement.IsUIElement3D(parent))
+ if (parent is not UIElement and not UIElement3D)
{
Visual parentAsVisual = parent as Visual;
@@ -1490,7 +1490,7 @@ protected internal override void OnVisualParentChanged(DependencyObject oldParen
{
DependencyObject parent = oldParent;
- if (!InputElement.IsUIElement(parent) && !InputElement.IsUIElement3D(parent))
+ if (parent is not UIElement and not UIElement3D)
{
// We are being unplugged from a non-UIElement visual. This
// means that our parent didn't play by the same rules we
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs
index f6761dfe11d..33efb11b54f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs
@@ -148,7 +148,7 @@ protected internal override void OnVisualParentChanged(DependencyObject oldParen
{
DependencyObject parent = InternalVisualParent;
- if (!InputElement.IsUIElement(parent) && !InputElement.IsUIElement3D(parent))
+ if (parent is not UIElement and not UIElement3D)
{
Visual parentAsVisual = parent as Visual;
@@ -192,7 +192,7 @@ protected internal override void OnVisualParentChanged(DependencyObject oldParen
{
DependencyObject parent = oldParent;
- if (!InputElement.IsUIElement(parent) && !InputElement.IsUIElement3D(parent))
+ if (parent is not UIElement and not UIElement3D)
{
// We are being unplugged from a non-UIElement visual. This
// means that our parent didn't play by the same rules we
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/PathNode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/PathNode.cs
index 1ff7bf6c7b6..7f5dd44dec9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/PathNode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/PathNode.cs
@@ -229,7 +229,7 @@ internal static DependencyObject GetParent(DependencyObject node)
Debug.Assert(node != null, "node can not be null");
DependencyObject current = node;
- DependencyObject parent = null;
+ DependencyObject parent;
while (true)
{
@@ -255,16 +255,15 @@ internal static DependencyObject GetParent(DependencyObject node)
}
// Check if located a parent, if so, check if it's the correct type
- if ((parent == null) ||
- FrameworkElement.DType.IsInstanceOfType(parent) ||
- FrameworkContentElement.DType.IsInstanceOfType(parent))
+ if (parent is null
+ or FrameworkElement
+ or FrameworkContentElement)
{
break;
}
// Parent found but not of correct type, continue
current = parent;
- parent = null;
}
return parent;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/FrameworkObject.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/FrameworkObject.cs
index 4234020478c..bde4847e41a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/FrameworkObject.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/FrameworkObject.cs
@@ -57,21 +57,8 @@ internal FrameworkObject(DependencyObject d)
// [code should be identical to Reset(d)]
_do = d;
- if (FrameworkElement.DType.IsInstanceOfType(d))
- {
- _fe = (FrameworkElement)d;
- _fce = null;
- }
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
- {
- _fe = null;
- _fce = (FrameworkContentElement)d;
- }
- else
- {
- _fe = null;
- _fce = null;
- }
+ _fe = d as FrameworkElement;
+ _fce = d as FrameworkContentElement;
}
internal FrameworkObject(DependencyObject d, bool throwIfNeither)
@@ -99,21 +86,8 @@ internal void Reset(DependencyObject d)
{
_do = d;
- if (FrameworkElement.DType.IsInstanceOfType(d))
- {
- _fe = (FrameworkElement)d;
- _fce = null;
- }
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
- {
- _fe = null;
- _fce = (FrameworkContentElement)d;
- }
- else
- {
- _fe = null;
- _fce = null;
- }
+ _fe = d as FrameworkElement;
+ _fce = d as FrameworkContentElement;
}
#endregion Constructors
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Helper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Helper.cs
index a45d7b9df42..197122f118c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Helper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Helper.cs
@@ -286,15 +286,15 @@ internal static void DowncastToFEorFCE(DependencyObject d,
out FrameworkElement fe, out FrameworkContentElement fce,
bool throwIfNeither)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement frameworkElement)
{
- fe = (FrameworkElement)d;
+ fe = frameworkElement;
fce = null;
}
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
+ else if (d is FrameworkContentElement frameworkContentElement)
{
fe = null;
- fce = (FrameworkContentElement)d;
+ fce = frameworkContentElement;
}
else if (throwIfNeither)
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/ClipboardProcessor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/ClipboardProcessor.cs
index 40aecf7e5e8..e7160832144 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/ClipboardProcessor.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/ClipboardProcessor.cs
@@ -213,9 +213,9 @@ internal bool PasteData(IDataObject dataObject, ref StrokeCollection newStrokes,
// If the Xaml data has been set in an InkCanvas, the top element will be a container InkCanvas.
// In this case, the new elements will be the children of the container.
// Otherwise, the new elements will be whatever data from the data object.
- if (elements.Count == 1 && ClipboardProcessor.InkCanvasDType.IsInstanceOfType(elements[0]))
+ if (elements.Count == 1 && elements[0] is InkCanvas inkCanvas)
{
- TearDownInkCanvasContainer((InkCanvas)( elements[0] ), ref newStrokes, ref newElements);
+ TearDownInkCanvasContainer(inkCanvas, ref newStrokes, ref newElements);
}
else
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PrePostDescendentsWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PrePostDescendentsWalker.cs
index e40e1032aa9..4a4f884039d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PrePostDescendentsWalker.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PrePostDescendentsWalker.cs
@@ -72,7 +72,7 @@ public override void StartWalk(DependencyObject startNode, bool skipStartNode)
{
// This type checking is done in DescendentsWalker. Doing it here
// keeps us consistent.
- if (FrameworkElement.DType.IsInstanceOfType(startNode) || FrameworkContentElement.DType.IsInstanceOfType(startNode))
+ if (startNode is FrameworkElement or FrameworkContentElement)
{
_postCallback(startNode, this.Data, _priority == TreeWalkPriority.VisualTree);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/BroadcastEventHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/BroadcastEventHelper.cs
index 056f12d17e6..ace65f98990 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/BroadcastEventHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/BroadcastEventHelper.cs
@@ -292,12 +292,10 @@ private static bool OnBroadcastCallback(DependencyObject d, BroadcastEventData d
DependencyObject root = data.Root;
RoutedEvent routedEvent = data.RoutedEvent;
List eventRoute = data.EventRoute;
-
- if (FrameworkElement.DType.IsInstanceOfType(d))
- {
- // If this is a FrameworkElement
- FrameworkElement fe = (FrameworkElement)d;
+ // If this is a FrameworkElement
+ if (d is FrameworkElement fe)
+ {
if (fe != root && routedEvent == FrameworkElement.LoadedEvent && fe.UnloadedPending != null)
{
// If there is a pending Unloaded event wait till we've broadcast
@@ -422,22 +420,22 @@ private static bool OnBroadcastCallback(DependencyObject d, BroadcastEventData d
private static bool SubtreeHasLoadedChangeHandlerHelper(DependencyObject d)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement fe)
{
- return ((FrameworkElement)d).SubtreeHasLoadedChangeHandler;
+ return fe.SubtreeHasLoadedChangeHandler;
}
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
+ else if (d is FrameworkContentElement fce)
{
- return ((FrameworkContentElement)d).SubtreeHasLoadedChangeHandler;
+ return fce.SubtreeHasLoadedChangeHandler;
}
return false;
}
private static void FireLoadedOnDescendentsHelper(DependencyObject d)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement fe)
{
- ((FrameworkElement)d).FireLoadedOnDescendentsInternal();
+ fe.FireLoadedOnDescendentsInternal();
}
else
{
@@ -447,9 +445,9 @@ private static void FireLoadedOnDescendentsHelper(DependencyObject d)
private static void FireUnloadedOnDescendentsHelper(DependencyObject d)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement fe)
{
- ((FrameworkElement)d).FireUnloadedOnDescendentsInternal();
+ fe.FireUnloadedOnDescendentsInternal();
}
else
{
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 b39aea2cb2c..08c0e6c1e75 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
@@ -942,17 +942,17 @@ private bool RaiseContextMenuOpeningEvent(IInputElement source, double x, double
DependencyObject sourceDO = source as DependencyObject;
if (userInitiated && sourceDO != null)
{
- if (InputElement.IsUIElement(sourceDO))
+ if (sourceDO is UIElement uiElement)
{
- ((UIElement)sourceDO).RaiseEvent(args, userInitiated);
+ uiElement.RaiseEvent(args, userInitiated);
}
- else if (InputElement.IsContentElement(sourceDO))
+ else if (sourceDO is ContentElement contentElement)
{
- ((ContentElement)sourceDO).RaiseEvent(args, userInitiated);
+ contentElement.RaiseEvent(args, userInitiated);
}
- else if (InputElement.IsUIElement3D(sourceDO))
+ else if (sourceDO is UIElement3D uiElement3D)
{
- ((UIElement3D)sourceDO).RaiseEvent(args, userInitiated);
+ uiElement3D.RaiseEvent(args, userInitiated);
}
else
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DatePickerTextBox.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DatePickerTextBox.cs
index bf9505bab91..518e3026b67 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DatePickerTextBox.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DatePickerTextBox.cs
@@ -153,7 +153,7 @@ private T ExtractTemplatePart(string partName) where T : DependencyObject
private static T ExtractTemplatePart(string partName, DependencyObject obj) where T : DependencyObject
{
Debug.Assert(
- obj == null || typeof(T).IsInstanceOfType(obj),
+ obj == null || obj is T,
string.Format(CultureInfo.InvariantCulture, SR.Get(SRID.DatePickerTextBox_TemplatePartIsOfIncorrectType), partName, typeof(T).Name));
return obj as T;
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalker.cs
index 8dbaa7d402c..7338bf29dfb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalker.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalker.cs
@@ -56,8 +56,8 @@ public virtual void StartWalk(DependencyObject startNode, bool skipStartNode)
if (!skipStartNode)
{
- if (FrameworkElement.DType.IsInstanceOfType(_startNode) ||
- FrameworkContentElement.DType.IsInstanceOfType(_startNode))
+ if (_startNode is FrameworkElement
+ or FrameworkContentElement)
{
// Callback for the root of the subtree
continueWalk = _callback(_startNode, _data, _priority == TreeWalkPriority.VisualTree);
@@ -79,9 +79,8 @@ private void IterateChildren(DependencyObject d)
{
_recursionDepth++;
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement fe)
{
- FrameworkElement fe = (FrameworkElement) d;
bool hasLogicalChildren = fe.HasLogicalChildren;
// FrameworkElement have both a visual and a logical tree.
@@ -100,11 +99,10 @@ private void IterateChildren(DependencyObject d)
Debug.Assert( false, "Tree walk priority should be Visual first or Logical first - but this instance of DescendentsWalker has an invalid priority setting that's neither of the two." );
}
}
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
+ else if (d is FrameworkContentElement fce)
{
// FrameworkContentElement only has a logical tree, so we
// Walk logical children
- FrameworkContentElement fce = d as FrameworkContentElement;
if (fce.HasLogicalChildren)
{
WalkLogicalChildren( null, fce, fce.LogicalChildren );
@@ -114,18 +112,13 @@ private void IterateChildren(DependencyObject d)
{
// Neither a FrameworkElement nor FrameworkContentElement. See
// if it's a Visual and if so walk the Visual collection
- Visual v = d as Visual;
- if (v != null)
+ if (d is Visual v)
{
WalkVisualChildren(v);
}
- else
+ else if (d is Visual3D v3D)
{
- Visual3D v3D = d as Visual3D;
- if (v3D != null)
- {
- WalkVisualChildren(v3D);
- }
+ WalkVisualChildren(v3D);
}
}
@@ -324,12 +317,12 @@ private void WalkFrameworkElementLogicalThenVisualChildren(
for(int i = 0; i < count; i++)
{
Visual child = feParent.InternalGetVisualChild(i);
- if (child != null && FrameworkElement.DType.IsInstanceOfType(child))
+ if (child != null && child is FrameworkElement fe)
{
// For the case that both parents are identical, this node should
// have already been visited when walking through logical
// children, hence we short-circuit here
- if (VisualTreeHelper.GetParent(child) != ((FrameworkElement) child).Parent)
+ if (VisualTreeHelper.GetParent(child) != fe.Parent)
{
bool visitedViaVisualTree = true;
VisitNode(child, visitedViaVisualTree);
@@ -404,11 +397,11 @@ private void VisitNode(DependencyObject d, bool visitedViaVisualTree)
{
if (_recursionDepth <= ContextLayoutManager.s_LayoutRecursionLimit)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement fe)
{
- VisitNode(d as FrameworkElement, visitedViaVisualTree);
+ VisitNode(fe, visitedViaVisualTree);
}
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
+ else if (d is FrameworkContentElement)
{
_VisitNode(d, visitedViaVisualTree);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalkerBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalkerBase.cs
index 86e62723dbd..50fe3198db9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalkerBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DescendentsWalkerBase.cs
@@ -38,9 +38,8 @@ internal bool WasVisited(DependencyObject d)
{
DependencyObject logicalParent;
- if (FrameworkElement.DType.IsInstanceOfType(ancestor))
+ if (ancestor is FrameworkElement fe)
{
- FrameworkElement fe = ancestor as FrameworkElement;
logicalParent = fe.Parent;
// FrameworkElement
DependencyObject dependencyObjectParent = VisualTreeHelper.GetParent(fe);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElement.cs
index 95274b6d670..325623a60d2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/FrameworkElement.cs
@@ -2233,8 +2233,10 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
{
//let incrementally-updating FrameworkElements to mark the vicinity of the affected child
//to perform partial update.
- if(FrameworkElement.DType.IsInstanceOfType(layoutParent))
- ((FrameworkElement)layoutParent).ParentLayoutInvalidated(this);
+ if(layoutParent is FrameworkElement fe)
+ {
+ fe.ParentLayoutInvalidated(this);
+ }
if (affectsParentMeasure)
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs
index c49f4b1f165..801648178a4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs
@@ -1218,19 +1218,6 @@ internal event InheritedPropertyChangedEventHandler InheritedPropertyChanged
#endregion Internal Properties
- //------------------------------------------------------
- //
- // Internal Fields
- //
- //------------------------------------------------------
-
- #region Internal Fields
-
- // Optimization, to avoid calling FromSystemType too often
- internal new static DependencyObjectType DType = DependencyObjectType.FromSystemTypeInternal(typeof(FrameworkContentElement));
-
- #endregion Internal Fields
-
//------------------------------------------------------
//
// Private Fields
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs
index 1066e2efac8..c5ab045f7c3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs
@@ -1267,19 +1267,6 @@ internal event InheritedPropertyChangedEventHandler InheritedPropertyChanged
#endregion Internal Properties
- //------------------------------------------------------
- //
- // Internal Fields
- //
- //------------------------------------------------------
-
- #region Internal Fields
-
- // Optimization, to avoid calling FromSystemType too often
- internal new static DependencyObjectType DType = DependencyObjectType.FromSystemTypeInternal(typeof(FrameworkElement));
-
- #endregion Internal Fields
-
//------------------------------------------------------
//
// Private Fields
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Media/Animation/Storyboard.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Media/Animation/Storyboard.cs
index 073e59f15f3..34d61b14856 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Media/Animation/Storyboard.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Media/Animation/Storyboard.cs
@@ -929,13 +929,13 @@ private bool PropertyCloningRequired( object targetPropertyValue )
///
private void VerifyComplexPathSupport( DependencyObject targetObject )
{
- if( FrameworkElement.DType.IsInstanceOfType(targetObject) )
+ if(targetObject is FrameworkElement)
{
// FrameworkElement and derived types are supported.
return;
}
- if( FrameworkContentElement.DType.IsInstanceOfType(targetObject) )
+ if(targetObject is FrameworkContentElement)
{
// FrameworkContentElement and derived types are supported.
return;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs
index 9d76b939e4e..508435ee9d9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/StyleHelper.cs
@@ -2327,15 +2327,15 @@ internal static void SpecialDowncastToFEorFCE(DependencyObject d,
out FrameworkElement fe, out FrameworkContentElement fce,
bool throwIfNeither)
{
- if (FrameworkElement.DType.IsInstanceOfType(d))
+ if (d is FrameworkElement frameworkElement)
{
- fe = (FrameworkElement)d;
+ fe = frameworkElement;
fce = null;
}
- else if (FrameworkContentElement.DType.IsInstanceOfType(d))
+ else if (d is FrameworkContentElement frameworkContentElement)
{
fe = null;
- fce = (FrameworkContentElement)d;
+ fce = frameworkContentElement;
}
else if (throwIfNeither && !(d is System.Windows.Media.Media3D.Visual3D) )
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/TreeWalkHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/TreeWalkHelper.cs
index a109668b0e1..1489ff80f3b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/TreeWalkHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/TreeWalkHelper.cs
@@ -1000,7 +1000,7 @@ private static bool OnInheritablePropertyChanged(
// only then do we need to Invalidate the property
if (BaseValueSourceInternal.Inherited >= oldEntry.BaseValueSourceInternal)
{
- if (visitedViaVisualTree && FrameworkElement.DType.IsInstanceOfType(d))
+ if (visitedViaVisualTree && d is FrameworkElement)
{
DependencyObject logicalParent = LogicalTreeHelper.GetParent(d);
if (logicalParent != null)
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializer.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializer.cs
index 83c6e68732e..e1496822ee8 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializer.cs
@@ -194,7 +194,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializerAsync.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializerAsync.cs
index 1f1225bbd6f..e0c04abbfc7 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializerAsync.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachDocumentSequenceSerializerAsync.cs
@@ -232,7 +232,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializer.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializer.cs
index a85bd29b31b..ed8cfff47de 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializer.cs
@@ -277,7 +277,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializerAsync.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializerAsync.cs
index 477f4cc6198..249da14c521 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializerAsync.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedDocumentSerializerAsync.cs
@@ -317,7 +317,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializer.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializer.cs
index 76d6e3c1413..ff1899ab917 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializer.cs
@@ -350,7 +350,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializerAsync.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializerAsync.cs
index 186f5d0bee0..8cd45d0fa58 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializerAsync.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachFixedPageSerializerAsync.cs
@@ -322,7 +322,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/XpsOMFixedPageSerializer.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/XpsOMFixedPageSerializer.cs
index 6bc643d2b8a..6ce60e1a960 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/XpsOMFixedPageSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/XpsOMFixedPageSerializer.cs
@@ -308,7 +308,7 @@ SerializablePropertyContext serializablePropertyContext
propertyValue);
- if (typeof(Type).IsInstanceOfType(propertyValue))
+ if (propertyValue is Type)
{
int index = valueAsString.LastIndexOf('.');
valueAsString = string.Concat(
From 75465ad6484702a67f44e84fb2cbf16af4cd2b13 Mon Sep 17 00:00:00 2001
From: Bradley Grainger
Date: Wed, 13 Jul 2022 04:59:11 -0700
Subject: [PATCH 063/109] Eliminate memory copy when reading font data. Fixes
#6236 (#6254)
---
.../CPP/DWriteWrapper/FontFileStream.cpp | 41 +++----------------
.../CPP/DWriteWrapper/FontFileStream.h | 4 +-
2 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp
index 7e9b51adde8..e1c7339e9bc 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp
@@ -17,17 +17,15 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
// guarantee that this problem will be fixed so we will use the GetUnmanagedStream(). Note: This path will only
// be taken for embedded fonts among which XPS is a main scenario. For local fonts we use DWrite's APIs.
_fontSourceStream = fontSource->GetUnmanagedStream();
+ _fontSourcePointer = _fontSourceStream->PositionPointer - _fontSourceStream->Position;
try
{
_lastWriteTime = fontSource->GetLastWriteTimeUtc().ToFileTimeUtc();
- }
+ }
catch(System::ArgumentOutOfRangeException^) //The resulting file time would represent a date and time before 12:00 midnight January 1, 1601 C.E. UTC.
{
_lastWriteTime = -1;
- }
-
- // Create lock to control access to font source stream.
- _fontSourceStreamLock = gcnew Object();
+ }
}
FontFileStream::~FontFileStream()
@@ -61,31 +59,9 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
return E_INVALIDARG;
}
- int fragmentSizeInt = (int)fragmentSize;
- array^ buffer = gcnew array(fragmentSizeInt);
-
- // DWrite may call this method from multiple threads. We need to ensure thread safety by making Seek and Read atomic.
- System::Threading::Monitor::Enter(_fontSourceStreamLock);
- try
- {
- _fontSourceStream->Seek(fileOffset, //long
- System::IO::SeekOrigin::Begin);
-
- _fontSourceStream->Read(buffer, //byte[]
- 0, //int
- fragmentSizeInt //int
- );
- }
- finally
- {
- System::Threading::Monitor::Exit(_fontSourceStreamLock);
- }
-
- GCHandle gcHandle = GCHandle::Alloc(buffer, GCHandleType::Pinned);
-
- *fragmentStart = (byte*)(gcHandle.AddrOfPinnedObject().ToPointer());
-
- *fragmentContext = GCHandle::ToIntPtr(gcHandle).ToPointer();
+ // Return a pointer to the font data that is already loaded in memory (because the font source resource is mmapped into the process' address space).
+ *fragmentStart = _fontSourcePointer + fileOffset;
+ *fragmentContext = nullptr;
}
catch(System::Exception^ exception)
{
@@ -102,11 +78,6 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
void* fragmentContext
)
{
- if (fragmentContext != NULL)
- {
- GCHandle gcHandle = GCHandle::FromIntPtr(IntPtr(fragmentContext));
- gcHandle.Free();
- }
}
[ComVisible(true)]
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h
index fa1f3a50c24..49cf479b0b4 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h
@@ -20,9 +20,9 @@ namespace MS { namespace Internal { namespace Text { namespace TextInterface
private ref class FontFileStream : public IDWriteFontFileStreamMirror
{
private:
- Stream^ _fontSourceStream;
+ UnmanagedMemoryStream^ _fontSourceStream;
+ Byte* _fontSourcePointer;
INT64 _lastWriteTime;
- Object^ _fontSourceStreamLock;
public:
From e8b627dcb3df1043ebe4ae2888bdcc45238e5c50 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 13:02:32 +0000
Subject: [PATCH 064/109] Update dependencies from
https://github.com/dotnet/arcade build 20220712.1 (#6791)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index adbb8adb509..911354c7c56 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 54a00a84b53b63a74d232498a9d1476ff2000b7f
+ bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
-
+
https://github.com/dotnet/arcade
- 54a00a84b53b63a74d232498a9d1476ff2000b7f
+ bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
-
+
https://github.com/dotnet/arcade
- 54a00a84b53b63a74d232498a9d1476ff2000b7f
+ bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
-
+
https://github.com/dotnet/arcade
- 54a00a84b53b63a74d232498a9d1476ff2000b7f
+ bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
-
+
https://github.com/dotnet/arcade
- 54a00a84b53b63a74d232498a9d1476ff2000b7f
+ bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
diff --git a/eng/Versions.props b/eng/Versions.props
index e5505864cef..06f15704e4f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22358.3
- 7.0.0-beta.22358.3
+ 7.0.0-beta.22362.1
+ 7.0.0-beta.22362.1
diff --git a/global.json b/global.json
index 37e519fec80..527903918ba 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22362.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22362.1"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From df1e6313039c58d5d7e10bb4ab5379c45c302646 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 20:37:13 +0000
Subject: [PATCH 065/109] [main] Update dependencies from dotnet/winforms
(#6788)
[main] 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 911354c7c56..d12268ccbc7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 4a89efc79e2c5a43d208a61d23df4d961b9fefca
+ e16b5a39e5edbefe849cb421e724075f5137ffa4
-
+
https://github.com/dotnet/winforms
- 4a89efc79e2c5a43d208a61d23df4d961b9fefca
+ e16b5a39e5edbefe849cb421e724075f5137ffa4
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 06f15704e4f..b5100bbe344 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-preview.7.22362.5
+ 7.0.0-rc.1.22363.4
From c8548caeb2030796bbdfa579735d264947bdbcd2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 09:42:04 +0000
Subject: [PATCH 066/109] Update dependencies from
https://github.com/dotnet/winforms build 20220714.1 (#6794)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.6.22356.9 to 7.0.0-preview.7.22362.12 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d12268ccbc7..3845e93a6ac 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- e16b5a39e5edbefe849cb421e724075f5137ffa4
+ 5f4891aefe8784c97a84e7805e82f3232ecc5b8b
-
+
https://github.com/dotnet/winforms
- e16b5a39e5edbefe849cb421e724075f5137ffa4
+ 5f4891aefe8784c97a84e7805e82f3232ecc5b8b
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
-
+
https://github.com/dotnet/runtime
- 889404f6900ffb39bb33a66fa9e624191cab217c
+ b7fca07f478739d9fd50bdf5d1467c02dc05b6b0
diff --git a/eng/Versions.props b/eng/Versions.props
index b5100bbe344..2256c2a55b1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22363.4
+ 7.0.0-rc.1.22364.1
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
4.6.0-preview4.19176.11
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
- 7.0.0-preview.6.22356.9
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
+ 7.0.0-preview.7.22362.12
From 9e77ce1485e3b80f755baa47e86c894b91973042 Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 14 Jul 2022 20:06:22 +0800
Subject: [PATCH 067/109] Using the `Clone` method to fast clone the array in
StylusPoint (#5218)
---
.../System/Windows/Input/Stylus/Common/StylusPoint.cs | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs
index 439b7195015..b384391bd4b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs
@@ -694,16 +694,7 @@ internal bool HasDefaultPressure
///
private void CopyAdditionalData()
{
- if (null != _additionalValues)
- {
- int[] newData = new int[_additionalValues.Length];
- for (int x = 0; x < _additionalValues.Length; x++)
- {
- newData[x] = _additionalValues[x];
- }
-
- _additionalValues = newData;
- }
+ _additionalValues = (int[])_additionalValues?.Clone();
}
///
From 028bc1effaeecf4824274535e856c5f8316ce85a Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:07:28 -0400
Subject: [PATCH 068/109] Fix Invalid_IInputElement resource (#6691)
* Fix Invalid_IInputElement resource
* Fix Invalid_IInputElement resource usage
* Fix Invalid_IInputElement resource usage comments
Co-authored-by: Ashish Kumar Singh
---
.../src/PresentationCore/Resources/Strings.resx | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.cs.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.de.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.es.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.fr.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.it.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.ja.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.ko.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.pl.xlf | 4 ++--
.../PresentationCore/Resources/xlf/Strings.pt-BR.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.ru.xlf | 4 ++--
.../src/PresentationCore/Resources/xlf/Strings.tr.xlf | 4 ++--
.../Resources/xlf/Strings.zh-Hans.xlf | 4 ++--
.../Resources/xlf/Strings.zh-Hant.xlf | 4 ++--
.../System/Windows/Input/Command/RoutedCommand.cs | 2 +-
.../System/Windows/Input/KeyboardDevice.cs | 4 ++--
.../System/Windows/Input/MouseDevice.cs | 4 ++--
.../Input/Stylus/Pointer/PointerStylusDevice.cs | 4 ++--
.../Windows/Input/Stylus/Wisp/WispStylusDevice.cs | 4 ++--
.../System/Windows/Input/TouchDevice.cs | 2 +-
.../System/Windows/PresentationSource.cs | 11 +++++++----
21 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx
index 35e80020d27..1bf23debef8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx
@@ -1286,7 +1286,7 @@
Value must be of type '{0}' or '{1}'.
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
The length of the ISF data must be greater than zero.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
index 2ecab764064..397de3c1810 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- Prvek {0} není platný typ prvku IInputElement. Platnými typy jsou UIElement nebo ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ Prvek {0} není platný typ prvku IInputElement. Platnými typy jsou UIElement nebo ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
index bfc8135f032..9cb48c2aa84 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- "{0}" ist ein ungültiger Typ für "IInputElement". Erwartet wird "UIElement" oder "ContentElement".
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ "{0}" ist ein ungültiger Typ für "IInputElement". Erwartet wird "UIElement" oder "ContentElement".
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
index aa6b6125804..9aa65e17233 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' no es un tipo válido para IInputElement. Se esperaba UIElement o ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' no es un tipo válido para IInputElement. Se esperaba UIElement o ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
index 72dac76ec60..6206d12b2c4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' n'est pas un type valide pour IInputElement. UIElement ou ContentElement attendu.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' n'est pas un type valide pour IInputElement. UIElement ou ContentElement attendu.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
index edd3a2c0192..758ee1ed6fc 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' non è un tipo valido per IInputElement. Previsto UIElement o ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' non è un tipo valido per IInputElement. Previsto UIElement o ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
index 5721942a23d..8e4e2fcd3c0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' は、IInputElement に対して有効な型ではありません。UIElement または ContentElement を使用してください。
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' は、IInputElement に対して有効な型ではありません。UIElement または ContentElement を使用してください。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
index f2ece6a9f4f..eb8e348f43b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}'은(는) IInputElement에 사용할 수 없습니다. UIElement 또는 ContentElement가 필요합니다.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}'은(는) IInputElement에 사용할 수 없습니다. UIElement 또는 ContentElement가 필요합니다.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
index 3a154ba4e67..195e8c177c2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- Element „{0}” nie jest prawidłowym typem dla elementu IInputElement. Oczekiwany typ UIElement lub ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ Element „{0}” nie jest prawidłowym typem dla elementu IInputElement. Oczekiwany typ UIElement lub ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
index 57f6d99241b..868be9d6c8f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' não é um tipo válido para IInputElement. Era esperado UIElement ou ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' não é um tipo válido para IInputElement. Era esperado UIElement ou ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
index c53d509f9d6..6e150629ec1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- "{0}" не является допустимым типом для IInputElement. Ожидается UIElement или ContentElement.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ "{0}" не является допустимым типом для IInputElement. Ожидается UIElement или ContentElement.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
index bf32b35bc3e..a90574f07e7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' IInputElement için geçerli bir tür değil. UIElement veya ContentElement bekleniyor.
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' IInputElement için geçerli bir tür değil. UIElement veya ContentElement bekleniyor.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
index c80406c8bf9..f708f947326 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- “{0}”不是 IInputElement 的有效类型。应为 UIElement 或 ContentElement。
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ “{0}”不是 IInputElement 的有效类型。应为 UIElement 或 ContentElement。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
index 8686c2925b0..981e92301bc 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
@@ -1908,8 +1908,8 @@
- '{0}' is not a valid type for IInputElement. UIElement or ContentElement expected.
- '{0}' 不是有效的 IInputElement 型別。應該是 UIElement 或 ContentElement。
+ '{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
+ '{0}' 不是有效的 IInputElement 型別。應該是 UIElement 或 ContentElement。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
index a7c543e83fb..e216cf7573f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
@@ -171,7 +171,7 @@ public bool CanExecute(object parameter, IInputElement target)
/// true if the command can be executed, false otherwise.
internal bool CriticalCanExecute(object parameter, IInputElement target, bool trusted, out bool continueRouting)
{
- // We only support UIElement, ContentElement, and UIElement3D
+ // We only support UIElement, ContentElement and UIElement3D
if ((target != null) && !InputElement.IsValid(target))
{
throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, target.GetType()));
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
index df63f9cbd89..98652fe9098 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
@@ -139,7 +139,7 @@ public IInputElement Focus(IInputElement element)
DependencyObject oFocus = null;
bool forceToNullIfFailed = false;
- // Validate that if elt is either a UIElement or a ContentElement.
+ // Validate that elt is either a UIElement, a ContentElement or a UIElement3D.
if(element != null)
{
if(!InputElement.IsValid(element))
@@ -521,7 +521,7 @@ private void ChangeFocus(DependencyObject focus, int timestamp)
// The preferred input methods should be applied after Cicero TIP gots SetFocus callback.
InputMethod.Current.GotKeyboardFocus(_focus);
- //Could be also built-in into IsKeyboardFocused_Changed static on UIElement and ContentElement
+ //Could be also built-in into IsKeyboardFocused_Changed static on UIElement, ContentElement and UIElement3D.
//However the Automation likes to go immediately back on us so it would be better be last one...
AutomationPeer.RaiseFocusChangedEventHelper((IInputElement)_focus);
}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
index 4559f01778c..d28a0b56451 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
@@ -328,7 +328,7 @@ public bool Capture(IInputElement element, CaptureMode captureMode)
element = null;
}
- // Validate that elt is either a UIElement or a ContentElement
+ // Validate that elt is either a UIElement, a ContentElement or a UIElement3D.
DependencyObject eltDO = element as DependencyObject;
if (eltDO != null && !InputElement.IsValid(element))
{
@@ -579,7 +579,7 @@ public Point GetPosition(IInputElement relativeTo)
{
// VerifyAccess();
- // Validate that relativeTo is either a UIElement or a ContentElement
+ // Validate that relativeTo is either a UIElement, a ContentElement or a UIElement3D.
if (relativeTo != null && !InputElement.IsValid(relativeTo))
{
throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, relativeTo.GetType()));
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
index a684599e2b4..e31249922ed 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
@@ -570,7 +570,7 @@ internal override bool Capture(IInputElement element, CaptureMode captureMode)
element = null;
}
- // Validate that element is either a UIElement or a ContentElement
+ // Validate that element is either a UIElement, a ContentElement or a UIElement3D.
DependencyObject doStylusCapture = element as DependencyObject;
if (doStylusCapture != null && !InputElement.IsValid(element))
@@ -730,7 +730,7 @@ internal override Point GetPosition(IInputElement relativeTo)
{
VerifyAccess();
- // Validate that relativeTo is either a UIElement or a ContentElement
+ // Validate that relativeTo is either a UIElement, a ContentElement or a UIElement3D.
if (relativeTo != null && !InputElement.IsValid(relativeTo))
{
throw new InvalidOperationException();
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
index 1f3125ee99d..11bd3a698a7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
@@ -273,7 +273,7 @@ internal override bool Capture(IInputElement element, CaptureMode captureMode)
element = null;
}
- // Validate that element is either a UIElement or a ContentElement
+ // Validate that element is either a UIElement, a ContentElement or a UIElement3D.
DependencyObject doStylusCapture = element as DependencyObject;
if (doStylusCapture != null && !InputElement.IsValid(element))
{
@@ -1192,7 +1192,7 @@ internal override Point GetPosition(IInputElement relativeTo)
{
VerifyAccess();
- // Validate that relativeTo is either a UIElement or a ContentElement
+ // Validate that relativeTo is either a UIElement, a ContentElement or a UIElement3D.
if (relativeTo != null && !InputElement.IsValid(relativeTo))
{
throw new InvalidOperationException(SR.Get(SRID.Invalid_IInputElement, relativeTo.GetType()));
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs
index 7067842e0a4..945bae7cfea 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs
@@ -263,7 +263,7 @@ private IInputElement CriticalHitTest(Point point, bool isSynchronize)
private static void EnsureValid(ref IInputElement element)
{
- // We understand UIElements and ContentElements.
+ // We understand UIElements, ContentElements and UIElement3Ds.
// If we are over something else (like a raw visual) find the containing element.
if ((element != null) && !InputElement.IsValid(element))
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
index 41515937df3..2f11cc2145c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
@@ -129,10 +129,10 @@ public static void AddSourceChangedHandler(IInputElement element, SourceChangedE
throw new ArgumentNullException("element");
}
- // Either UIElement or ContentElement
+ // Either UIElement, ContentElement or UIElement3D.
if (!InputElement.IsValid(element))
{
- throw new ArgumentException(SR.Get(SRID.Invalid_IInputElement), "element");
+ throw new ArgumentException(SR.Get(SRID.Invalid_IInputElement, element.GetType()), nameof(element));
}
DependencyObject o = (DependencyObject)element;
@@ -198,9 +198,10 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
throw new ArgumentNullException("e");
}
+ // Either UIElement, ContentElement or UIElement3D.
if (!InputElement.IsValid(e))
{
- throw new ArgumentException(SR.Get(SRID.Invalid_IInputElement), "e");
+ throw new ArgumentException(SR.Get(SRID.Invalid_IInputElement, e.GetType()), nameof(e));
}
DependencyObject o = (DependencyObject)e;
@@ -213,8 +214,10 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven
FrugalObjectList info = null;
EventHandlersStore store;
- // Either UIElement or ContentElement.
+
+ // Either UIElement, ContentElement or UIElement3D.
if (o is UIElement uie)
+
{
uie.RemoveHandler(SourceChangedEvent, handler);
store = uie.EventHandlersStore;
From 93c7f4ba1b8afac6d49d1bdc8ff321a6e0e4761d Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:07:35 -0400
Subject: [PATCH 069/109] Inline VerifyAccess (#4021)
* Inline VerifyAccess
* Use static local function
---
.../WindowsBase/System/Windows/Threading/Dispatcher.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 93efd10e826..df0a1f38eb8 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
@@ -17,6 +17,8 @@
using MS.Internal.WindowsBase; // SecurityHelper
using System.Threading;
using System.ComponentModel; // EditorBrowsableAttribute, BrowsableAttribute
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
// Disabling 1634 and 1691:
// In order to avoid generating warnings about unknown message numbers and
@@ -222,7 +224,13 @@ public void VerifyAccess()
{
if(!CheckAccess())
{
- throw new InvalidOperationException(SR.VerifyAccess);
+ // Used to inline VerifyAccess.
+ [DoesNotReturn]
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ static void ThrowVerifyAccess()
+ => throw new InvalidOperationException(SR.VerifyAccess);
+
+ ThrowVerifyAccess();
}
}
From 43ef49e03394e9879905ac07f8c496cbec8b2fe3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:00:36 +0000
Subject: [PATCH 070/109] Update dependencies from
https://github.com/dotnet/arcade build 20220713.1 (#6796)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3845e93a6ac..9dd1b78c241 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
+ 3895dfc219f7cea2c028164db691389d0b1a73a8
-
+
https://github.com/dotnet/arcade
- bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
+ 3895dfc219f7cea2c028164db691389d0b1a73a8
-
+
https://github.com/dotnet/arcade
- bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
+ 3895dfc219f7cea2c028164db691389d0b1a73a8
-
+
https://github.com/dotnet/arcade
- bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
+ 3895dfc219f7cea2c028164db691389d0b1a73a8
-
+
https://github.com/dotnet/arcade
- bd18f30f71daf7eaaf1d70363c303bd7dfac65a2
+ 3895dfc219f7cea2c028164db691389d0b1a73a8
diff --git a/eng/Versions.props b/eng/Versions.props
index 2256c2a55b1..7db563c18b3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22362.1
- 7.0.0-beta.22362.1
+ 7.0.0-beta.22363.1
+ 7.0.0-beta.22363.1
diff --git a/global.json b/global.json
index 527903918ba..57bf78caf0d 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22362.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22362.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22363.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22363.1"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From 59fa4b1e336f14c072fba1011776f43ced4cbc32 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 14:36:02 +0000
Subject: [PATCH 071/109] Update dependencies from
https://github.com/dotnet/winforms build 20220714.3 (#6797)
[main] 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 9dd1b78c241..1584c7266dd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 5f4891aefe8784c97a84e7805e82f3232ecc5b8b
+ 5c70730ff8edbb3f8ac71501dd3b1dab8520e302
-
+
https://github.com/dotnet/winforms
- 5f4891aefe8784c97a84e7805e82f3232ecc5b8b
+ 5c70730ff8edbb3f8ac71501dd3b1dab8520e302
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7db563c18b3..d0b86d9d98b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22364.1
+ 7.0.0-rc.1.22364.3
From 42ca8085eac7b1b4b7d133270be47dda692f72a5 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Thu, 14 Jul 2022 11:25:44 -0400
Subject: [PATCH 072/109] Fix build when using source generators coming from
NuGet packages. (#6793)
Fixes dotnet/wpf#6792
---
.../src/PresentationBuildTasks/Microsoft.WinFX.targets | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 69112522630..88951d23eb3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -435,6 +435,11 @@
<_IntermediateOutputPathNoTargetFrameworkOrRID>$([System.Text.RegularExpressions.Regex]::Replace($(_IntermediateOutputPathNoTargetFrameworkOrRID), "$(TargetFramework)\\$",, System.Text.RegularExpressions.RegexOptions.IgnoreCase))
+
+
+ <_TemporaryTargetAssemblyAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />
+
+
From 68c8848c2904a237a03b08ba3b76f81ce20d60e2 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com>
Date: Thu, 14 Jul 2022 22:21:27 +0530
Subject: [PATCH 073/109] Fix build when using source generators coming from
NuGet package (#6799)
* Fix build when using source generators coming from NuGet package
---
.../Microsoft.WinFX.targets | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 88951d23eb3..aededb86954 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -435,11 +435,6 @@
<_IntermediateOutputPathNoTargetFrameworkOrRID>$([System.Text.RegularExpressions.Regex]::Replace($(_IntermediateOutputPathNoTargetFrameworkOrRID), "$(TargetFramework)\\$",, System.Text.RegularExpressions.RegexOptions.IgnoreCase))
-
-
- <_TemporaryTargetAssemblyAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />
-
-
@@ -491,6 +486,20 @@
Condition="Exists('%(Fullpath)')" />
+
+
+
+
+
+
+
+
- 7.0.0-rc.1.22364.3
+ 7.0.0-rc.1.22364.5
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
4.6.0-preview4.19176.11
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
- 7.0.0-preview.7.22362.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22363.12
From 7add0fc6ea7096154c748f0e06a5213c843c0a74 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 12:05:33 +0000
Subject: [PATCH 075/109] Update dependencies from
https://github.com/dotnet/winforms build 20220714.7 (#6803)
[main] 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 9d7494b379e..0ecd6ba9c74 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- c25e3e5e554d7e8c436cebd8db41d4d2764d4051
+ 8198e25ea035c0ad053ed4cd0277a36ac6206371
-
+
https://github.com/dotnet/winforms
- c25e3e5e554d7e8c436cebd8db41d4d2764d4051
+ 8198e25ea035c0ad053ed4cd0277a36ac6206371
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index f82a3d561bf..13e5525399d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22364.5
+ 7.0.0-rc.1.22364.7
From 569dfcea0d5aac111247eeebea761524e3969325 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 13:00:52 +0000
Subject: [PATCH 076/109] Update dependencies from
https://github.com/dotnet/arcade build 20220714.1 (#6804)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 +++++++++----------
eng/Versions.props | 4 ++--
eng/common/cross/build-rootfs.sh | 33 ++++++++++++++++++--------------
eng/common/cross/toolchain.cmake | 30 ++++++++++++++++++-----------
global.json | 4 ++--
5 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0ecd6ba9c74..dfd55aa7683 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 3895dfc219f7cea2c028164db691389d0b1a73a8
+ 22e05f347f297e09e9ee58c22e139d2f5f5ec297
-
+
https://github.com/dotnet/arcade
- 3895dfc219f7cea2c028164db691389d0b1a73a8
+ 22e05f347f297e09e9ee58c22e139d2f5f5ec297
-
+
https://github.com/dotnet/arcade
- 3895dfc219f7cea2c028164db691389d0b1a73a8
+ 22e05f347f297e09e9ee58c22e139d2f5f5ec297
-
+
https://github.com/dotnet/arcade
- 3895dfc219f7cea2c028164db691389d0b1a73a8
+ 22e05f347f297e09e9ee58c22e139d2f5f5ec297
-
+
https://github.com/dotnet/arcade
- 3895dfc219f7cea2c028164db691389d0b1a73a8
+ 22e05f347f297e09e9ee58c22e139d2f5f5ec297
diff --git a/eng/Versions.props b/eng/Versions.props
index 13e5525399d..010a94a0a0b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22363.1
- 7.0.0-beta.22363.1
+ 7.0.0-beta.22364.1
+ 7.0.0-beta.22364.1
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 5a59dcff28f..c8540474aa1 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -5,7 +5,7 @@ set -e
usage()
{
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]"
- echo "BuildArch can be: arm(default), armel, arm64, x86"
+ echo "BuildArch can be: arm(default), armel, arm64, x86, x64"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
echo " for FreeBSD can be: freebsd12, freebsd13"
echo " for illumos can be: illumos."
@@ -21,6 +21,9 @@ __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
__InitialDir=$PWD
__BuildArch=arm
__AlpineArch=armv7
+__FreeBSDArch=arm
+__FreeBSDMachineArch=armv7
+__IllumosArch=arm7
__QEMUArch=arm
__UbuntuArch=armhf
__UbuntuRepo="http://ports.ubuntu.com/"
@@ -115,6 +118,8 @@ while :; do
__UbuntuArch=arm64
__AlpineArch=aarch64
__QEMUArch=aarch64
+ __FreeBSDArch=arm64
+ __FreeBSDMachineArch=aarch64
;;
armel)
__BuildArch=armel
@@ -140,6 +145,14 @@ while :; do
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
unset __LLDB_Package
;;
+ x64)
+ __BuildArch=x64
+ __UbuntuArch=amd64
+ __FreeBSDArch=amd64
+ __FreeBSDMachineArch=amd64
+ __illumosArch=x86_64
+ __UbuntuRepo=
+ ;;
x86)
__BuildArch=x86
__UbuntuArch=i386
@@ -205,11 +218,6 @@ while :; do
__LLDB_Package="liblldb-6.0-dev"
;;
tizen)
- if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then
- echo "Tizen is available only for arm, armel, arm64 and x86."
- usage;
- exit 1;
- fi
__CodeName=
__UbuntuRepo=
__Tizen=tizen
@@ -228,19 +236,16 @@ while :; do
;;
freebsd12)
__CodeName=freebsd
- __BuildArch=x64
__SkipUnmount=1
;;
freebsd13)
__CodeName=freebsd
__FreeBSDBase="13.0-RELEASE"
__FreeBSDABI="13"
- __BuildArch=x64
__SkipUnmount=1
;;
illumos)
__CodeName=illumos
- __BuildArch=x64
__SkipUnmount=1
;;
--skipunmount)
@@ -312,8 +317,8 @@ if [[ "$__CodeName" == "alpine" ]]; then
elif [[ "$__CodeName" == "freebsd" ]]; then
mkdir -p $__RootfsDir/usr/local/etc
JOBS="$(getconf _NPROCESSORS_ONLN)"
- wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
- echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
+ wget -O - https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
+ echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
mkdir -p $__RootfsDir/tmp
# get and build package manager
@@ -335,7 +340,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
echo "Building binutils. Please wait.."
wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
mkdir build-binutils && cd build-binutils
- ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir"
+ ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
make -j "$JOBS" && make install && cd ..
echo "Building gcc. Please wait.."
wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
@@ -345,7 +350,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
CFLAGS_FOR_TARGET="-fPIC"
export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
mkdir build-gcc && cd build-gcc
- ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
+ ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
--disable-libquadmath-support --disable-shared --enable-tls
make -j "$JOBS" && make install && cd ..
@@ -353,7 +358,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
if [[ "$__UseMirror" == 1 ]]; then
BaseUrl=http://pkgsrc.smartos.skylime.net
fi
- BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All
+ BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All
echo "Downloading dependencies."
read -ra array <<<"$__IllumosPackages"
for package in "${array[@]}"; do
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index eaeeab38fa1..d5dfc13504b 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -48,11 +48,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
set(CMAKE_SYSTEM_PROCESSOR aarch64)
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
set(TOOLCHAIN "aarch64-alpine-linux-musl")
- else()
+ elseif(LINUX)
set(TOOLCHAIN "aarch64-linux-gnu")
- endif()
- if(TIZEN)
- set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+ if(TIZEN)
+ set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+ endif()
+ elseif(FREEBSD)
+ set(triple "aarch64-unknown-freebsd12")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
@@ -66,12 +68,18 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
if(TIZEN)
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
endif()
-elseif (FREEBSD)
- set(CMAKE_SYSTEM_PROCESSOR "x86_64")
- set(triple "x86_64-unknown-freebsd12")
-elseif (ILLUMOS)
- set(CMAKE_SYSTEM_PROCESSOR "x86_64")
- set(TOOLCHAIN "x86_64-illumos")
+elseif(TARGET_ARCH_NAME STREQUAL "x64")
+ set(CMAKE_SYSTEM_PROCESSOR x86_64)
+ if(LINUX)
+ set(TOOLCHAIN "x86_64-linux-gnu")
+ if(TIZEN)
+ set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
+ endif()
+ elseif(FREEBSD)
+ set(triple "x86_64-unknown-freebsd12")
+ elseif(ILLUMOS)
+ set(TOOLCHAIN "x86_64-illumos")
+ endif()
else()
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!")
endif()
@@ -218,7 +226,7 @@ endif()
# Specify compile options
-if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/global.json b/global.json
index 57bf78caf0d..757d1c7f8f3 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22363.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22363.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22364.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22364.1"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From 4dbc072e3f2c30930a7a9ff9dab9114660ae2b88 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 14:21:06 +0000
Subject: [PATCH 077/109] Update dependencies from
https://github.com/dotnet/winforms build 20220715.2 (#6805)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22363.12 to 7.0.0-rc.1.22364.7 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dfd55aa7683..a22ed8e74d5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 8198e25ea035c0ad053ed4cd0277a36ac6206371
+ 91f3f2395f156265bdd8f2d8e78361f786015cf8
-
+
https://github.com/dotnet/winforms
- 8198e25ea035c0ad053ed4cd0277a36ac6206371
+ 91f3f2395f156265bdd8f2d8e78361f786015cf8
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
-
+
https://github.com/dotnet/runtime
- aecdcca3c1ccc6d1dd3a9fa38add097570445dac
+ d6af9762760a6c6f405c5950d99b55b47f275502
diff --git a/eng/Versions.props b/eng/Versions.props
index 010a94a0a0b..108dec8a0aa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22365.2
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
- 7.0.0-rc.1.22363.12
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22364.7
From 1c273a9daf530aa3ddc89b6a80f454dc72be729f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 16 Jul 2022 12:47:53 +0000
Subject: [PATCH 078/109] Update dependencies from
https://github.com/dotnet/arcade build 20220715.4 (#6807)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a22ed8e74d5..e73cbb94eca 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 22e05f347f297e09e9ee58c22e139d2f5f5ec297
+ f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
- 22e05f347f297e09e9ee58c22e139d2f5f5ec297
+ f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
- 22e05f347f297e09e9ee58c22e139d2f5f5ec297
+ f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
- 22e05f347f297e09e9ee58c22e139d2f5f5ec297
+ f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
- 22e05f347f297e09e9ee58c22e139d2f5f5ec297
+ f7951a64db920ea599bd6819065b661d88d26b23
diff --git a/eng/Versions.props b/eng/Versions.props
index 108dec8a0aa..d9ecaea8b1e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22364.1
- 7.0.0-beta.22364.1
+ 7.0.0-beta.22365.4
+ 7.0.0-beta.22365.4
diff --git a/global.json b/global.json
index 757d1c7f8f3..c94d73414ff 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22364.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22364.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22365.4",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22365.4"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From dfa3a0edb9c7fc8ef31d3690c8cc59bb6f792397 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 16 Jul 2022 14:18:08 +0000
Subject: [PATCH 079/109] Update dependencies from
https://github.com/dotnet/winforms build 20220716.1 (#6808)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22364.7 to 7.0.0-rc.1.22365.6 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e73cbb94eca..3b445afa466 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 91f3f2395f156265bdd8f2d8e78361f786015cf8
+ b410d98eeac9680cb81241031341f15c2b74ea3f
-
+
https://github.com/dotnet/winforms
- 91f3f2395f156265bdd8f2d8e78361f786015cf8
+ b410d98eeac9680cb81241031341f15c2b74ea3f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
-
+
https://github.com/dotnet/runtime
- d6af9762760a6c6f405c5950d99b55b47f275502
+ 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
diff --git a/eng/Versions.props b/eng/Versions.props
index d9ecaea8b1e..52545ef7dbe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22365.2
+ 7.0.0-rc.1.22366.1
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
- 7.0.0-rc.1.22364.7
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22365.6
From adb7e361df4db842c3e825b7fce785b0d56ea591 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 17 Jul 2022 23:21:20 +0000
Subject: [PATCH 080/109] Update dependencies from
https://github.com/dotnet/winforms build 20220717.2 (#6809)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22365.6 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3b445afa466..a1bb3e69144 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- b410d98eeac9680cb81241031341f15c2b74ea3f
+ 57178eedc3c3d8784e21506b381b81aa8ecb5fa8
-
+
https://github.com/dotnet/winforms
- b410d98eeac9680cb81241031341f15c2b74ea3f
+ 57178eedc3c3d8784e21506b381b81aa8ecb5fa8
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
-
+
https://github.com/dotnet/runtime
- 55bf5d8a28f4a8c519dbc6edfc1d3d64519f530f
+ 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
diff --git a/eng/Versions.props b/eng/Versions.props
index 52545ef7dbe..a468ddc5e1c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22366.1
+ 7.0.0-rc.1.22367.2
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
- 7.0.0-rc.1.22365.6
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22366.5
From a7f2e29899d9faf8182ad462d3615f800871657e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 07:32:47 +0000
Subject: [PATCH 081/109] Update dependencies from
https://github.com/dotnet/winforms build 20220717.3 (#6813)
[main] 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 a1bb3e69144..428df10db6d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 57178eedc3c3d8784e21506b381b81aa8ecb5fa8
+ 045d13c9f4bb90580687705b9506959249b80e69
-
+
https://github.com/dotnet/winforms
- 57178eedc3c3d8784e21506b381b81aa8ecb5fa8
+ 045d13c9f4bb90580687705b9506959249b80e69
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index a468ddc5e1c..c6405e28110 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22367.2
+ 7.0.0-rc.1.22367.3
From 3e3b31ea76a0df3d1a539fcbc4a1dc436ae53ab0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 09:59:12 +0000
Subject: [PATCH 082/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.1 (#6814)
[main] 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 428df10db6d..01d23630c0d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 045d13c9f4bb90580687705b9506959249b80e69
+ f3089945a4b5cfd0eb66060de83be6ce8eb76071
-
+
https://github.com/dotnet/winforms
- 045d13c9f4bb90580687705b9506959249b80e69
+ f3089945a4b5cfd0eb66060de83be6ce8eb76071
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index c6405e28110..4994b0f2582 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22367.3
+ 7.0.0-rc.1.22368.1
From cb4d92eb7dfb5ae36f9f7575c8f44bc1130e5e1e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 13:01:40 +0000
Subject: [PATCH 083/109] Update dependencies from
https://github.com/dotnet/arcade build 20220717.1 (#6815)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 10 +++++-----
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 01d23630c0d..b0169b25743 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,23 +75,23 @@
-
+
https://github.com/dotnet/arcade
f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
f7951a64db920ea599bd6819065b661d88d26b23
-
+
https://github.com/dotnet/arcade
f7951a64db920ea599bd6819065b661d88d26b23
diff --git a/eng/Versions.props b/eng/Versions.props
index 4994b0f2582..fc3c25b7259 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22365.4
- 7.0.0-beta.22365.4
+ 7.0.0-beta.22367.1
+ 7.0.0-beta.22367.1
diff --git a/global.json b/global.json
index c94d73414ff..c4efa029bce 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22365.4",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22365.4"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From f5c5469a67aeafb9548b2b6300f0601413685dd9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:21:24 +0000
Subject: [PATCH 084/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.2 (#6816)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22366.5 to 7.0.0-rc.1.22367.4 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b0169b25743..20d659eafa0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- f3089945a4b5cfd0eb66060de83be6ce8eb76071
+ 4a7dd5506717b4329a39c31d6fe31fc6114109d4
-
+
https://github.com/dotnet/winforms
- f3089945a4b5cfd0eb66060de83be6ce8eb76071
+ 4a7dd5506717b4329a39c31d6fe31fc6114109d4
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
-
+
https://github.com/dotnet/runtime
- 072eda8d6b2c24ba4c7691a780546a2d6691b1a4
+ aafa91036e1efd3d4dcb67eeb261cb6d8f774685
diff --git a/eng/Versions.props b/eng/Versions.props
index fc3c25b7259..1ac478deff8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22368.1
+ 7.0.0-rc.1.22368.2
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
- 7.0.0-rc.1.22366.5
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22367.4
From 64471f3338d791708d5674290b1cd0ac50d94910 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 03:58:32 +0000
Subject: [PATCH 085/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.5 (#6818)
[main] 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 20d659eafa0..ac2985c787f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 4a7dd5506717b4329a39c31d6fe31fc6114109d4
+ 773655cb259fbbb61c9835e748931af4aad5ad02
-
+
https://github.com/dotnet/winforms
- 4a7dd5506717b4329a39c31d6fe31fc6114109d4
+ 773655cb259fbbb61c9835e748931af4aad5ad02
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ac478deff8..de50e19b6ec 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22368.2
+ 7.0.0-rc.1.22368.5
From 853c1cea1ffb8faa6b27fa6762ae4ba6e9155e81 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 05:35:59 +0000
Subject: [PATCH 086/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.6 (#6819)
[main] 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 ac2985c787f..c657c75b1e8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 773655cb259fbbb61c9835e748931af4aad5ad02
+ cc7abf13047404ea935a2d57c71e6badc3aaece4
-
+
https://github.com/dotnet/winforms
- 773655cb259fbbb61c9835e748931af4aad5ad02
+ cc7abf13047404ea935a2d57c71e6badc3aaece4
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index de50e19b6ec..8caaff6bcc0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22368.5
+ 7.0.0-rc.1.22368.6
From 5d323aa4f334a1bc69561755d3f63538d8a5ac51 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 06:02:29 +0000
Subject: [PATCH 087/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.7 (#6820)
[main] 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 c657c75b1e8..e61d909594b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- cc7abf13047404ea935a2d57c71e6badc3aaece4
+ d58958601b4f6fb33566fdd6207a80264e6cd4ca
-
+
https://github.com/dotnet/winforms
- cc7abf13047404ea935a2d57c71e6badc3aaece4
+ d58958601b4f6fb33566fdd6207a80264e6cd4ca
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 8caaff6bcc0..4dfdd50c0c9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22368.6
+ 7.0.0-rc.1.22368.7
From 70aca0cdd1c9956cccaedf1137efb7a0ab73831e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 07:47:08 +0000
Subject: [PATCH 088/109] Update dependencies from
https://github.com/dotnet/winforms build 20220718.9 (#6821)
[main] 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 e61d909594b..c6bc9be5dc2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- d58958601b4f6fb33566fdd6207a80264e6cd4ca
+ 7c09c537c9d24522c2ec881af1b3133de17c39dd
-
+
https://github.com/dotnet/winforms
- d58958601b4f6fb33566fdd6207a80264e6cd4ca
+ 7c09c537c9d24522c2ec881af1b3133de17c39dd
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 4dfdd50c0c9..9bf36e2cc78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22368.7
+ 7.0.0-rc.1.22368.9
From 805abb61ee46fb95c281bd493bb44846b1de914a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 13:10:58 +0000
Subject: [PATCH 089/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.1 (#6822)
[main] 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 c6bc9be5dc2..f00cfd5de65 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 7c09c537c9d24522c2ec881af1b3133de17c39dd
+ 82d6c02007181d54272e282c647ce7081017e889
-
+
https://github.com/dotnet/winforms
- 7c09c537c9d24522c2ec881af1b3133de17c39dd
+ 82d6c02007181d54272e282c647ce7081017e889
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 9bf36e2cc78..9e2f74a5768 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22368.9
+ 7.0.0-rc.1.22369.1
From 2627f9eefbde6a6eb63cfc8306be8a00e9046a62 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 13:12:52 +0000
Subject: [PATCH 090/109] Update dependencies from
https://github.com/dotnet/arcade build 20220718.5 (#6823)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 4 ++--
global.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f00cfd5de65..7ff2811b7fc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- f7951a64db920ea599bd6819065b661d88d26b23
+ 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
-
+
https://github.com/dotnet/arcade
- f7951a64db920ea599bd6819065b661d88d26b23
+ 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
-
+
https://github.com/dotnet/arcade
- f7951a64db920ea599bd6819065b661d88d26b23
+ 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
-
+
https://github.com/dotnet/arcade
- f7951a64db920ea599bd6819065b661d88d26b23
+ 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
-
+
https://github.com/dotnet/arcade
- f7951a64db920ea599bd6819065b661d88d26b23
+ 6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0
diff --git a/eng/Versions.props b/eng/Versions.props
index 9e2f74a5768..53d1ff4df8c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22367.1
- 7.0.0-beta.22367.1
+ 7.0.0-beta.22368.5
+ 7.0.0-beta.22368.5
diff --git a/global.json b/global.json
index c4efa029bce..d981122403d 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From fa512868ac58bd376fec766b717be8712370d9a5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 14:50:47 +0000
Subject: [PATCH 091/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.2 (#6824)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22368.8 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7ff2811b7fc..dbd2f8d442c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 82d6c02007181d54272e282c647ce7081017e889
+ f7adf27a6dfa180a3c7c34395f865042ee730756
-
+
https://github.com/dotnet/winforms
- 82d6c02007181d54272e282c647ce7081017e889
+ f7adf27a6dfa180a3c7c34395f865042ee730756
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
-
+
https://github.com/dotnet/runtime
- aafa91036e1efd3d4dcb67eeb261cb6d8f774685
+ 9ad302604c492522b4697aedc2ffea42fa53d08f
diff --git a/eng/Versions.props b/eng/Versions.props
index 53d1ff4df8c..7c4c5748953 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22369.1
+ 7.0.0-rc.1.22369.2
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
- 7.0.0-rc.1.22367.4
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22368.8
From cc4406c632f850048b502adc6c99696a535a7a36 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 17:46:43 +0000
Subject: [PATCH 092/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.4 (#6825)
[main] 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 dbd2f8d442c..241b02ed8f5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- f7adf27a6dfa180a3c7c34395f865042ee730756
+ 6c9f0dbbc5a444b7cb72d5452fc1226865c3773a
-
+
https://github.com/dotnet/winforms
- f7adf27a6dfa180a3c7c34395f865042ee730756
+ 6c9f0dbbc5a444b7cb72d5452fc1226865c3773a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 7c4c5748953..3a41e13ad21 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22369.2
+ 7.0.0-rc.1.22369.4
From ab8e3f026bc4319aae72e0b3b0383acbc500aeef Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 21:16:29 +0000
Subject: [PATCH 093/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.5 (#6826)
[main] 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 241b02ed8f5..26cdb3d2f70 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 6c9f0dbbc5a444b7cb72d5452fc1226865c3773a
+ 03806f4553a4ea33955c7e29b81db941c43d3891
-
+
https://github.com/dotnet/winforms
- 6c9f0dbbc5a444b7cb72d5452fc1226865c3773a
+ 03806f4553a4ea33955c7e29b81db941c43d3891
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 3a41e13ad21..153877ba752 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22369.4
+ 7.0.0-rc.1.22369.5
From b37df4bfe888c8700d2029ca0fcaa0bc761d1307 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 01:39:18 +0000
Subject: [PATCH 094/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.7 (#6830)
[main] 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 26cdb3d2f70..1ab516c5d1c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 03806f4553a4ea33955c7e29b81db941c43d3891
+ 0b753c1876983d26713b87f2f62ed64e6b138d27
-
+
https://github.com/dotnet/winforms
- 03806f4553a4ea33955c7e29b81db941c43d3891
+ 0b753c1876983d26713b87f2f62ed64e6b138d27
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 153877ba752..899288dbccb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22369.5
+ 7.0.0-rc.1.22369.7
From 6fa1bfcabfa72bd8689e82b4c7e507551cc81418 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 02:18:52 +0000
Subject: [PATCH 095/109] Update dependencies from
https://github.com/dotnet/winforms build 20220719.8 (#6831)
[main] 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 1ab516c5d1c..8d939c21005 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
-
+
https://github.com/dotnet/winforms
- 0b753c1876983d26713b87f2f62ed64e6b138d27
+ 07747de084aa403be88bf309baf9b3516e00b76a
-
+
https://github.com/dotnet/winforms
- 0b753c1876983d26713b87f2f62ed64e6b138d27
+ 07747de084aa403be88bf309baf9b3516e00b76a
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 899288dbccb..f8f5023aa1b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,7 +21,7 @@
- 7.0.0-rc.1.22369.7
+ 7.0.0-rc.1.22369.8
From efe64ad243d3903d0c2e7ae4e63ab9440c0b5845 Mon Sep 17 00:00:00 2001
From: dotnet bot
Date: Tue, 19 Jul 2022 21:25:57 -0700
Subject: [PATCH 096/109] Localized file check-in by OneLocBuild Task (#4794)
From f79cdf4e0285f88b9878d51f8a6cc25570b5e258 Mon Sep 17 00:00:00 2001
From: dotnet bot
Date: Tue, 19 Jul 2022 21:26:31 -0700
Subject: [PATCH 097/109] Localized file check-in by OneLocBuild Task: Build
definition ID 217: Build ID 1890847 (#5093)
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609578
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609578
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609662
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609662
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609994
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1609994
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1610760
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1610760
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1611498
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1611498
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1612279
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1612279
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613066
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613066
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613212
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613212
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613354
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613354
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613594
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613594
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613870
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1613870
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614012
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614012
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614619
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614619
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614744
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1614744
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1616131
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1616131
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1616753
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1616753
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1617948
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1617948
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1620651
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1620651
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1621502
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1621502
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1621953
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1621953
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1622587
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1622587
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1622653
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1622653
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623512
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623512
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623687
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623687
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623851
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623851
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623894
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623894
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623991
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1623991
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1626400
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1626400
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1626674
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1626674
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1627096
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1627096
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1627374
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1627374
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1628139
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1628139
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1629313
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1629313
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1629453
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1629453
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1630942
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1630942
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1632438
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1632438
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1632536
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1632536
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1634988
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1634988
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635047
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635047
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635613
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635613
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635676
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1635676
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1636636
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1636636
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1636971
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1636971
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1637157
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1637157
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640201
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640201
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640581
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640581
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640702
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1640702
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642207
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642207
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642817
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642817
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642982
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1642982
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1644781
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1644781
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1645243
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1645243
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1645360
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1645360
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648262
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648262
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648312
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648312
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648357
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648357
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648453
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648453
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648996
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1648996
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1649177
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1649177
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1650917
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1650917
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1650961
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1650961
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1651289
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1651289
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1651426
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1651426
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652421
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652421
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652758
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652758
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652996
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1652996
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653436
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653436
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653492
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653492
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653974
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1653974
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1654589
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1654589
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1655823
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1655823
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1655991
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1655991
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1656126
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1656126
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1657182
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1657182
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1657408
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1657408
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1659539
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1659539
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663220
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663220
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663536
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663536
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663652
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1663652
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1665289
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1665289
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1667415
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1667415
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1668362
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1668362
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1670451
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1670451
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1671974
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1671974
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1675430
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1675430
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1675874
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1675874
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1679436
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1679436
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1680032
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1680032
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1682039
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1682039
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1683847
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1683847
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1684430
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1684430
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1685732
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1685732
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687269
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687269
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687331
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687331
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687859
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1687859
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689465
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689465
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689556
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689556
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689613
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1689613
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690026
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690026
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690074
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690074
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690410
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690410
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690552
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1690552
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1692719
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1692719
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1694892
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1694892
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1695032
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1695032
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1695539
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1695539
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698058
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698058
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698120
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698120
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698170
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1698170
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1699797
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1699797
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1700073
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1700073
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1700591
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1700591
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1702245
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1702245
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1703802
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1703802
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1703915
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1703915
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704223
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704223
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704381
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704381
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704633
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1704633
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706109
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706109
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706304
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706304
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706377
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706377
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706527
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1706527
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1715166
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1880553
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1885372
* Localized file check-in by OneLocBuild Task: Build definition ID 217: Build ID 1886570
Co-authored-by: Dipesh Kumar
---
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 4 ++--
.../.template.config/localize/templatestrings.pt-BR.json | 2 +-
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.cs.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.de.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.es.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.fr.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.it.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.ja.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.ko.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.pl.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.ru.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.tr.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf | 2 +-
.../src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf | 2 +-
.../src/PresentationFramework/Resources/xlf/Strings.de.xlf | 2 +-
.../src/PresentationFramework/Resources/xlf/Strings.ko.xlf | 2 +-
.../src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf | 2 +-
.../src/PresentationFramework/Resources/xlf/Strings.tr.xlf | 2 +-
113 files changed, 121 insertions(+), 121 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 3b7baba90cc..46948aa9a27 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 ab1db56bf03..fd8b6a00130 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 27d62c65057..1f4b0ac6f17 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 a9d62ecd55f..cf9c57d928b 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 60bf97bf3b2..0e56c0c1265 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
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 905818f87a6..addb937c29a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
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 df31aebff1d..9ba83c87071 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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.",
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 c8008539ba4..f833cf34785 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 db47c4b64d3..381bf3c0132 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
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 69a21107780..983fe0d4960 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 7e2fd106682..d6170159e28 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
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 f750a07101d..5e80eb2bd92 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
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 ec757526a6b..78898be2743 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 f839a341d25..727ea94e8ed 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 aeee8387122..a40d2106975 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 0ef0b10b636..bc0aa6ec655 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 ed2295014de..8492fab5ea3 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
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 a41967ae793..10844e16187 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
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 d093e42a55b..b0e7931c5ae 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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\"",
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 0ff77298b23..6021b2379c5 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 d7f04867fd2..f4176538127 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
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 38d233ce183..54b878dd7df 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 12a4c75b3fd..26bf3676fc9 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"postActions/restore/description": "还原此项目所需的 NuGet 包。",
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 b3c6f698d0b..30992b8db51 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"postActions/restore/description": "還原此專案所需的 NuGet 套件。",
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 d50c613cb41..964fec81712 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 0af9cd63a45..0d530738071 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 bc4fea6f343..cc2b050cb19 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 0d75e62b6b9..b0fb32a0eb3 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 87c20e1c14b..7deea4951dd 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
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 16e8155f693..1be3a38edc2 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
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 50fccddc9a3..6e465e16a34 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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.",
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 4f4d5bad290..46de401cda2 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 f1187a85b3e..e24118fe64e 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
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 2615e977282..ed62edaf46a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 d07010e0803..ab2c1f0a7f7 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
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 0eeddc2b484..0a0afde2f29 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
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 161313cd455..fc247b70002 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 6f6bc81addc..7b5984c2076 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 56face1b40b..a2b6781e85c 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 42fb7ad05a0..a1ea27e7fa1 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 66168807994..6f18cd18fcd 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
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 fbbd6c8fba8..ce7d1ab5be3 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
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 9ccc310264b..9ae770c9639 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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\"",
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 978f3265f15..0224e4d2dff 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 06921a39c25..6ab01d08d4a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
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 a78f67085e8..e2adba9899c 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 2bbb8ee3ada..5aac157051d 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"postActions/restore/description": "还原此项目所需的 NuGet 包。",
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 d1a997ec67d..cbcaf2de1c3 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"postActions/restore/description": "還原此專案所需的 NuGet 套件。",
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 7611bdb4d92..77377b53377 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 a19961f34b3..2d4b59ba675 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 792f68113f5..5d14f2a560f 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 b9d8c48a358..52486c81409 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 2862e6bacc2..d5df72f733b 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
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 155b882e70b..1a51f0a3f6a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
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 75c8169eabd..a0042e7f5ea 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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.",
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 fdbef704db0..6fa7f77ba0b 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 eea08b7b308..cceba9d32c5 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
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 dbccc3534a5..bf545a95d26 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 60af250f98d..a45815a9e5a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
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 18056867ff5..4d972761636 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
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 5897a9a8a88..840a010bad9 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 96616961d08..5fdcaf40490 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 d1822c7dedb..d4d249fbf4e 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 070af8eca00..3dbb6c4b1db 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 a2b035cf95a..09795946773 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
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 46c1d65d4eb..260cbbb6884 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
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 b89fa565586..dacdf2c21ab 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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\"",
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 401d304aea7..6f043344266 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 4f19f7b7f90..d39700ce97b 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
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 867d59e49f2..04b276c5727 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 6a71a9adeb5..bfaefb3bae5 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"postActions/restore/description": "还原此项目所需的 NuGet 包。",
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 cb53ca03ae7..8b8dfc2659f 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"postActions/restore/description": "還原此專案所需的 NuGet 套件。",
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 8fcbce039dd..6b57c065786 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 d9a136b3f0a..f23dd893788 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 6f79ac4dcac..8164acd62fb 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 60a8a58b102..49ebb0e7863 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 699cebf83f1..af01c4b751d 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"symbols/Nullable/description": "このプロジェクトの null 許容参照型を有効にするかどうか。",
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 60d8982240e..f13db39c99e 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"symbols/Nullable/description": "이 프로젝트에 대해 nullable 참조 형식을 사용할지 여부를 지정합니다.",
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 fe59c722f25..6e8254a299a 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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.",
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 2ce949496c5..9095a503d6a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 e472e84ea15..c208448595a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"symbols/Nullable/description": "Следует ли включить ссылочные типы, допускающие значение null, для этого проекта.",
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 4c560ff4f6c..a18e4924ed6 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 57681189336..c8c2f89cc6b 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"symbols/Nullable/description": "是否为此项目启用可为 null 的引用类型。",
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 6a21de7efdd..4319ff33943 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"symbols/Nullable/description": "是否要啟用此專案的可 null 參考類型。",
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 67716f45631..2cf48746c72 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cílový net7.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.",
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 b17f98f24e5..83cfed3de0a 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Objetivo net7.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.",
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 43fb26e816a..dbd549ddb2f 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Cible net7.0",
"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.",
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 b9995234a5f..b9f6221c4c6 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Destinazione net7.0",
"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.",
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 7cdf63be682..6c4074f4794 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "ターゲット net7.0",
"symbols/langVersion/description": "作成されたプロジェクト ファイルで langVersion を設定します",
"symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
"postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
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 1e42053745a..2e0f3b8c4c9 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "대상 net7.0",
"symbols/langVersion/description": "만든 프로젝트 파일의 langVersion를 설정합니다",
"symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
"postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
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 40575335bda..3512b403dea 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
@@ -8,8 +8,8 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
- "symbols/langVersion/description": "Ustawia langVersion w\u00A0utworzonym pliku projektu",
+ "symbols/Framework/choices/net7.0/description": "Docelowe środowisko net7.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\"",
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 6585de82c30..4a584d53239 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Alvo .NET7.0",
"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.",
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 fab54dad00b..cd716620e81 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Целевая версия net7.0",
"symbols/langVersion/description": "Задает свойство langVersion в созданном файле проекта",
"symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
"postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
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 52cd664f588..c16833c3efa 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "Hedef net7.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.",
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 ffa8675ab95..9b503c9c700 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目标 net7.0",
"symbols/langVersion/description": "在创建的项目文件中设置 langVersion",
"symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
"postActions/restore/description": "还原此项目所需的 NuGet 包。",
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 a730d40c23d..b2db4fa6225 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
@@ -8,7 +8,7 @@
"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/Framework/choices/net7.0/description": "Target net7.0",
+ "symbols/Framework/choices/net7.0/description": "目標 net7.0",
"symbols/langVersion/description": "在建立的專案檔中設定 langVersion",
"symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
"postActions/restore/description": "還原此專案所需的 NuGet 套件。",
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
index 397de3c1810..de9da8bc47c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- Prvek {0} není platný typ prvku IInputElement. Platnými typy jsou UIElement nebo ContentElement.
+ Prvek {0} není platný typ pro IInputElement. Platnými typy jsou UIElement, ContentElement nebo UIElement3D.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
index 9cb48c2aa84..c48bf7d269f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- "{0}" ist ein ungültiger Typ für "IInputElement". Erwartet wird "UIElement" oder "ContentElement".
+ '{0}' ist kein gültiger Typ für IInputElement. UIElement, ContentElement oder UIElement3D erwartet.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
index 9aa65e17233..0a19432612c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' no es un tipo válido para IInputElement. Se esperaba UIElement o ContentElement.
+ "{0}" no es un tipo válido para IInputElement. Se esperaba UIElement, ContentElement o UIElement3D.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
index 6206d12b2c4..62edc0824f9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' n'est pas un type valide pour IInputElement. UIElement ou ContentElement attendu.
+ '{0}' n’est pas un type valide pour IInputElement. UIElement, ContentElement ou UIElement3D attendu.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
index 758ee1ed6fc..32b773a7589 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' non è un tipo valido per IInputElement. Previsto UIElement o ContentElement.
+ '{0}' non è un tipo valido per IInputElement. Previsto UIElement, ContentElement o UIElement3D.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
index 8e4e2fcd3c0..79988770f26 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' は、IInputElement に対して有効な型ではありません。UIElement または ContentElement を使用してください。
+ '{0}' は、IInputElement に対して有効な型ではありません。UIElement、ContentElement、または UIElement3D を使用してください。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
index eb8e348f43b..bc20536905e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}'은(는) IInputElement에 사용할 수 없습니다. UIElement 또는 ContentElement가 필요합니다.
+ '{0}'은(는) IInputElement에 유효한 형식이 아닙니다. UIElement, ContentElement 또는 UIElement3D가 필요합니다.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
index 195e8c177c2..ae9b7c2b39a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- Element „{0}” nie jest prawidłowym typem dla elementu IInputElement. Oczekiwany typ UIElement lub ContentElement.
+ „{0}” nie jest prawidłowym typem elementu IInputElement. Oczekiwano elementu UIElement, ContentElement lub UIElement3D.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
index 868be9d6c8f..1ad18078812 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' não é um tipo válido para IInputElement. Era esperado UIElement ou ContentElement.
+ '{0}' não é um tipo válido para IInputElement. UIElement, ContentElement ou UIElement3D esperado.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
index 6e150629ec1..825628fb7fe 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- "{0}" не является допустимым типом для IInputElement. Ожидается UIElement или ContentElement.
+ "{0}" не является допустимым типом для IInputElement. Ожидается UIElement, ContentElement или UIElement3D.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
index a90574f07e7..d8020393543 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' IInputElement için geçerli bir tür değil. UIElement veya ContentElement bekleniyor.
+ '{0}' IInputElement için geçerli bir tür değil. UIElement, ContentElement veya UIElement3D bekleniyor.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
index f708f947326..43a992c0502 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- “{0}”不是 IInputElement 的有效类型。应为 UIElement 或 ContentElement。
+ “{0}”不是 IInputElement 的有效类型。应为 UIElement、ContentElement 或 UIElement3D。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
index 981e92301bc..1e3b392a2ae 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hant.xlf
@@ -1909,7 +1909,7 @@
'{0}' is not a valid type for IInputElement. UIElement, ContentElement or UIElement3D expected.
- '{0}' 不是有效的 IInputElement 型別。應該是 UIElement 或 ContentElement。
+ '{0}' 不是有效的 IInputElement 型別。預期為 UIElement、ContentElement 或 UIElement3D。
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf
index 2f3eb86e5f4..6099c5c33e2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf
@@ -1633,7 +1633,7 @@ Verify that the file name is correct.
Provided filter string is not valid. Filter string should contain a description of the filter, followed by a vertical bar and the filter pattern. Must also separate multiple filter description and pattern pairs by a vertical bar. Must separate multiple extensions in a filter pattern with a semicolon. Example: \"Image files (*.bmp, *.jpg)|*.bmp;*.jpg|All files (*.*)|*.*\"
- Die bereitgestellte Filterzeichenfolge ist ungültig. Die Filterzeichenfolge muss eine Beschreibung des Filters enthalten, gefolgt von einem vertikalen Strich und dem Filtermuster. Weitere Paare aus Filterbeschreibung und Muster müssen ebenfalls durch einen vertikalen Strich getrennt werden. Mehrere Erweiterungen in Filtermustern werden mit einem Semikolon getrennt. Beispiel: "Bilddateien (*.bmp, *.jpg)|*.bmp;*.jpg|Alle Dateien (*.*)|*.*"
+ Die bereitgestellte Filterzeichenfolge ist ungültig. Die Filterzeichenfolge muss eine Beschreibung des Filters enthalten, gefolgt von einem vertikalen Strich und dem Filtermuster. Weitere Paare aus Filterbeschreibung und Muster müssen ebenfalls durch einen vertikalen Strich getrennt werden. Mehrere Erweiterungen in Filtermustern werden mit einem Semikolon getrennt. Beispiel: \"Bilddateien (*.bmp, *.jpg)|*.bmp;*.jpg|Alle Dateien (*.*)|*.*\"
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf
index 98051044f13..6bdc92e219b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf
@@ -6205,7 +6205,7 @@ Do you want to replace it?
\"{{{0}}}{1}\" element found. Expected fixed page element ({{{2}}}{3}).
- "{{{0}}}{1}" 요소가 있습니다. 고정 페이지 요소({{{2}}}{3})가 필요합니다.
+ \"{{{0}}}{1}\" 요소가 있습니다. 고정 페이지 요소({{{2}}}{3})가 필요합니다.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf
index a66c99d78da..0a61fa07b8b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf
@@ -1633,7 +1633,7 @@ Verifique se o nome de arquivo está correto.
Provided filter string is not valid. Filter string should contain a description of the filter, followed by a vertical bar and the filter pattern. Must also separate multiple filter description and pattern pairs by a vertical bar. Must separate multiple extensions in a filter pattern with a semicolon. Example: \"Image files (*.bmp, *.jpg)|*.bmp;*.jpg|All files (*.*)|*.*\"
- A cadeia de caracteres de filtro fornecida não é válida. A cadeia de caracteres de filtro deve conter uma descrição do filtro, seguida de uma barra vertical e do padrão de filtro. Também é necessário separar os vários pares de descrição e padrão de filtro com uma barra vertical. É necessário separar várias extensões em um padrão de filtro com um ponto-e-vírgula. Exemplo: "Arquivos de imagem (*.bmp, *.jpg)|*.bmp;*.jpg|Todos os arquivos (*.*)|*.*"
+ A cadeia de caracteres de filtro fornecida não é válida. A cadeia de caracteres de filtro deve conter uma descrição do filtro, seguida de uma barra vertical e do padrão de filtro. Também é necessário separar os vários pares de descrição e padrão de filtro com uma barra vertical. É necessário separar várias extensões em um padrão de filtro com um ponto-e-vírgula. Exemplo: \"Arquivos de imagem (*.bmp, *.jpg)|*.bmp;*.jpg|Todos os arquivos (*.*)|*.*\"
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf
index 072a2c82e76..6946611bf2b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf
@@ -6205,7 +6205,7 @@ Değiştirmek istiyor musunuz?
\"{{{0}}}{1}\" element found. Expected fixed page element ({{{2}}}{3}).
- "{{{0}}}{1}" öğe bulundu. Sabit sayfa öğesi bekleniyor ({{{2}}}{3}).
+ \"{{{0}}}{1}\" öğe bulundu. Sabit sayfa öğesi bekleniyor ({{{2}}}{3}).
From 5c9922f4e023b2e11bd4acdf8da66a598bae0216 Mon Sep 17 00:00:00 2001
From: dotnet bot
Date: Tue, 19 Jul 2022 22:43:49 -0700
Subject: [PATCH 098/109] Localized file check-in by OneLocBuild Task: Build
definition ID 217: Build ID 1892077 (#6833)
---
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../.template.config/localize/templatestrings.cs.json | 2 +-
.../.template.config/localize/templatestrings.de.json | 2 +-
.../.template.config/localize/templatestrings.es.json | 2 +-
.../.template.config/localize/templatestrings.fr.json | 2 +-
.../.template.config/localize/templatestrings.it.json | 2 +-
.../.template.config/localize/templatestrings.ja.json | 2 +-
.../.template.config/localize/templatestrings.ko.json | 2 +-
.../.template.config/localize/templatestrings.pl.json | 6 +++---
.../.template.config/localize/templatestrings.pt-BR.json | 4 ++--
.../.template.config/localize/templatestrings.ru.json | 2 +-
.../.template.config/localize/templatestrings.tr.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hans.json | 2 +-
.../.template.config/localize/templatestrings.zh-Hant.json | 2 +-
.../src/PresentationFramework/Resources/xlf/Strings.cs.xlf | 2 +-
105 files changed, 129 insertions(+), 129 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 46948aa9a27..4a7e49c432f 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Aplikace WPF",
"description": "Projekt pro vytvoření aplikace WPF .NET",
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 2a2fe63ed6e..ad0084eab3a 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF-Anwendung",
"description": "Ein Projekt zum Erstellen einer .NET WPF-Anwendung",
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 fd8b6a00130..7880a6088cc 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Aplicación WPF",
"description": "Proyecto para crear una aplicación WPF de .NET.",
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 1f4b0ac6f17..927b31ce5ff 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Application WPF",
"description": "Projet de création d'une application WPF .NET",
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 cf9c57d928b..a9b721cb064 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Applicazione WPF",
"description": "Progetto per la creazione di un'applicazione WPF .NET",
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 0e56c0c1265..6bfb22b2a89 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF アプリケーション",
"description": ".NET WPF アプリケーションを作成するためのプロジェクト",
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 addb937c29a..fa985808d44 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 애플리케이션",
"description": ".NET WPF 애플리케이션 만들기 프로젝트",
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 9ba83c87071..467b6f3baae 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Aplikacja WPF",
- "description": "Projekt służący do tworzenia aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -14,5 +14,5 @@
"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\u00A0edytorze"
+ "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 f833cf34785..f6fe3651d5b 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"name": "Aplicativo WPF",
"description": "Um projeto para a criação de um aplicativo .NET WPF",
- "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de\u00A0destino",
+ "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",
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 381bf3c0132..6c529877adf 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Приложение WPF",
"description": "Проект для создания приложения WPF .NET",
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 983fe0d4960..174904b1f4c 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Uygulaması",
"description": ".NET WPF Uygulaması oluşturmaya yönelik proje",
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 d6170159e28..696f70b4a83 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 应用程序",
"description": "用于创建 .NET WPF 应用程序的项目",
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 5e80eb2bd92..9803e14f46c 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 應用程式",
"description": "此專案可用於建立 .NET WPF 應用程式",
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 78898be2743..fc0950949c5 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Aplikace WPF",
"description": "Projekt pro vytvoření aplikace WPF .NET",
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 ec391ad437c..6fbc9e0be53 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF-Anwendung",
"description": "Ein Projekt zum Erstellen einer .NET WPF-Anwendung",
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 727ea94e8ed..2d5399bfaf2 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Aplicación WPF",
"description": "Proyecto para crear una aplicación WPF de .NET.",
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 a40d2106975..1525a449c48 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Application WPF",
"description": "Projet de création d'une application WPF .NET",
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 bc0aa6ec655..19229d8d331 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Applicazione WPF",
"description": "Progetto per la creazione di un'applicazione WPF .NET",
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 8492fab5ea3..d679a1377f6 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF アプリケーション",
"description": ".NET WPF アプリケーションを作成するためのプロジェクト",
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 10844e16187..fd2799812be 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 애플리케이션",
"description": ".NET WPF 애플리케이션 만들기 프로젝트",
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 b0e7931c5ae..4676faed9e2 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Aplikacja WPF",
- "description": "Projekt służący do tworzenia aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -13,5 +13,5 @@
"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\u00A0edytorze"
+ "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 6021b2379c5..3cde49cdee3 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"name": "Aplicativo WPF",
"description": "Um projeto para a criação de um aplicativo .NET WPF",
- "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de\u00A0destino",
+ "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",
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 f4176538127..df4ea2853c3 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Приложение WPF",
"description": "Проект для создания приложения WPF .NET",
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 54b878dd7df..5857259ab4d 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Uygulaması",
"description": ".NET WPF Uygulaması oluşturmaya yönelik proje",
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 26bf3676fc9..a4371642835 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 应用程序",
"description": "用于创建 .NET WPF 应用程序的项目",
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 30992b8db51..2ee6f385514 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 應用程式",
"description": "此專案可用於建立 .NET WPF 應用程式",
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 964fec81712..a14248499a7 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Knihovna tříd WPF",
"description": "Projekt pro vytvoření knihovny tříd určené pro aplikace WPF .NET",
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 013df94a457..b062b366087 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF-Klassenbibliothek",
"description": "Ein Projekt zum Erstellen einer Klassenbibliothek für eine .NET WPF-Anwendung",
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 0d530738071..bd7417d906a 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de clases de WPF",
"description": "Proyecto para crear una biblioteca de clases destinada a una aplicación WPF de .NET.",
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 cc2b050cb19..2ca2be380cb 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothèque de classes WPF",
"description": "Projet de création d'une bibliothèque de classes qui cible une application WPF .NET",
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 b0fb32a0eb3..ba0f0ce955a 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di classi WPF",
"description": "Progetto per la creazione di una libreria di classi destinata a un'applicazione WPF .NET",
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 7deea4951dd..2646be7ebe9 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF クラス ライブラリ",
"description": ".NET WPF アプリケーションを対象とするクラス ライブラリを作成するためのプロジェクト",
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 1be3a38edc2..84e300bd524 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 클래스 라이브러리",
"description": ".NET Core WPF 애플리케이션을 대상으로 하는 클래스 라이브러리 만들기 프로젝트",
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 6e465e16a34..2f4d1d6c62d 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka klas WPF",
- "description": "Projekt służący do tworzenia biblioteki klas przeznaczonej dla aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -14,5 +14,5 @@
"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\u00A0edytorze"
+ "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 46de401cda2..c3c9679e96b 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 e24118fe64e..0938e5fe658 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека классов WPF",
"description": "Проект для создания библиотеки классов, использующей приложение WPF .NET.",
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 ed62edaf46a..44d28445ecf 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Sınıf Kitaplığı",
"description": "Bir .NET WPF Uygulamasını hedefleyen bir sınıf kitaplığı oluşturmaya yönelik bir proje",
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 ab2c1f0a7f7..5860c32ba22 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 类库",
"description": "用于创建目标为 .NET WPF 应用程序的类库的项目",
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 0a0afde2f29..f62e2986d98 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 類別庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的類別庫",
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 fc247b70002..0bd54e62517 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Knihovna tříd WPF",
"description": "Projekt pro vytvoření knihovny tříd určené pro aplikace WPF .NET",
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 f54b92f21b2..3862631a1c6 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF-Klassenbibliothek",
"description": "Ein Projekt zum Erstellen einer Klassenbibliothek für eine .NET WPF-Anwendung",
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 7b5984c2076..c1ed9b9d65a 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de clases de WPF",
"description": "Proyecto para crear una biblioteca de clases destinada a una aplicación WPF de .NET.",
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 a2b6781e85c..44d79146eb9 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothèque de classes WPF",
"description": "Projet de création d'une bibliothèque de classes qui cible une application WPF .NET",
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 a1ea27e7fa1..89450e1adaa 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di classi WPF",
"description": "Progetto per la creazione di una libreria di classi destinata a un'applicazione WPF .NET",
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 6f18cd18fcd..5c975a02a23 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF クラス ライブラリ",
"description": ".NET WPF アプリケーションを対象とするクラス ライブラリを作成するためのプロジェクト",
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 ce7d1ab5be3..3a972742a9b 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 클래스 라이브러리",
"description": ".NET Core WPF 애플리케이션을 대상으로 하는 클래스 라이브러리 만들기 프로젝트",
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 9ae770c9639..d0efc69988c 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka klas WPF",
- "description": "Projekt służący do tworzenia biblioteki klas przeznaczonej dla aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -13,5 +13,5 @@
"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\u00A0edytorze"
+ "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 0224e4d2dff..2a273ddb7c8 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 6ab01d08d4a..600f106d9ab 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека классов WPF",
"description": "Проект для создания библиотеки классов, использующей приложение WPF .NET.",
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 e2adba9899c..748f46f7f5c 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Sınıf Kitaplığı",
"description": "Bir .NET WPF Uygulamasını hedefleyen bir sınıf kitaplığı oluşturmaya yönelik bir proje",
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 5aac157051d..bfa02e3ab17 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 类库",
"description": "用于创建目标为 .NET WPF 应用程序的类库的项目",
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 cbcaf2de1c3..c899a5f7b85 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 類別庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的類別庫",
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 77377b53377..226b5b1e200 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 5c02a78c517..bc82b1ab9e1 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothek benutzerdefinierter WPF-Steuerelemente",
"description": "Ein Projekt zum Erstellen einer Bibliothek benutzerdefinierter Steuerelemente für .NET WPF-Anwendungen",
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 2d4b59ba675..3ca934d5b33 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de control personalizada de WPF",
"description": "Proyecto para crear una biblioteca de control personalizada para aplicaciones WPF de .NET.",
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 5d14f2a560f..df8f116ae98 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 52486c81409..4f69d630888 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di controlli personalizzati WPF",
"description": "Progetto per la creazione di una libreria di controlli personalizzati per applicazioni WPF .NET",
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 d5df72f733b..cd9981576d4 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF カスタム コントロール ライブラリ",
"description": ".NET WPF アプリケーション用のカスタム コントロール ライブラリを作成するためのプロジェクト",
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 1a51f0a3f6a..c6e069e803e 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 사용자 지정 컨트롤 라이브러리",
"description": ".NET Core WPF 애플리케이션용 사용자 지정 컨트롤 라이브러리 만들기 프로젝트",
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 a0042e7f5ea..6d3f39148c2 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka niestandardowych kontrolek WPF",
- "description": "Projekt służący do tworzenia niestandardowej biblioteki kontrolek na potrzeby aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -14,5 +14,5 @@
"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\u00A0edytorze"
+ "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 6fa7f77ba0b..40cb48041dd 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 cceba9d32c5..6100dc70f29 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека настраиваемых элементов управления WPF",
"description": "Проект для создания библиотеки настраиваемых элементов управления для приложений WPF .NET.",
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 bf545a95d26..349abc95032 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Özel Denetim Kitaplığı",
"description": ".NET WPF Uygulamaları için özel bir denetim kitaplığı oluşturmaya yönelik bir proje",
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 a45815a9e5a..f41f5da5632 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 自定义控件库",
"description": "用于为 .NET WPF 应用程序创建自定义控件库的项目",
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 4d972761636..839915daab3 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 自訂控制項程式庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的自訂控制項程式庫",
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 840a010bad9..efb159a4724 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 c26ae3ceaed..131163d51fc 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothek benutzerdefinierter WPF-Steuerelemente",
"description": "Ein Projekt zum Erstellen einer Bibliothek benutzerdefinierter Steuerelemente für .NET WPF-Anwendungen",
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 5fdcaf40490..3ce30e12cbd 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de control personalizada de WPF",
"description": "Proyecto para crear una biblioteca de control personalizada para aplicaciones WPF de .NET.",
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 d4d249fbf4e..92a6b05b2b4 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 3dbb6c4b1db..b49c6fdd594 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di controlli personalizzati WPF",
"description": "Progetto per la creazione di una libreria di controlli personalizzati per applicazioni WPF .NET",
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 09795946773..43ad0d22864 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF カスタム コントロール ライブラリ",
"description": ".NET WPF アプリケーション用のカスタム コントロール ライブラリを作成するためのプロジェクト",
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 260cbbb6884..d68ce09ee6c 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 사용자 지정 컨트롤 라이브러리",
"description": ".NET Core WPF 애플리케이션용 사용자 지정 컨트롤 라이브러리 만들기 프로젝트",
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 dacdf2c21ab..9e99c6106e0 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka niestandardowych kontrolek WPF",
- "description": "Projekt służący do tworzenia niestandardowej biblioteki kontrolek na potrzeby aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -13,5 +13,5 @@
"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\u00A0edytorze"
+ "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 6f043344266..4014124116b 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 d39700ce97b..f70a0e107fd 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека настраиваемых элементов управления WPF",
"description": "Проект для создания библиотеки настраиваемых элементов управления для приложений WPF .NET.",
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 04b276c5727..4f66059e6d5 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Özel Denetim Kitaplığı",
"description": ".NET WPF Uygulamaları için özel bir denetim kitaplığı oluşturmaya yönelik bir proje",
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 bfaefb3bae5..a4630e83ccd 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 自定义控件库",
"description": "用于为 .NET WPF 应用程序创建自定义控件库的项目",
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 8b8dfc2659f..b7b15671eaf 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 自訂控制項程式庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的自訂控制項程式庫",
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 6b57c065786..ff2ef3e8990 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 b74b5239977..30bbe0977c5 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothek von WPF-Benutzersteuerelementen",
"description": "Ein Projekt zum Erstellen einer Bibliothek von Benutzersteuerelementen für .NET WPF-Anwendungen",
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 f23dd893788..6324c43779e 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de controles de usuario de WPF",
"description": "Proyecto para crear una biblioteca de controles de usuario para aplicaciones WPF de .NET.",
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 8164acd62fb..9a24fac2538 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 49ebb0e7863..99dbee2851b 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di controlli utente WPF",
"description": "Progetto per la creazione di una libreria di controlli utente per applicazioni WPF .NET",
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 af01c4b751d..e7f783dbe35 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF ユーザー コントロール ライブラリ",
"description": ".NET Core WPF アプリケーション用のユーザー コントロール ライブラリを作成するためのプロジェクト",
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 f13db39c99e..a0ca79106cf 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 사용자 정의 컨트롤 라이브러리",
"description": ".NET WPF 애플리케이션용 사용자 정의 컨트롤 라이브러리 만들기 프로젝트",
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 6e8254a299a..0292627929e 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka kontrolek użytkownika WPF",
- "description": "Projekt służący do tworzenia biblioteki kontrolek użytkownika na potrzeby aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -14,5 +14,5 @@
"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\u00A0edytorze"
+ "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 9095a503d6a..31aa83cbc8e 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 c208448595a..a1f3197cd50 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека пользовательских элементов управления WPF",
"description": "Проект для создания библиотеки пользовательских элементов управления для приложений WPF .NET.",
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 a18e4924ed6..1e703f3ee6b 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Kullanıcı Denetimi Kitaplığı",
"description": ".NET WPF Uygulamaları için kullanıcı kontrolü kitaplığı oluşturmaya yönelik proje",
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 c8c2f89cc6b..099d0db8b69 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 用户控件库",
"description": "用于为 .NET WPF 应用程序创建用户控件库的项目",
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 4319ff33943..d4bb87fdc41 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 使用者控制項程式庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的使用者控制項程式庫",
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 2cf48746c72..8f0a0afdc79 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 c046f7fd0e9..d91bf83d911 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Bibliothek von WPF-Benutzersteuerelementen",
"description": "Ein Projekt zum Erstellen einer Bibliothek von Benutzersteuerelementen für .NET WPF-Anwendungen",
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 83cfed3de0a..29213417ded 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteca de controles de usuario de WPF",
"description": "Proyecto para crear una biblioteca de controles de usuario para aplicaciones WPF de .NET.",
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 dbd549ddb2f..0edb708dcd8 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"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",
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 b9f6221c4c6..42009aba524 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "Libreria di controlli utente WPF",
"description": "Progetto per la creazione di una libreria di controlli utente per applicazioni WPF .NET",
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 6c4074f4794..5031d954b19 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF ユーザー コントロール ライブラリ",
"description": ".NET Core WPF アプリケーション用のユーザー コントロール ライブラリを作成するためのプロジェクト",
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 2e0f3b8c4c9..89042dc5e07 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 사용자 정의 컨트롤 라이브러리",
"description": ".NET WPF 애플리케이션용 사용자 정의 컨트롤 라이브러리 만들기 프로젝트",
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 3512b403dea..5b850c6caca 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,7 +1,7 @@
-{
+{
"author": "Microsoft",
"name": "Biblioteka kontrolek użytkownika WPF",
- "description": "Projekt służący do tworzenia biblioteki kontrolek użytkownika na potrzeby aplikacji WPF w\u00A0środowisku .NET",
+ "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",
@@ -13,5 +13,5 @@
"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\u00A0edytorze"
+ "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 4a584d53239..4a7ef3dc04b 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,8 +1,8 @@
-{
+{
"author": "Microsoft",
"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\u00A0destino",
+ "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",
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 cd716620e81..c63b8843c1c 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,4 +1,4 @@
-{
+{
"author": "Майкрософт",
"name": "Библиотека пользовательских элементов управления WPF",
"description": "Проект для создания библиотеки пользовательских элементов управления для приложений WPF .NET.",
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 c16833c3efa..34211d26b67 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF Kullanıcı Denetimi Kitaplığı",
"description": ".NET WPF Uygulamaları için kullanıcı kontrolü kitaplığı oluşturmaya yönelik proje",
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 9b503c9c700..e42f3d6b354 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 用户控件库",
"description": "用于为 .NET WPF 应用程序创建用户控件库的项目",
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 b2db4fa6225..410b0d6c451 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,4 +1,4 @@
-{
+{
"author": "Microsoft",
"name": "WPF 使用者控制項程式庫",
"description": "此專案可用於建立適用於 .NET WPF 應用程式的使用者控制項程式庫",
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
index 078c07e8ec6..3eb07936096 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf
@@ -5595,7 +5595,7 @@ Chcete ho nahradit?
diff --git a/eng/Versions.props b/eng/Versions.props
index f8f5023aa1b..a780b81595f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,8 +48,8 @@
- 7.0.0-beta.22368.5
- 7.0.0-beta.22368.5
+ 7.0.0-beta.22369.9
+ 7.0.0-beta.22369.9
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index a733a888582..3e5c1c74a1c 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -2,6 +2,8 @@ Param(
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
)
+. $PSScriptRoot\pipeline-logging-functions.ps1
+
Write-Host "Creating dir $ManifestDirPath"
# create directory for sbom manifest to be placed
if (!(Test-Path -path $ManifestDirPath))
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index f6c77453142..d5c76dc827b 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -2,6 +2,18 @@
source="${BASH_SOURCE[0]}"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+ source="$(readlink "$source")"
+
+ # if $source was a relative symlink, we need to resolve it relative to the path where the
+ # symlink file was located
+ [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+. $scriptroot/pipeline-logging-functions.sh
+
manifest_dir=$1
if [ ! -d "$manifest_dir" ] ; then
diff --git a/global.json b/global.json
index d981122403d..8d0a17ee72a 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9"
},
"sdk": {
"version": "7.0.100-preview.5.22307.18"
From a23f5b082741ff532edc5cf28d847370c3097b0f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 14:26:46 +0000
Subject: [PATCH 100/109] Update dependencies from
https://github.com/dotnet/winforms build 20220720.1 (#6837)
[main] Update dependencies from dotnet/winforms
- Coherency Updates:
- System.CodeDom: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Reflection.MetadataLoadContext: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.Platforms: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rc.1.22368.8 to 7.0.0-rc.1.22369.9 (parent: Microsoft.Private.Winforms)
---
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fe51d790325..619c71ff786 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,77 +1,77 @@
-
+
https://github.com/dotnet/winforms
- 07747de084aa403be88bf309baf9b3516e00b76a
+ 0f10e2bdc7a075b7af583f972ce237e9e94c567f
-
+
https://github.com/dotnet/winforms
- 07747de084aa403be88bf309baf9b3516e00b76a
+ 0f10e2bdc7a075b7af583f972ce237e9e94c567f
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
28d07eaed25cac92f53a2906e917627a6adb0443
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
-
+
https://github.com/dotnet/runtime
- 9ad302604c492522b4697aedc2ffea42fa53d08f
+ 62eb291312749c52507309d50051dd61538cc62d
diff --git a/eng/Versions.props b/eng/Versions.props
index a780b81595f..234c09ccf30 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,26 +21,26 @@
- 7.0.0-rc.1.22369.8
+ 7.0.0-rc.1.22370.1
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
4.6.0-preview4.19176.11
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
- 7.0.0-rc.1.22368.8
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
+ 7.0.0-rc.1.22369.9
From 3b66f8202ee759c79227c047d4d5b356de9bea98 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt
Date: Thu, 21 Jul 2022 07:16:20 +0200
Subject: [PATCH 101/109] Fixing TextBoxView memory leak for 2 seconds after
unloading host control (#1161)
* Stop and clear _throttleBackgroundTimer on unload
* Moving unload registration/de-registration
---
.../MS/Internal/documents/TextBoxView.cs | 28 +++++++++++++++++--
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/TextBoxView.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/TextBoxView.cs
index cf64985af76..7e9b41040d8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/TextBoxView.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/TextBoxView.cs
@@ -1220,6 +1220,8 @@ internal void RemoveTextContainerListeners()
if (!CheckFlags(Flags.TextContainerListenersInitialized))
return;
+ ((Control)_host).Unloaded -= OnHostUnloaded;
+
// if the flag got set, all the variables should be non-null
System.Diagnostics.Debug.Assert(_host != null && _host.TextContainer != null && _host.TextContainer.Highlights != null,
"TextBoxView partners should not be null");
@@ -1396,6 +1398,8 @@ private void EnsureTextContainerListeners()
if (CheckFlags(Flags.TextContainerListenersInitialized))
return;
+ ((Control)_host).Unloaded += OnHostUnloaded;
+
_host.TextContainer.Changing += new EventHandler(OnTextContainerChanging);
_host.TextContainer.Change += new TextContainerChangeEventHandler(OnTextContainerChange);
_host.TextContainer.Highlights.Changed += new HighlightChangedEventHandler(OnHighlightChanged);
@@ -2829,15 +2833,33 @@ private void RemoveLineVisualRange(int lineIndex, int count)
// Resumes backgound layout.
private void OnThrottleBackgroundTimeout(object sender, EventArgs e)
{
- _throttleBackgroundTimer.Stop();
- _throttleBackgroundTimer = null;
+ StopAndClearThrottleBackgroundTimer();
- if (this.IsBackgroundLayoutPending)
+ if (IsBackgroundLayoutPending)
{
OnBackgroundMeasure(null);
}
}
+ // We have to stop and clear the _throttleBackgroundTimer to prevent memory leaks as it's a DispatcherTimer.
+ // If we don't stop and clear _throttleBackgroundTimer on unload this instance and the referenced host are held in memory till the timer ticks again.
+ private void OnHostUnloaded(object sender, RoutedEventArgs e)
+ {
+ StopAndClearThrottleBackgroundTimer();
+ }
+
+ public void StopAndClearThrottleBackgroundTimer()
+ {
+ if (_throttleBackgroundTimer == null)
+ {
+ return;
+ }
+
+ _throttleBackgroundTimer.Stop();
+ _throttleBackgroundTimer.Tick -= OnThrottleBackgroundTimeout;
+ _throttleBackgroundTimer = null;
+ }
+
// Returns the x-axis offset of content on a line, based on current
// text alignment.
private double GetContentOffset(double lineWidth, TextAlignment aligment)
From 7dd94fe3000a05e93eefeb7cfa68124ad2c32f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ku=C4=8Dera?=
<10546952+miloush@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:16:35 +0100
Subject: [PATCH 102/109] CommandParameter invalidates CanExecute (#4217)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Jan Kučera
---
.../System/Windows/Controls/MenuItem.cs | 10 +++++++++-
.../System/Windows/Controls/Primitives/ButtonBase.cs | 10 +++++++++-
.../System/Windows/Documents/Hyperlink.cs | 10 +++++++++-
.../Microsoft/Windows/Controls/Ribbon/RibbonGallery.cs | 8 +++++++-
.../Microsoft/Windows/Controls/Ribbon/RibbonTextBox.cs | 8 +++++++-
5 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
index 5891c18c4fc..019f5e3ef98 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs
@@ -486,7 +486,9 @@ protected override bool IsEnabledCore
public static readonly DependencyProperty CommandParameterProperty =
ButtonBase.CommandParameterProperty.AddOwner(
typeof(MenuItem),
- new FrameworkPropertyMetadata((object) null));
+ new FrameworkPropertyMetadata(
+ (object)null,
+ new PropertyChangedCallback(OnCommandParameterChanged)));
///
/// The parameter to pass to MenuItem's Command.
@@ -499,6 +501,12 @@ public object CommandParameter
set { SetValue(CommandParameterProperty, value); }
}
+ private static void OnCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ MenuItem item = (MenuItem)d;
+ item.UpdateCanExecute();
+ }
+
///
/// The DependencyProperty for Target property
/// Flags: None
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs
index fb99a912112..e4a7bb8beb5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/ButtonBase.cs
@@ -207,7 +207,9 @@ private void UpdateIsPressed()
"CommandParameter",
typeof(object),
typeof(ButtonBase),
- new FrameworkPropertyMetadata((object) null));
+ new FrameworkPropertyMetadata(
+ (object)null,
+ new PropertyChangedCallback(OnCommandParameterChanged)));
///
/// The DependencyProperty for Target property
@@ -361,6 +363,12 @@ public object CommandParameter
}
}
+ private static void OnCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ ButtonBase b = (ButtonBase)d;
+ b.UpdateCanExecute();
+ }
+
///
/// The target element on which to fire the command.
///
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Hyperlink.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Hyperlink.cs
index 3d98dddf8e5..e716ae08041 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Hyperlink.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Hyperlink.cs
@@ -263,7 +263,9 @@ protected override bool IsEnabledCore
"CommandParameter",
typeof(object),
typeof(Hyperlink),
- new FrameworkPropertyMetadata((object)null));
+ new FrameworkPropertyMetadata(
+ (object)null,
+ new PropertyChangedCallback(OnCommandParameterChanged)));
///
/// Reflects the parameter to pass to the CommandProperty upon execution.
@@ -282,6 +284,12 @@ public object CommandParameter
}
}
+ private static void OnCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ Hyperlink h = (Hyperlink)d;
+ h.UpdateCanExecute();
+ }
+
///
/// The DependencyProperty for Target property
/// Flags: None
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonGallery.cs b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonGallery.cs
index 5b79261a8db..d302bf87425 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonGallery.cs
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonGallery.cs
@@ -2828,7 +2828,7 @@ public object CommandParameter
"CommandParameter",
typeof(object),
typeof(RibbonGallery),
- new FrameworkPropertyMetadata(null));
+ new FrameworkPropertyMetadata(new PropertyChangedCallback(OnCommandParameterChanged)));
///
/// Gets or sets a user defined data value that can be passed to the command when it is previewed.
@@ -2928,6 +2928,12 @@ private void UpdateCanExecute()
}
}
+ private static void OnCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ RibbonGallery gallery = (RibbonGallery)d;
+ gallery.UpdateCanExecute();
+ }
+
///
/// Fetches the value of the IsEnabled property
///
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonTextBox.cs b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonTextBox.cs
index a72f2711701..284c109ca92 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonTextBox.cs
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/RibbonTextBox.cs
@@ -118,7 +118,7 @@ public object CommandParameter
"CommandParameter",
typeof(object),
typeof(RibbonTextBox),
- new FrameworkPropertyMetadata(null));
+ new FrameworkPropertyMetadata(new PropertyChangedCallback(OnCommandParameterChanged)));
///
/// Gets or sets the object that the command is being executed on.
@@ -218,6 +218,12 @@ private void UpdateCanExecute()
}
}
+ private static void OnCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ RibbonTextBox textBox = (RibbonTextBox)d;
+ textBox.UpdateCanExecute();
+ }
+
///
/// Fetches the value of the IsEnabled property
///
From 95bad40a0f949fc7150b61f5527cd80d4870834c Mon Sep 17 00:00:00 2001
From: lindexi
Date: Thu, 21 Jul 2022 13:17:21 +0800
Subject: [PATCH 103/109] Merge pattern in DispatcherOperation (#5296)
---
.../WindowsBase/System/Windows/Threading/DispatcherOperation.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherOperation.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherOperation.cs
index 1231b9d3ee2..48a752e33e9 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherOperation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherOperation.cs
@@ -425,7 +425,7 @@ internal void Invoke()
EventHandler handler; // either completed or aborted
lock(DispatcherLock)
{
- if(_exception != null && _exception is OperationCanceledException)
+ if(_exception is OperationCanceledException)
{
// A new way to abort/cancel an operation is to raise an
// OperationCanceledException exception. This only works
From acbb3a835f286e75ad1b4fdc0f548ddb0fa29192 Mon Sep 17 00:00:00 2001
From: Bruno Martinez
Date: Thu, 21 Jul 2022 02:17:32 -0300
Subject: [PATCH 104/109] Harden events against race conditions (#5722)
Co-authored-by: Ashish Kumar Singh
---
.../System/Windows/Media/MediaContext.cs | 26 +++++++------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs
index 0043e39c04e..54f51c0027d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs
@@ -996,10 +996,9 @@ private void NotifySyncModeStatus(int enabledResult)
if (Channel != null)
{
// SyncFlush will Commit()
- if (CommittingBatch != null)
- {
- CommittingBatch(Channel, new EventArgs());
- }
+
+ CommittingBatch?.Invoke(Channel, new EventArgs());
+
Channel.SyncFlush();
}
@@ -1849,7 +1848,7 @@ private void RenderMessageHandlerCore(
// (TimeManager gets its tick time from MediaContext's IClock implementation).
// In the case where we can't query QPC or aren't doing interlocked presents,
// this will be equal to the current time, which is a good enough approximation.
- Rendering(this.Dispatcher, new RenderingEventArgs(_timeManager.LastTickTime));
+ Rendering?.Invoke(this.Dispatcher, new RenderingEventArgs(_timeManager.LastTickTime));
// call all render callbacks again in case the Rendering event affects layout
// this will enable layout effecting changes to get triggered this frame
@@ -2185,10 +2184,7 @@ private void CommitChannel()
_lastCommitTime = currentTicks;
}
- if (CommittingBatch != null)
- {
- CommittingBatch(Channel, new EventArgs());
- }
+ CommittingBatch?.Invoke(Channel, new EventArgs());
Channel.Commit();
@@ -2266,10 +2262,8 @@ internal void CompleteRender()
do
{
// WaitForNextMessage will Commit()
- if (CommittingBatch != null)
- {
- CommittingBatch(Channel, new EventArgs());
- }
+ CommittingBatch?.Invoke(Channel, new EventArgs());
+
Channel.WaitForNextMessage();
NotifyChannelMessage();
@@ -2309,10 +2303,8 @@ internal void CompleteRender()
else
{
// SyncFlush() will Commit()
- if (CommittingBatch != null)
- {
- CommittingBatch(Channel, new EventArgs());
- }
+ CommittingBatch?.Invoke(Channel, new EventArgs());
+
//
// Issue a sync flush, which will only return after
From f1cfb42a6c6d9b2c7fa6d3640eb8308901dc8a80 Mon Sep 17 00:00:00 2001
From: Stephen Toub
Date: Thu, 21 Jul 2022 01:17:39 -0400
Subject: [PATCH 105/109] Use span slice instead of substring in
AbbreviatedGeometryParser.ReadNumber (#6272)
* Use span slice instead of substring in AbbreviatedGeometryParser.ReadNumber
* Update src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs
Co-authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Co-authored-by: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
---
.../System/Windows/Media/ParsersCommon.cs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs
index 10fbabc394f..3c130541d05 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs
@@ -435,11 +435,13 @@ double ReadNumber(bool allowComma)
}
else
{
- string subString = _pathString.Substring(start, _curIndex - start);
-
try
{
- return System.Convert.ToDouble(subString, _formatProvider);
+#if NET
+ return double.Parse(_pathString.AsSpan(start, _curIndex - start), provider: _formatProvider);
+#else
+ return double.Parse(_pathString.Substring(start, _curIndex - start), provider: _formatProvider);
+#endif
}
catch (FormatException except)
{
@@ -691,9 +693,9 @@ internal void ParseToGeometryContext(
large,
#if PBTCOMPILER
sweep,
-#else
+#else
sweep ? SweepDirection.Clockwise : SweepDirection.Counterclockwise,
-#endif
+#endif
IsStroked,
! IsSmoothJoin
);
From 994950974b780ebb71d50e7acb0cf0910339b2f7 Mon Sep 17 00:00:00 2001
From: Stephen Toub
Date: Thu, 21 Jul 2022 01:17:47 -0400
Subject: [PATCH 106/109] Some improvements to FrugalList (#6280)
* Some improvements to FrugalList
- FrugalStructList's `ICollection`-based constructor uses foreach to enumerate the contents of the collection. If it's an `IList`, we can instead index and avoid allocating the enumerator.
- Avoid multiple interface calls to `ICollection.Count` in FrugalStructList's ctor
- Delete a dead ctor on `ArrayItemList`. That ctor was the only reason an array field may have been left null, so we can also remove subsequent null checks when accessing that array.
- Use Span/Array in ArrayItemList for Clear, Contains, IndexOf, ToArray, and CopyTo rather than open-coding them
* Update src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
Co-authored-by: Bradley Grainger
Co-authored-by: Bradley Grainger
---
.../src/Shared/MS/Utility/FrugalList.cs | 152 ++++++------------
1 file changed, 52 insertions(+), 100 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
index b7e00988ece..3b6e7a5c7cd 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
@@ -6,8 +6,6 @@
using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
-using System.Windows;
-using System.Diagnostics.CodeAnalysis;
#if SYSTEM_XAML
using System.Xaml;
#else
@@ -1284,10 +1282,6 @@ private void SetCount(int value)
///
internal sealed class ArrayItemList : FrugalListBase
{
- public ArrayItemList()
- {
- }
-
public ArrayItemList(int size)
{
// Make size a multiple of GROWTH
@@ -1298,74 +1292,53 @@ public ArrayItemList(int size)
public ArrayItemList(ICollection collection)
{
- if (collection != null)
- {
- _count = collection.Count;
- _entries = new T[_count];
- collection.CopyTo(_entries, 0);
- }
+ Debug.Assert(collection is not null);
+ _count = collection.Count;
+ _entries = new T[_count];
+ collection.CopyTo(_entries, 0);
}
public ArrayItemList(ICollection collection)
{
- if (collection != null)
- {
- _count = collection.Count;
- _entries = new T[_count];
- collection.CopyTo(_entries, 0);
- }
+ Debug.Assert(collection is not null);
+ _count = collection.Count;
+ _entries = new T[_count];
+ collection.CopyTo(_entries, 0);
}
// Capacity of this store
- public override int Capacity
- {
- get
- {
- if (_entries != null)
- {
- return _entries.Length;
- }
- return 0;
- }
- }
+ public override int Capacity => _entries.Length;
public override FrugalListStoreState Add(T value)
{
// If we don't have any entries or the existing entry is being overwritten,
// then we can use this store. Otherwise we have to promote.
- if ((null != _entries) && (_count < _entries.Length))
+ if (_count < _entries.Length)
{
_entries[_count] = value;
++_count;
}
else
{
- if (null != _entries)
- {
- int size = _entries.Length;
+ int size = _entries.Length;
- // Grow the list slowly while it is small but
- // faster once it reaches the LARGEGROWTH size
- if (size < LARGEGROWTH)
- {
- size += GROWTH;
- }
- else
- {
- size += size >> 2;
- }
-
- T[] destEntries = new T[size];
-
- // Copy old array
- Array.Copy(_entries, 0, destEntries, 0, _entries.Length);
- _entries = destEntries;
+ // Grow the list slowly while it is small but
+ // faster once it reaches the LARGEGROWTH size
+ if (size < LARGEGROWTH)
+ {
+ size += GROWTH;
}
else
{
- _entries = new T[MINSIZE];
+ size += size >> 2;
}
+ T[] destEntries = new T[size];
+
+ // Copy old array
+ Array.Copy(_entries, 0, destEntries, 0, _entries.Length);
+ _entries = destEntries;
+
// Insert into new array
_entries[_count] = value;
++_count;
@@ -1375,34 +1348,17 @@ public override FrugalListStoreState Add(T value)
public override void Clear()
{
- // Wipe out the info.
- for (int i = 0; i < _count; ++i)
- {
- _entries[i] = default(T);
- }
+ _entries.AsSpan(0, _count).Clear();
_count = 0;
}
- public override bool Contains(T value)
- {
- return (-1 != IndexOf(value));
- }
+ public override bool Contains(T value) => IndexOf(value) >= 0;
- public override int IndexOf(T value)
- {
- for (int index = 0; index < _count; ++index)
- {
- if (EqualityComparer.Default.Equals(_entries[index], value))
- {
- return index;
- }
- }
- return -1;
- }
+ public override int IndexOf(T value) => Array.IndexOf(_entries, value, 0, _count);
public override void Insert(int index, T value)
{
- if ((null != _entries) && (_count < _entries.Length))
+ if (_count < _entries.Length)
{
// Move down the required number of items
Array.Copy(_entries, index, _entries, index + 1, _count - index);
@@ -1423,13 +1379,11 @@ public override void SetAt(int index, T value)
public override bool Remove(T value)
{
- for (int index = 0; index < _count; ++index)
+ int index = IndexOf(value);
+ if (index >= 0)
{
- if (EqualityComparer.Default.Equals(_entries[index], value))
- {
- RemoveAt(index);
- return true;
- }
+ RemoveAt(index);
+ return true;
}
return false;
@@ -1543,24 +1497,9 @@ public void Promote(ArrayItemList oldList)
}
}
- public override T[] ToArray()
- {
- T[] array = new T[_count];
+ public override T[] ToArray() => _entries.AsSpan(0, _count).ToArray();
- for (int i = 0; i < _count; ++i)
- {
- array[i] = _entries[i];
- }
- return array;
- }
-
- public override void CopyTo(T[] array, int index)
- {
- for (int i = 0; i < _count; ++i)
- {
- array[index+i] = _entries[i];
- }
- }
+ public override void CopyTo(T[] array, int index) => _entries.AsSpan(0, _count).CopyTo(array.AsSpan(index));
public override object Clone()
{
@@ -2032,14 +1971,15 @@ public FrugalStructList(int size)
public FrugalStructList(ICollection collection)
{
- if (collection.Count > 6)
+ int count = collection.Count;
+ if (count > 6)
{
_listStore = new ArrayItemList(collection);
}
else
{
_listStore = null;
- Capacity = collection.Count;
+ Capacity = count;
foreach (T item in collection)
{
Add(item);
@@ -2049,17 +1989,29 @@ public FrugalStructList(ICollection collection)
public FrugalStructList(ICollection collection)
{
- if (collection.Count > 6)
+ int count = collection.Count;
+ if (count > 6)
{
_listStore = new ArrayItemList(collection);
}
else
{
_listStore = null;
- Capacity = collection.Count;
- foreach (T item in collection)
+ Capacity = count;
+
+ if (collection is IList list)
{
- Add(item);
+ for (int i = 0; i < count; i++)
+ {
+ Add(list[i]);
+ }
+ }
+ else
+ {
+ foreach (T item in collection)
+ {
+ Add(item);
+ }
}
}
}
From b518cfb34ec484baf61076923cf189a8b820da9f Mon Sep 17 00:00:00 2001
From: Stephen Toub
Date: Thu, 21 Jul 2022 01:17:55 -0400
Subject: [PATCH 107/109] Change most non-generic sorts to be generic (#6285)
Especially for the sorts based on int[], this avoids boxing potentially huge numbers of ints. Even for classes, it avoids unnecessary casting, and switching to a delegate avoids a top-level allocation for the comparer inside the current Array.Sort implementation.
---
.../System/Windows/Controls/Grid.cs | 391 +++++-------------
.../AlphaFlattener/SegmentTree.cs | 15 +-
2 files changed, 111 insertions(+), 295 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Grid.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Grid.cs
index c100d4df875..d09ae5e425a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Grid.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Grid.cs
@@ -1535,7 +1535,7 @@ private void EnsureMinSizeInDefinitionRange(
double sizeToDistribute;
int i;
- Array.Sort(tempDefinitions, 0, count, s_spanPreferredDistributionOrderComparer);
+ tempDefinitions.AsSpan(0, count).Sort(s_spanPreferredDistributionOrderComparer);
for (i = 0, sizeToDistribute = requestedSize; i < autoDefinitionsCount; ++i)
{
// sanity check: only auto definitions allowed in this loop
@@ -1572,7 +1572,7 @@ private void EnsureMinSizeInDefinitionRange(
double sizeToDistribute;
int i;
- Array.Sort(tempDefinitions, 0, count, s_spanMaxDistributionOrderComparer);
+ tempDefinitions.AsSpan(0, count).Sort(s_spanMaxDistributionOrderComparer);
for (i = 0, sizeToDistribute = requestedSize - rangePreferredSize; i < count - autoDefinitionsCount; ++i)
{
// sanity check: no auto definitions allowed in this loop
@@ -1717,7 +1717,7 @@ private void ResolveStarLegacy(
if (starDefinitionsCount > 0)
{
- Array.Sort(tempDefinitions, 0, starDefinitionsCount, s_starDistributionOrderComparer);
+ tempDefinitions.AsSpan(0, starDefinitionsCount).Sort(s_starDistributionOrderComparer);
// the 'do {} while' loop below calculates sum of star weights in order to avoid fp overflow...
// partial sum value is stored in each definition's SizeCache member.
@@ -1876,8 +1876,8 @@ private void ResolveStarMaxDiscrepancy(
double takenStarWeight = 0.0;
double remainingAvailableSize = availableSize - takenSize;
double remainingStarWeight = totalStarWeight - takenStarWeight;
- Array.Sort(tempDefinitions, 0, minCount, s_minRatioComparer);
- Array.Sort(tempDefinitions, defCount, maxCount, s_maxRatioComparer);
+ tempDefinitions.AsSpan(0, minCount).Sort(s_minRatioComparer);
+ tempDefinitions.AsSpan(defCount, maxCount).Sort(s_maxRatioComparer);
while (minCount + maxCount > 0 && remainingAvailableSize > 0.0)
{
@@ -2033,7 +2033,7 @@ private void ResolveStarMaxDiscrepancy(
if (starCount > 0)
{
- Array.Sort(tempDefinitions, 0, starCount, s_starWeightComparer);
+ tempDefinitions.AsSpan(0, starCount).Sort(s_starWeightComparer);
// compute the partial sums of *-weight, in increasing order of weight
// for minimal loss of precision.
@@ -2204,8 +2204,7 @@ private void SetFinalSizeLegacy(
if (starDefinitionsCount > 0)
{
- StarDistributionOrderIndexComparer starDistributionOrderIndexComparer = new StarDistributionOrderIndexComparer(definitions);
- Array.Sort(definitionIndices, 0, starDefinitionsCount, starDistributionOrderIndexComparer);
+ Array.Sort(definitionIndices, 0, starDefinitionsCount, new StarDistributionOrderIndexComparer(definitions));
// the 'do {} while' loop below calculates sum of star weights in order to avoid fp overflow...
// partial sum value is stored in each definition's SizeCache member.
@@ -2252,8 +2251,7 @@ private void SetFinalSizeLegacy(
if ( allPreferredArrangeSize > finalSize
&& !_AreClose(allPreferredArrangeSize, finalSize) )
{
- DistributionOrderIndexComparer distributionOrderIndexComparer = new DistributionOrderIndexComparer(definitions);
- Array.Sort(definitionIndices, 0, definitions.Length, distributionOrderIndexComparer);
+ Array.Sort(definitionIndices, 0, definitions.Length, new DistributionOrderIndexComparer(definitions));
double sizeToDistribute = finalSize - allPreferredArrangeSize;
for (int i = 0; i < definitions.Length; ++i)
@@ -2291,8 +2289,7 @@ private void SetFinalSizeLegacy(
}
// Sort rounding errors
- RoundingErrorIndexComparer roundingErrorIndexComparer = new RoundingErrorIndexComparer(roundingErrors);
- Array.Sort(definitionIndices, 0, definitions.Length, roundingErrorIndexComparer);
+ Array.Sort(definitionIndices, 0, definitions.Length, new RoundingErrorIndexComparer(roundingErrors));
double adjustedSize = allPreferredArrangeSize;
double dpiIncrement = UIElement.RoundLayoutValue(1.0, dpi);
@@ -2487,10 +2484,8 @@ private void SetFinalSizeMaxDiscrepancy(
double remainingAvailableSize = finalSize - takenSize;
double remainingStarWeight = totalStarWeight - takenStarWeight;
- MinRatioIndexComparer minRatioIndexComparer = new MinRatioIndexComparer(definitions);
- Array.Sort(definitionIndices, 0, minCount, minRatioIndexComparer);
- MaxRatioIndexComparer maxRatioIndexComparer = new MaxRatioIndexComparer(definitions);
- Array.Sort(definitionIndices, defCount, maxCount, maxRatioIndexComparer);
+ Array.Sort(definitionIndices, 0, minCount, new MinRatioIndexComparer(definitions));
+ Array.Sort(definitionIndices, defCount, maxCount, new MaxRatioIndexComparer(definitions));
while (minCount + maxCount > 0 && remainingAvailableSize > 0.0)
{
@@ -2649,8 +2644,7 @@ private void SetFinalSizeMaxDiscrepancy(
if (starCount > 0)
{
- StarWeightIndexComparer starWeightIndexComparer = new StarWeightIndexComparer(definitions);
- Array.Sort(definitionIndices, 0, starCount, starWeightIndexComparer);
+ Array.Sort(definitionIndices, 0, starCount, new StarWeightIndexComparer(definitions));
// compute the partial sums of *-weight, in increasing order of weight
// for minimal loss of precision.
@@ -2750,8 +2744,7 @@ private void SetFinalSizeMaxDiscrepancy(
}
// Sort rounding errors
- RoundingErrorIndexComparer roundingErrorIndexComparer = new RoundingErrorIndexComparer(roundingErrors);
- Array.Sort(definitionIndices, 0, definitions.Length, roundingErrorIndexComparer);
+ Array.Sort(definitionIndices, 0, definitions.Length, new RoundingErrorIndexComparer(roundingErrors));
double adjustedSize = roundedTakenSize;
double dpiIncrement = 1.0/dpi;
@@ -3321,13 +3314,12 @@ static double StarWeight(DefinitionBase def, double scale)
private const double c_starClip = 1e298; // used as maximum for clipping star values during normalization
private const int c_layoutLoopMaxCount = 5; // 5 is an arbitrary constant chosen to end the measure loop
private static readonly LocalDataStoreSlot s_tempDefinitionsDataSlot = Thread.AllocateDataSlot();
- private static readonly IComparer s_spanPreferredDistributionOrderComparer = new SpanPreferredDistributionOrderComparer();
- private static readonly IComparer s_spanMaxDistributionOrderComparer = new SpanMaxDistributionOrderComparer();
- private static readonly IComparer s_starDistributionOrderComparer = new StarDistributionOrderComparer();
- private static readonly IComparer s_distributionOrderComparer = new DistributionOrderComparer();
- private static readonly IComparer s_minRatioComparer = new MinRatioComparer();
- private static readonly IComparer s_maxRatioComparer = new MaxRatioComparer();
- private static readonly IComparer s_starWeightComparer = new StarWeightComparer();
+ private static readonly Comparison s_spanPreferredDistributionOrderComparer = SpanPreferredDistributionOrderComparer;
+ private static readonly Comparison s_spanMaxDistributionOrderComparer = SpanMaxDistributionOrderComparer;
+ private static readonly Comparison s_starDistributionOrderComparer = StarDistributionOrderComparer;
+ private static readonly Comparison s_minRatioComparer = MinRatioComparer;
+ private static readonly Comparison s_maxRatioComparer = MaxRatioComparer;
+ private static readonly Comparison s_starWeightComparer = StarWeightComparer;
#endregion Static Fields
@@ -3632,139 +3624,85 @@ public override bool Equals(object obj)
private bool _u;
}
- ///
- /// SpanPreferredDistributionOrderComparer.
- ///
- private class SpanPreferredDistributionOrderComparer : IComparer
+ private static int SpanPreferredDistributionOrderComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
+ int result;
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
+ if (!CompareNullRefs(x, y, out result))
+ {
+ if (x.UserSize.IsAuto)
{
- if (definitionX.UserSize.IsAuto)
+ if (y.UserSize.IsAuto)
{
- if (definitionY.UserSize.IsAuto)
- {
- result = definitionX.MinSize.CompareTo(definitionY.MinSize);
- }
- else
- {
- result = -1;
- }
+ result = x.MinSize.CompareTo(y.MinSize);
}
else
{
- if (definitionY.UserSize.IsAuto)
- {
- result = +1;
- }
- else
- {
- result = definitionX.PreferredSize.CompareTo(definitionY.PreferredSize);
- }
+ result = -1;
}
}
-
- return result;
- }
- }
-
- ///
- /// SpanMaxDistributionOrderComparer.
- ///
- private class SpanMaxDistributionOrderComparer : IComparer
- {
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
-
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
+ else
{
- if (definitionX.UserSize.IsAuto)
+ if (y.UserSize.IsAuto)
{
- if (definitionY.UserSize.IsAuto)
- {
- result = definitionX.SizeCache.CompareTo(definitionY.SizeCache);
- }
- else
- {
- result = +1;
- }
+ result = +1;
}
else
{
- if (definitionY.UserSize.IsAuto)
- {
- result = -1;
- }
- else
- {
- result = definitionX.SizeCache.CompareTo(definitionY.SizeCache);
- }
+ result = x.PreferredSize.CompareTo(y.PreferredSize);
}
}
-
- return result;
}
+
+ return result;
}
- ///
- /// StarDistributionOrderComparer.
- ///
- private class StarDistributionOrderComparer : IComparer
+ private static int SpanMaxDistributionOrderComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
+ int result;
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
+ if (!CompareNullRefs(x, y, out result))
+ {
+ if (x.UserSize.IsAuto)
{
- result = definitionX.SizeCache.CompareTo(definitionY.SizeCache);
+ if (y.UserSize.IsAuto)
+ {
+ result = x.SizeCache.CompareTo(y.SizeCache);
+ }
+ else
+ {
+ result = +1;
+ }
+ }
+ else
+ {
+ if (y.UserSize.IsAuto)
+ {
+ result = -1;
+ }
+ else
+ {
+ result = x.SizeCache.CompareTo(y.SizeCache);
+ }
}
-
- return result;
}
+
+ return result;
}
- ///
- /// DistributionOrderComparer.
- ///
- private class DistributionOrderComparer: IComparer
+ private static int StarDistributionOrderComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
+ int result;
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
- {
- double xprime = definitionX.SizeCache - definitionX.MinSizeForArrange;
- double yprime = definitionY.SizeCache - definitionY.MinSizeForArrange;
- result = xprime.CompareTo(yprime);
- }
-
- return result;
+ if (!CompareNullRefs(x, y, out result))
+ {
+ result = x.SizeCache.CompareTo(y.SizeCache);
}
- }
+ return result;
+ }
- ///
- /// StarDistributionOrderIndexComparer.
- ///
- private class StarDistributionOrderIndexComparer : IComparer
+ private sealed class StarDistributionOrderIndexComparer : IComparer
{
private readonly DefinitionBase[] definitions;
@@ -3774,22 +3712,10 @@ internal StarDistributionOrderIndexComparer(DefinitionBase[] definitions)
this.definitions = definitions;
}
- public int Compare(object x, object y)
+ public int Compare(int x, int y)
{
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- DefinitionBase definitionX = null;
- DefinitionBase definitionY = null;
-
- if (indexX != null)
- {
- definitionX = definitions[indexX.Value];
- }
- if (indexY != null)
- {
- definitionY = definitions[indexY.Value];
- }
+ DefinitionBase definitionX = definitions[x];
+ DefinitionBase definitionY = definitions[y];
int result;
@@ -3802,10 +3728,7 @@ public int Compare(object x, object y)
}
}
- ///
- /// DistributionOrderComparer.
- ///
- private class DistributionOrderIndexComparer : IComparer
+ private sealed class DistributionOrderIndexComparer : IComparer
{
private readonly DefinitionBase[] definitions;
@@ -3815,22 +3738,10 @@ internal DistributionOrderIndexComparer(DefinitionBase[] definitions)
this.definitions = definitions;
}
- public int Compare(object x, object y)
+ public int Compare(int x, int y)
{
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- DefinitionBase definitionX = null;
- DefinitionBase definitionY = null;
-
- if (indexX != null)
- {
- definitionX = definitions[indexX.Value];
- }
- if (indexY != null)
- {
- definitionY = definitions[indexY.Value];
- }
+ DefinitionBase definitionX = definitions[x];
+ DefinitionBase definitionY = definitions[y];
int result;
@@ -3845,10 +3756,7 @@ public int Compare(object x, object y)
}
}
- ///
- /// RoundingErrorIndexComparer.
- ///
- private class RoundingErrorIndexComparer : IComparer
+ private sealed class RoundingErrorIndexComparer : IComparer
{
private readonly double[] errors;
@@ -3858,96 +3766,57 @@ internal RoundingErrorIndexComparer(double[] errors)
this.errors = errors;
}
- public int Compare(object x, object y)
- {
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- int result;
-
- if (!CompareNullRefs(indexX, indexY, out result))
- {
- double errorX = errors[indexX.Value];
- double errorY = errors[indexY.Value];
- result = errorX.CompareTo(errorY);
- }
-
- return result;
- }
+ public int Compare(int x, int y) => errors[x].CompareTo(errors[y]);
}
///
- /// MinRatioComparer.
/// Sort by w/min (stored in MeasureSize), descending.
/// We query the list from the back, i.e. in ascending order of w/min.
///
- private class MinRatioComparer : IComparer
+ private static int MinRatioComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
-
- int result;
+ int result;
- if (!CompareNullRefs(definitionY, definitionX, out result))
- {
- result = definitionY.MeasureSize.CompareTo(definitionX.MeasureSize);
- }
-
- return result;
+ if (!CompareNullRefs(y, x, out result))
+ {
+ result = y.MeasureSize.CompareTo(x.MeasureSize);
}
+
+ return result;
}
///
- /// MaxRatioComparer.
/// Sort by w/max (stored in SizeCache), ascending.
/// We query the list from the back, i.e. in descending order of w/max.
///
- private class MaxRatioComparer : IComparer
+ private static int MaxRatioComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
-
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
- {
- result = definitionX.SizeCache.CompareTo(definitionY.SizeCache);
- }
+ int result;
- return result;
+ if (!CompareNullRefs(x, y, out result))
+ {
+ result = x.SizeCache.CompareTo(y.SizeCache);
}
+
+ return result;
}
///
- /// StarWeightComparer.
/// Sort by *-weight (stored in MeasureSize), ascending.
///
- private class StarWeightComparer : IComparer
+ private static int StarWeightComparer(DefinitionBase x, DefinitionBase y)
{
- public int Compare(object x, object y)
- {
- DefinitionBase definitionX = x as DefinitionBase;
- DefinitionBase definitionY = y as DefinitionBase;
+ int result;
- int result;
-
- if (!CompareNullRefs(definitionX, definitionY, out result))
- {
- result = definitionX.MeasureSize.CompareTo(definitionY.MeasureSize);
- }
-
- return result;
+ if (!CompareNullRefs(x, y, out result))
+ {
+ result = x.MeasureSize.CompareTo(y.MeasureSize);
}
+
+ return result;
}
- ///
- /// MinRatioIndexComparer.
- ///
- private class MinRatioIndexComparer : IComparer
+ private sealed class MinRatioIndexComparer : IComparer
{
private readonly DefinitionBase[] definitions;
@@ -3957,22 +3826,10 @@ internal MinRatioIndexComparer(DefinitionBase[] definitions)
this.definitions = definitions;
}
- public int Compare(object x, object y)
+ public int Compare(int x, int y)
{
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- DefinitionBase definitionX = null;
- DefinitionBase definitionY = null;
-
- if (indexX != null)
- {
- definitionX = definitions[indexX.Value];
- }
- if (indexY != null)
- {
- definitionY = definitions[indexY.Value];
- }
+ DefinitionBase definitionX = definitions[x];
+ DefinitionBase definitionY = definitions[y];
int result;
@@ -3985,10 +3842,7 @@ public int Compare(object x, object y)
}
}
- ///
- /// MaxRatioIndexComparer.
- ///
- private class MaxRatioIndexComparer : IComparer
+ private sealed class MaxRatioIndexComparer : IComparer
{
private readonly DefinitionBase[] definitions;
@@ -3998,22 +3852,10 @@ internal MaxRatioIndexComparer(DefinitionBase[] definitions)
this.definitions = definitions;
}
- public int Compare(object x, object y)
+ public int Compare(int x, int y)
{
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- DefinitionBase definitionX = null;
- DefinitionBase definitionY = null;
-
- if (indexX != null)
- {
- definitionX = definitions[indexX.Value];
- }
- if (indexY != null)
- {
- definitionY = definitions[indexY.Value];
- }
+ DefinitionBase definitionX = definitions[x];
+ DefinitionBase definitionY = definitions[y];
int result;
@@ -4026,10 +3868,7 @@ public int Compare(object x, object y)
}
}
- ///
- /// MaxRatioIndexComparer.
- ///
- private class StarWeightIndexComparer : IComparer
+ private sealed class StarWeightIndexComparer : IComparer
{
private readonly DefinitionBase[] definitions;
@@ -4039,22 +3878,10 @@ internal StarWeightIndexComparer(DefinitionBase[] definitions)
this.definitions = definitions;
}
- public int Compare(object x, object y)
+ public int Compare(int x, int y)
{
- int? indexX = x as int?;
- int? indexY = y as int?;
-
- DefinitionBase definitionX = null;
- DefinitionBase definitionY = null;
-
- if (indexX != null)
- {
- definitionX = definitions[indexX.Value];
- }
- if (indexY != null)
- {
- definitionY = definitions[indexY.Value];
- }
+ DefinitionBase definitionX = definitions[x];
+ DefinitionBase definitionY = definitions[y];
int result;
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/AlphaFlattener/SegmentTree.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/AlphaFlattener/SegmentTree.cs
index 2c114db8346..2de3bd5cc85 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/AlphaFlattener/SegmentTree.cs
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/AlphaFlattener/SegmentTree.cs
@@ -27,17 +27,6 @@ public Coordinate(double v, int i)
}
}
- internal class CoordinateComparer : IComparer
- {
- int IComparer.Compare(Object x, Object y)
- {
- double vx = ((Coordinate)x).value;
- double vy = ((Coordinate)y).value;
-
- return vx.CompareTo(vy);
- }
- }
-
internal class CoordinateSearcher : IComparer
{
int IComparer.Compare(Object x, Object y)
@@ -237,10 +226,10 @@ private void SortEndPoints(DisplayList dl, int count)
AddPoint(p, count + 1, Double.MaxValue, Double.MaxValue);
- Array.Sort(_xCoord, new CoordinateComparer());
+ Array.Sort(_xCoord, (x, y) => x.value.CompareTo(y.value));
_xCount = _xCoord.Length;
- Array.Sort(_yCoord, new CoordinateComparer());
+ Array.Sort(_yCoord, (x, y) => x.value.CompareTo(y.value));
_yCount = _yCoord.Length;
}
From 81ddc95accfb131ee3d76e18a49acd8c28c6dade Mon Sep 17 00:00:00 2001
From: Stephen Toub
Date: Thu, 21 Jul 2022 01:18:03 -0400
Subject: [PATCH 108/109] Stop boxing WeakReferenceListEnumerator in
PresentationSource use (#6502)
PresentationSource.CriticalCurrentSources is internal and is only ever foreach'd by consumers. It's strongly-typed to return IEnumerable, but the actual WeakReferenceList it returns has a struct-based enumerator, which means each foreach boxes that enumerator. By changing CriticalCurrentSources to return `WeakReferenceList` rather than `IEnumerable`, those foreach's can bind directly to the struct, with all the benefits that brings.
---
.../src/PresentationCore/System/Windows/PresentationSource.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
index 2f11cc2145c..286126750fb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
@@ -661,11 +661,11 @@ internal static bool UnderSamePresentationSource(params DependencyObject[] visua
/// over a ReadOnly SnapShot of the List of sources. The Enumerator
/// skips over the any dead weak references in the list.
///
- internal static IEnumerable CriticalCurrentSources
+ internal static WeakReferenceList CriticalCurrentSources
{
get
{
- return (IEnumerable)_sources;
+ return _sources;
}
}
From c8742b5c39f72927e8598825291d6cf4e593df10 Mon Sep 17 00:00:00 2001
From: Stephen Toub
Date: Thu, 21 Jul 2022 01:18:09 -0400
Subject: [PATCH 109/109] Avoid delegate allocation to call
ListCollectionView.PrepareComparer (#6511)
Pass the required state is a a static object to be passed on to the delegate invocation.
---
.../MS/Internal/Data/CollectionViewGroupInternal.cs | 10 +++++-----
.../System/Windows/Data/ListCollectionView.cs | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/CollectionViewGroupInternal.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/CollectionViewGroupInternal.cs
index c844a5420fd..c4c4070dd13 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/CollectionViewGroupInternal.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/CollectionViewGroupInternal.cs
@@ -87,11 +87,11 @@ internal GroupDescription GroupBy
ListCollectionView.PrepareComparer(
_groupBy.CustomSort,
_groupBy.SortDescriptionsInternal,
- () =>
+ static state =>
{
- for (CollectionViewGroupInternal group = this;
- group != null;
- group = group.Parent)
+ for (CollectionViewGroupInternal group = (CollectionViewGroupInternal)state;
+ group != null;
+ group = group.Parent)
{
CollectionViewGroupRoot root = group as CollectionViewGroupRoot;
if (root != null)
@@ -100,7 +100,7 @@ internal GroupDescription GroupBy
}
}
return null; // this should never happen - root should always be present
- });
+ }, this);
if (oldIsBottomLevel != IsBottomLevel)
{
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ListCollectionView.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ListCollectionView.cs
index 2fe20fd83c2..e9ddb8c0748 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ListCollectionView.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/ListCollectionView.cs
@@ -2447,7 +2447,7 @@ internal bool HasSortDescriptions
// return an appropriate comparer. Common logic used by ListCollectionView
// and by CollectionViewGroupInternal.
- internal static IComparer PrepareComparer(IComparer customSort, SortDescriptionCollection sort, Func lazyGetCollectionView)
+ internal static IComparer PrepareComparer(IComparer customSort, SortDescriptionCollection sort, Func lazyGetCollectionView, object state)
{
if (customSort != null)
{
@@ -2456,7 +2456,7 @@ internal static IComparer PrepareComparer(IComparer customSort, SortDescriptionC
if (sort != null && sort.Count > 0)
{
- CollectionView view = lazyGetCollectionView();
+ CollectionView view = lazyGetCollectionView(state);
Debug.Assert(view != null, "lazyGetCollectionView should not return null");
if (view.SourceCollection != null)
@@ -2895,7 +2895,7 @@ private void AdjustCurrencyForReplace(int index)
private void PrepareShaping()
{
// sort: prepare the comparer
- ActiveComparer = ListCollectionView.PrepareComparer(_customSort, _sort, () => { return this; });
+ ActiveComparer = PrepareComparer(_customSort, _sort, static state => (ListCollectionView)state, this);
// filter: prepare the Predicate