Merge branch 'dotnet:main' into master

.editorconfig

@@ -264,7 +264,7 @@ dotnet_diagnostic.IDE0057.severity = suggestion
 dotnet_diagnostic.IDE0058.severity = silent
 
 # IDE0059: Unnecessary assignment of a value
-dotnet_diagnostic.IDE0059.severity = none # TODO: warning
+dotnet_diagnostic.IDE0059.severity = warning
 
 # IDE0060: Remove unused parameter
 dotnet_diagnostic.IDE0060.severity = silent
@@ -708,7 +708,7 @@ dotnet_diagnostic.CA1819.severity = none
 dotnet_diagnostic.CA1820.severity = none
 
 # CA1821: Remove empty Finalizers
-dotnet_diagnostic.CA1821.severity = none # TODO: warning
+dotnet_diagnostic.CA1821.severity = warning
 
 # CA1822: Mark members as static
 dotnet_diagnostic.CA1822.severity = warning
@@ -1277,7 +1277,7 @@ dotnet_diagnostic.CA5405.severity = error
 dotnet_diagnostic.CS1573.severity = none
 
 # IL3000: Avoid using accessing Assembly file path when publishing as a single-file
-dotnet_diagnostic.IL3000.severity = none # TODO: warning
+dotnet_diagnostic.IL3000.severity = warning
 
 # IL3001: Avoid using accessing Assembly file path when publishing as a single-file
 dotnet_diagnostic.IL3001.severity = warning
@@ -1523,8 +1523,8 @@ dotnet_diagnostic.SA1204.severity = none
 # SA1205: Partial elements should declare an access modifier
 dotnet_diagnostic.SA1205.severity = warning
 
-# SA1206: Keyword ordering - TODO Re-enable as warning after https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3527
-dotnet_diagnostic.SA1206.severity = suggestion
+# SA1206: Keyword ordering
+dotnet_diagnostic.SA1206.severity = warning
 
 # SA1207: Protected should come before internal
 dotnet_diagnostic.SA1207.severity = none
@@ -1563,7 +1563,7 @@ dotnet_diagnostic.SA1300.severity = none
 dotnet_diagnostic.SA1301.severity = none
 
 # SA1302: Interface names should begin with I
-dotnet_diagnostic.SA1302.severity = none # TODO: warning
+dotnet_diagnostic.SA1302.severity = warning
 
 # SA1303: Const field names should begin with upper-case letter
 dotnet_diagnostic.SA1303.severity = none
@@ -1617,7 +1617,7 @@ dotnet_diagnostic.SA1402.severity = none
 dotnet_diagnostic.SA1403.severity = none
 
 # SA1404: Code analysis suppression should have justification
-dotnet_diagnostic.SA1404.severity = none # TODO: warning
+dotnet_diagnostic.SA1404.severity = warning
 
 # SA1405: Debug.Assert should provide message text
 dotnet_diagnostic.SA1405.severity = none
@@ -2252,6 +2252,9 @@ dotnet_diagnostic.CA2302.severity = none
 # CA5394: Do not use insecure randomness
 dotnet_diagnostic.CA5394.severity = none
 
+# IL3000: Avoid using accessing Assembly file path when publishing as a single-file
+dotnet_diagnostic.IL3000.severity = none
+
 # SA1115: Parameter should begin on the line after the previous parameter
 dotnet_diagnostic.SA1115.severity = none
 

Directory.Build.targets

@@ -87,18 +87,6 @@
     <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('$(RedistTargetFrameworkName)'))" />
   </PropertyGroup>
 
-  <Choose>
-    <When Condition="'$(IncludeInternalObsoleteAttribute)' == 'true' and '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-      <ItemGroup>
-        <Compile Include="$(RepoRoot)src\Common\src\ObsoleteAttribute.cs" />
-      </ItemGroup>
-      <PropertyGroup>
-        <!-- Suppress CS0436 to allow ObsoleteAttribute to be internally defined and used in .NET Standard. -->
-        <NoWarn>$(NoWarn);CS0436</NoWarn>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
   <!-- If a tfm doesn't target .NETCoreApp but uses the platform support attributes, then we include the
        System.Runtime.Versioning*Platform* annotation attribute classes in the project as internal.
 

Winforms.sln

@@ -55,6 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentat
 		docs\developer-guide.md = docs\developer-guide.md
 		docs\getting-started.md = docs\getting-started.md
 		docs\issue-guide.md = docs\issue-guide.md
