Browse Source

feat!: .net9 (#12064)

suppress VSTHRD103,WFO1000

Refs: #12064
pull/12150/head
Gerhard Olsson 5 months ago
committed by GitHub
parent
commit
03e078e251
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      .editorconfig
  2. 4
      eng/RepoLayout.props
  3. 2
      eng/Update-DotnetVersion.ps1
  4. 2
      externals/Git.hub
  5. 2
      externals/ICSharpCode.TextEditor
  6. 2
      externals/NetSpell.SpellChecker/SpellChecker.csproj
  7. 2
      externals/conemu-inside
  8. 2
      global.json
  9. 2
      src/app/GitUI/CommandsDialogs/FormFormatPatch.cs
  10. 3
      src/app/GitUI/GitUI.csproj
  11. 5
      src/app/GitUI/GlobalSuppressions.cs
  12. 2
      src/plugins/Bitbucket/BitbucketRequestBase.cs
  13. 8
      src/plugins/BuildServerIntegration/AzureDevOpsIntegration/GlobalSuppressions.cs

4
.editorconfig

@ -296,3 +296,7 @@ csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimenta
csharp_style_prefer_pattern_matching = true:silent csharp_style_prefer_pattern_matching = true:silent
csharp_style_prefer_not_pattern = true:suggestion csharp_style_prefer_not_pattern = true:suggestion
csharp_style_prefer_extended_property_pattern = true:suggestion csharp_style_prefer_extended_property_pattern = true:suggestion
# WFO1000: A property should determine its property content serialization with the DesignerSerializationVisibilityAttribute, DefaultValueAttribute or the ShouldSerializeProperty method
# Silent for now, see https://github.com/dotnet/winforms/issues/12476
dotnet_diagnostic.WFO1000.severity = silent

4
eng/RepoLayout.props

@ -9,8 +9,8 @@
<!-- Set version for runtimeconfig.json, used by DotnetRuntimeBootstrapper for minimal version to support <!-- Set version for runtimeconfig.json, used by DotnetRuntimeBootstrapper for minimal version to support
To be kept in sync with the .NET SDK version in global.json To be kept in sync with the .NET SDK version in global.json
--> -->
<RuntimeFrameworkVersion>8.0.0</RuntimeFrameworkVersion>
<SolutionTargetFramework>net8.0-windows</SolutionTargetFramework>
<RuntimeFrameworkVersion>9.0.0</RuntimeFrameworkVersion>
<SolutionTargetFramework>net9.0-windows</SolutionTargetFramework>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform> <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
<PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName> <PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName>

2
eng/Update-DotnetVersion.ps1

@ -1,4 +1,4 @@
param ( [string]$version = "8.0")
param ( [string]$version = "9.0")
$encoding = [System.Text.UTF8Encoding]::new($false) $encoding = [System.Text.UTF8Encoding]::new($false)

2
externals/Git.hub

@ -1 +1 @@
Subproject commit 8b7e1cec4b4e87a45fd26f7cc8a56e3951f265a7
Subproject commit 1b0386aea1acdd2ba258977bd79e40a0a7b95665

2
externals/ICSharpCode.TextEditor

@ -1 +1 @@
Subproject commit 1cb6d9c201324c9f521148ce9c9fb544e09f1b1a
Subproject commit 48f506b0f1266d52f06e9236fe242753c7de9e17

2
externals/NetSpell.SpellChecker/SpellChecker.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

2
externals/conemu-inside

@ -1 +1 @@
Subproject commit c0b721fc0eb9fbdbcb5a26d6612690b5222ce569
Subproject commit 12f5d069560d028fd969f49ce4e7d1a19ab35380

2
global.json

@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "8.0.0",
"version": "9.0",
"rollForward": "feature" "rollForward": "feature"
} }
} }

2
src/app/GitUI/CommandsDialogs/FormFormatPatch.cs

@ -225,7 +225,9 @@ namespace GitUI.CommandsDialogs
: CredentialCache.DefaultNetworkCredentials; : CredentialCache.DefaultNetworkCredentials;
} }
#pragma warning disable SYSLIB0014 // Type or member is obsolete
ServicePointManager.ServerCertificateValidationCallback = delegate { return true; }; ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
#pragma warning restore SYSLIB0014 // Type or member is obsolete
smtpClient.Send(mail); smtpClient.Send(mail);
} }

3
src/app/GitUI/GitUI.csproj

@ -7,7 +7,8 @@
<Nullable>annotations</Nullable> <Nullable>annotations</Nullable>
<ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware> <ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
<!-- Suppress suggestion to use experimental API ShowDialogAsync -->
<NoWarn>$(NoWarn);WFO5002</NoWarn>
<!-- <!--
For debug purposes uncomment these lines: For debug purposes uncomment these lines:

5
src/app/GitUI/GlobalSuppressions.cs

@ -8,8 +8,13 @@
// "In Suppression File". // "In Suppression File".
// You do not need to add suppressions to this file manually. // You do not need to add suppressions to this file manually.
using System.Diagnostics.CodeAnalysis;
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1824:MarkAssembliesWithNeutralResourcesLanguage")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1824:MarkAssembliesWithNeutralResourcesLanguage")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "Westhuis", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "Westhuis", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "Henk", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "Henk", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "henkwesthuis", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "henkwesthuis", Scope = "member", Target = "GitUI.AboutBox.#InitializeComponent()")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "ppk", Scope = "member", Target = "GitUI.BrowseForPrivateKey.#Browse(System.Windows.Forms.IWin32Window)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "ppk", Scope = "member", Target = "GitUI.BrowseForPrivateKey.#Browse(System.Windows.Forms.IWin32Window)")]
[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "<Pending>", Scope = "member", Target = "~M:GitUI.BuildServerIntegration.BuildServerWatcher.ShowBuildServerCredentialsFormAsync(System.String,GitUIPluginInterfaces.BuildServerIntegration.IBuildServerCredentials)~System.Threading.Tasks.Task{GitUIPluginInterfaces.BuildServerIntegration.IBuildServerCredentials}")]
[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "<Pending>", Scope = "member", Target = "~M:GitUI.CommandsDialogs.BrowseDialog.FormUpdates.Done")]
[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "<Pending>", Scope = "member", Target = "~M:GitUI.CommandsDialogs.RepoHosting.CreatePullRequestForm.PopulateBranchesComboAndEnableCreateButton(GitExtensions.Extensibility.Plugins.IHostedRemote,System.Windows.Forms.ComboBox)")]

2
src/plugins/Bitbucket/BitbucketRequestBase.cs

@ -27,7 +27,9 @@ namespace GitExtensions.Plugins.Bitbucket
{ {
if (Settings.DisableSSL) if (Settings.DisableSSL)
{ {
#pragma warning disable SYSLIB0014 // Type or member is obsolete
System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; }; System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
#pragma warning restore SYSLIB0014 // Type or member is obsolete
} }
Validates.NotNull(Settings.BitbucketUrl); Validates.NotNull(Settings.BitbucketUrl);

8
src/plugins/BuildServerIntegration/AzureDevOpsIntegration/GlobalSuppressions.cs

@ -0,0 +1,8 @@
// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project.
// Project-level suppressions either have no target or are given
// a specific target and scoped to a namespace, type, member, etc.
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "<Pending>", Scope = "member", Target = "~M:AzureDevOpsIntegration.AzureDevOpsAdapter.EnsureBuildDefinitionsIsInitializedAsync(System.IObserver{GitExtensions.Extensibility.BuildServerIntegration.BuildInfo})~System.Threading.Tasks.Task{System.Boolean}")]
Loading…
Cancel
Save