halgab · halgab · Jul 25, 2023 · Jul 25, 2023 · Jul 25, 2023 · Jul 25, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -14,6 +14,11 @@ indent_size = 4
 [*.json]
 indent_size = 2
 
+# Bvc.dll crashed in the CI build when this rule is enabled for VB.
+# C# files
+[src/**/*.cs]
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
+
 # C# and VB files
 [*.{cs,vb}]
 charset = utf-8-bom
@@ -32,7 +37,7 @@ dotnet_style_predefined_type_for_member_access = true:suggestion
 # name all constant fields using PascalCase
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 
 dotnet_naming_symbols.constant_fields.applicable_kinds   = field
 dotnet_naming_symbols.constant_fields.required_modifiers = const
@@ -42,7 +47,7 @@ dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 # static fields should have s_ prefix
 dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
 dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
-dotnet_naming_rule.static_fields_should_have_prefix.style    = static_prefix_style
+dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
 
 dotnet_naming_symbols.static_fields.applicable_kinds   = field
 dotnet_naming_symbols.static_fields.required_modifiers = static
@@ -53,7 +58,7 @@ dotnet_naming_style.static_prefix_style.capitalization = camel_case
 # internal and private fields should be _camelCase
 dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
 dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
-dotnet_naming_rule.camel_case_for_private_internal_fields.style    = camel_case_underscore_style
+dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
 
 dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
@@ -70,13 +75,28 @@ dotnet_style_collection_initializer = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
 
 # C# files
 [*.cs]
 
 # .NET diagnostic
 dotnet_diagnostic.RS0041.severity = none
-dotnet_diagnostic.IDE0005.severity = warning
+dotnet_diagnostic.IDE0005.severity = error
 
 # New line preferences
 csharp_new_line_before_open_brace = all
@@ -95,7 +115,7 @@ csharp_indent_switch_labels = true
 csharp_indent_labels = one_less_than_current
 
 # only use var when it's obvious what the variable type is
-csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_for_built_in_types = false:error
 csharp_style_var_when_type_is_apparent = true:silent
 csharp_style_var_elsewhere = false:silent
 
@@ -104,12 +124,12 @@ csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = false
 
 # Expression-bodied members
-csharp_style_expression_bodied_methods = false:none
-csharp_style_expression_bodied_constructors = false:none
-csharp_style_expression_bodied_operators = false:none
-csharp_style_expression_bodied_properties = true:none
-csharp_style_expression_bodied_indexers = true:none
-csharp_style_expression_bodied_accessors = true:none
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_constructors = true:silent
+csharp_style_expression_bodied_operators = true:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
 
 # Pattern matching
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
@@ -146,6 +166,23 @@ csharp_space_between_square_brackets = false
 
 # IDE0008: Use explicit type
 dotnet_diagnostic.IDE0008.severity = silent
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+# IDE0090: Use new()
+dotnet_diagnostic.IDE0090.severity = error
+csharp_style_deconstructed_variable_declaration = true:suggestion
 
 # Visual Basic files
 
@@ -185,4 +222,4 @@ insert_final_newline = true
 end_of_line = lf
 
 [*.{cmd,bat}]
-end_of_line = crlf
+end_of_line = crlf
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
@@ -645,7 +645,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "8.0 RC1"
+              "milestoneName": "9.0 Preview1"
             }
           }
         ],

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,9 +6,13 @@
   <Import Project="$(RepositoryEngineeringDir)ApiCompatibility\PublicApiAnalyzer.props" />
 
   <PropertyGroup>
+    <!-- Remove hardcoded .NET versions when Arcade is upgraded to .NET 9.0. https://github.com/dotnet/winforms/issues/9851-->
+    <NetMinimum>net8.0</NetMinimum>
+    <NetPrevious>net8.0</NetPrevious>
+    <NetCurrent>net8.0</NetCurrent>
     <TargetFrameworkName>net</TargetFrameworkName>
-	<TargetFrameworkMajorVersion>8</TargetFrameworkMajorVersion>
-	<TargetFrameworkMinorVersion>0</TargetFrameworkMinorVersion>
+	  <TargetFrameworkMajorVersion>8</TargetFrameworkMajorVersion>
+	  <TargetFrameworkMinorVersion>0</TargetFrameworkMinorVersion>
     <TargetFrameworkVersion>$(TargetFrameworkMajorVersion).$(TargetFrameworkMinorVersion)</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
     <Product>Microsoft&#xAE; .NET</Product>