+		docs\list-of-diagnostics.md = docs\list-of-diagnostics.md
 		docs\porting-guidelines.md = docs\porting-guidelines.md
 		README.md = README.md
 		docs\roadmap.md = docs\roadmap.md
@@ -199,6 +200,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{
 		eng\Analyzer.targets = eng\Analyzer.targets
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Windows.GdiPlus", "src\System.Private.Windows.GdiPlus\System.Private.Windows.GdiPlus.csproj", "{442C867C-51C0-8CE5-F067-DF065008E3DA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1083,6 +1086,22 @@ Global
 		{B653C860-9B52-4597-9921-24DA79A4E6B1}.Release|x64.Build.0 = Release|Any CPU
 		{B653C860-9B52-4597-9921-24DA79A4E6B1}.Release|x86.ActiveCfg = Release|Any CPU
 		{B653C860-9B52-4597-9921-24DA79A4E6B1}.Release|x86.Build.0 = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|arm64.Build.0 = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|x64.Build.0 = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Debug|x86.Build.0 = Debug|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|arm64.ActiveCfg = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|arm64.Build.0 = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|x64.ActiveCfg = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|x64.Build.0 = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{442C867C-51C0-8CE5-F067-DF065008E3DA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1152,6 +1171,7 @@ Global
 		{B653C860-9B52-4597-9921-24DA79A4E6B1} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{656C66A4-59CD-4E14-8AE4-1F5BCEECB553} = {8B4B1E09-B3C7-4044-B223-94EDEC1CAA20}
 		{D4D97D78-D213-45DF-B003-9C4C9F2E5E1C} = {8B4B1E09-B3C7-4044-B223-94EDEC1CAA20}
+		{442C867C-51C0-8CE5-F067-DF065008E3DA} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}

codecov.yml

@@ -25,6 +25,7 @@ flags:                            # which files to include in the reporting
       - src/System.Drawing.Common/src/
       - src/System.Drawing.Design/src/
       - src/System.Private.Windows.Core/src/
+      - src/System.Private.Windows.GdiPlus/
       - src/System.Windows.Forms/src/
       - src/System.Windows.Forms.Analyzers/src/
       - src/System.Windows.Forms.Analyzers.CSharp/src/

docs/list-of-diagnostics.md

@@ -13,6 +13,7 @@ The acceptance criteria for adding an obsoletion includes:
 * Add new constants to `src\Common\src\Obsoletions.cs`, following the existing conventions
     * A `...Message` const using the same description added to the table below
     * A `...DiagnosticId` const for the `WFDEV###` id
+* If adding <Obsolete> attribute to Microsoft.VisualBasic.Forms assembly, edit src\Microsoft.VisualBasic.Forms\src\Obsoletions.vb file
 * Annotate `src` files by referring to the constants defined from `Obsoletions.cs`
     * Specify the `UrlFormat = Obsoletions.SharedUrlFormat`
     * Example: `[Obsolete(Obsoletions.DomainUpDownAccessibleObjectMessage, DiagnosticId = Obsoletions.DomainUpDownAccessibleObjectDiagnosticId, UrlFormat = Obsoletions.SharedUrlFormat)]`
@@ -39,6 +40,9 @@ The acceptance criteria for adding an obsoletion includes:
 |  __`WFDEV002`__ | `DomainUpDown.DomainUpDownAccessibleObject` is no longer used to provide accessible support for `DomainUpDown` controls. Use `ControlAccessibleObject` instead. |
 |  __`WFDEV003`__ | `DomainUpDown.DomainItemAccessibleObject` is no longer used to provide accessible support for `DomainUpDown` items. |
 |  __`WFDEV004`__ | `Form.OnClosing`, `Form.OnClosed` and the corresponding events are obsolete. Use `Form.OnFormClosing`, `Form.OnFormClosed`, `Form.FormClosing` and `Form.FormClosed` instead. |
+|  __`WFDEV005`__ | `Clipboard.GetData(string)` method is obsolete. Use `Clipboard.TryGetData<T>` methods instead. |
+|  __`WFDEV005`__ | `DataObject.GetData` methods are obsolete. Use the corresponding `DataObject.TryGetData<T>` instead. |
+|  __`WFDEV005`__ | `ClipboardProxy.GetData(As String)` method is obsolete. Use `ClipboardProxy.TryGetData(Of T)(As String, As T)` instead. |
 
 
 ## Analyzer Warnings