merge main branch

.github/ISSUE_TEMPLATE/doc-issue.md

@@ -1,44 +0,0 @@
----
-name: .NET doc issue
-about: Report a problem in the .NET documentation
----
-
-**Before you open an issue**
-
-(Delete this section before you submit your issue)
-
-If the issue is:
-
-- A simple typo or similar correction, consider submitting a PR to fix it instead of logging an issue. See https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents for instructions
-
-- A general support question, consider asking on a support forum site such as StackOverflow.
-
-- A site design concern, create an issue at https://github.com/MicrosoftDocs/feedback/issues/new/choose
-
-- A problem completing a tutorial, compare your code with the completed sample.
-
-- A duplicate of an open or closed issue, leave a comment on that issue.
-
-(Delete the content above before you submit your issue)
-
-**Issue description**
-
-Include description here
-
-**.NET or .NET Framework**
-
-Check the .NET target framework(s) being used, and include the version number(s). Put an `x` between the `[ ]` to check it.
-
-- [ ] .NET (5 or Core)
-- [ ] .NET Framework
-
-**Technology**
-
-Check the .NET target framework(s) being used, and include the version number(s). Put an `x` between the `[ ]` to check it.
-
-- [ ] WPF
-- [ ] Windows Forms
-
-**.NET information**
-
-If using the .NET SDK or .NET Core SDK, include `dotnet --info` output. If using .NET Framework without the .NET Core SDK, include info from Visual Studio's **Help** > **About Microsoft Visual Studio** dialog.

.github/ISSUE_TEMPLATE/docs-issue.yml

@@ -0,0 +1,62 @@
+name: "Desktop doc problem"
+description: Report a problem in the WPF/Windows Forms documentation.
+title: "[doc bug]: "
+labels: Pri1,doc-bug
+assignees:
+ - adegeo
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ```
+         ┌──────────┐
+         │IMPORTANT ├──────────────────────────┐
+         └───────┬──┘ Please read the          │
+                 │       following statement   │
+                 └─────────────────────────────┘
+        ```
+
+        If you're reporting a general product usage question (ex: how do I set the text of a button?), it's better to use Q&A forum like:
+        
+        - [Stack Overflow](https://stackoverflow.com/)
+        - [Microsoft Q&A](https://docs.microsoft.com/answers/products/)
+        
+        If your question is related to documentation, please fill out the following information.
+        
+  - type: input
+    id: url
+    attributes:
+      label: Article URL
+      description: "Which article has the problem?"
+    validations:
+      required: true
+      
+  - type: dropdown
+    id: technology
+    attributes:
+      label: Technology
+      description: Which desktop technology are you using?
+      options:
+        - WPF (Windows Presentation Foundation)
+        - Windows Forms
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: platform
+    attributes:
+      label: Version
+      description: Which .NET version did you notice this problem with?
+      options:
+        - label: ".NET 5 or later (also .NET Core)"
+        - label: ".NET Framework 4"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: What's the problem you had with the documentation? (markdown allowed)
+    validations:
+      required: true

dotnet-desktop-guide/net/winforms/migration/index.md

@@ -173,7 +173,7 @@ Any _*.resx_ and _*.settings_ files in the _Properties_ folder need to be migrat
 
   ```xml
   <ItemGroup>
-    <None Include="Properties\Settings.settings">
+    <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
@@ -185,8 +185,6 @@ Any _*.resx_ and _*.settings_ files in the _Properties_ folder need to be migrat
   </ItemGroup>
   ```
 
-  Notice that the _Properties\Settings.settings_ entry remained `Include`. The project doesn't automatically include _settings_ files.
-
   > [!IMPORTANT]
   > **Visual Basic** projects typically use the folder _My Project_ while C# projects typically use the folder _Properties_ for the default project settings file.