diff --git a/NuGet.config b/NuGet.config
@@ -8,6 +8,8 @@
     <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <!-- Used for the Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -34,6 +34,7 @@ pr:
       - internal/release/*
       - internal/experimental/*
       - feature/win32
+      - feature/9.0
   paths:
     include:
       - '*'

diff --git a/docs/designer/designer-high-dpi-mode.md b/docs/designer/designer-high-dpi-mode.md
@@ -0,0 +1,38 @@
+# Designer HighDpi mode
+Visual Studio 2022 and beyond by default launch in PerMonitor DpiAwareness mode but it also supports SystemAware and Unaware DpiAwareness modes when users launch it with [custom settings](https://docs.microsoft.com/visualstudio/designers/disable-dpi-awareness?view=vs-2022). The WinForms designer does not fully support PerMonitor DpiAwareness mode yet and by default launches in SystemAware mode.
+
+In .NET 6, as part of unifying the information sharing between WinForms designer and WinForms runtime, we added [support](https://aka.ms/applicationconfiguration) for specifying the application dpi mode as a build time property on the project and share it for both designtime and at runtime.
+
+## Issues
+ The Winforms designer, when operating in SystemAware/PermonitorV2 mode, serializes layout metrics into the source file based on the Dpi setting of the current display device on which it is being rendered. This may lead to two kinds of problems.
+
+ 1. WinForms applications developed on a machine with DPI settings different from the machine where they are executed may encounter layout inconsistencies. 
+
+ 2. Within a team of multiple developers collaborating on the same project, this situation can lead to unintentional modifications in the serialized source code, even if they are unrelated to the intended changes. As a consequence, it introduces additional overhead in the code review and merging process.
+
+The following example demonstrates an undesired modification in the serialized WinForms source code.
+
+![Unwanted Serialization changes](../images/Serialization.png)
+
+
+Up until now, developers have been advised to adhere to the instructions given [here](https://go.microsoft.com/fwlink/?linkid=875609) and restart Visual Studio in DpiUnAware mode to resolve these problems. Nevertheless, this process requires individual developers to do it every time they work on the project, adding inconvenience. Additionally, the entire Visual Studio IDE would be launched as DPI Unaware resulting in a blurry IDE experience.
+
+## Solution
+
+In Visual Studio 2022 Version 17.8, we are introducing a new [configuration]((https://aka.ms/applicationconfiguration)) option called `ForceDesignerDpiUnaware`, distinct from `ApplicationHighDpiMode`. This option enables developers to enforce DpiUnAware mode for all WinForms designers in the project, regardless of the `ApplicationHighDpiMode`, which continues to take effect during runtime. The rest of the Visual Studio environment remains in PerMonitor mode and renders crisply.
+
+
+```CS
+
+ <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+	<ApplicationHighDpiMode>SystemAware</ApplicationHighDpiMode>
+    <ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
+  </PropertyGroup>
+```
+
diff --git a/docs/images/Serialization.png b/docs/images/Serialization.png
diff --git a/docs/testing.md b/docs/testing.md
@@ -126,7 +126,7 @@ Tests are built and executed by file name convention
     [WinFormsFact]
     public void ButtonBase_GetAutoSizeMode_Invoke_ReturnsExpected()
     {
-        using var control = new SubButtonBase();
+        using SubButtonBase control = new();
         Assert.Equal(AutoSizeMode.GrowOnly, control.GetAutoSizeMode());
     }  
   ```
@@ -163,8 +163,8 @@ When writing theories note the following:
     [WinFormsTheory]
     [MemberData(nameof(GetButton_TestData))]
     public void Ctor_Control_DataGridViewCellStyle(string buttonText) 
-    { 
-        using var button = new Button() { Text = buttonText };
+    {
+        using Button button = new() { Text = buttonText };
         ...
     }    
     ```
@@ -184,7 +184,7 @@ When writing theories note the following:
     // ** DO NOT DO THIS! **
     public static IEnumerable<object[]> GetButton_TestData()
     {
-        var button = new Button();
+        Button button = new();
         yield return new object[] { button, new DataGridViewCellStyle() };
         yield return new object[] { button { Text = "bla" }, new DataGridViewCellStyle() }; // the button could already be disposed by the time this theory runs
     }
@@ -233,12 +233,12 @@ public void MyControl_Rendering()
     // 1. Create a control to validate rendering for.
     // 2. Add the control to a form, and make sure the form is created
     using Form form = new Form();
-    using var control = new MyControl { ... };
+    using MyControl control = new() { ... };
     form.Controls.Add(control);
     Assert.NotEqual(IntPtr.Zero, form.Handle);
 
     // Create an Enhance Metafile into which we will render the control
-    using var emf = new EmfScope();
+    using EmfScope emf = new();
     DeviceContextState state = new DeviceContextState(emf);
 
     // Render the control