Skip to content

Commit 55f1e8a

Browse files
authored
fix: prepare for .net10 (gitextensions#12519)
Fix obsolete code for .net10 Reenable some code analyzers disabled in .net9 update
1 parent d76d46a commit 55f1e8a

File tree

9 files changed

+22
-31
lines changed

9 files changed

+22
-31
lines changed

eng/GitExtensions.ruleset

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<Rule Id="VSTHRD110" Action="None" />
1111
</Rules>
1212
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
13-
<Rule Id="SA1010" Action="None" />
1413
<Rule Id="SA1101" Action="None" />
1514
<Rule Id="SA1116" Action="None" />
1615
<Rule Id="SA1117" Action="None" />

src/app/GitCommands/Remotes/AzureDevOpsRemoteParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public sealed partial class AzureDevOpsRemoteParser : RemoteParser
1717
[GeneratedRegex(@"^git@ssh\.dev\.azure\.com:v\d\/(?<owner>[^\/]*)\/(?<project>[^\/]*)\/(?<repo>.*)$")]
1818
private static partial Regex AzureDevopsSshRemoteRegex();
1919

20-
private static readonly Regex[] _azureDevopsRegexes = [ AzureDevopsHttpsRemoteRegex(), AzureDevopsSshRemoteRegex(), VstsHttpsRemoteRegex(), VstsSshRemoteRegex()];
20+
private static readonly Regex[] _azureDevopsRegexes = [AzureDevopsHttpsRemoteRegex(), AzureDevopsSshRemoteRegex(), VstsHttpsRemoteRegex(), VstsSshRemoteRegex()];
2121

2222
public bool IsValidRemoteUrl(string remoteUrl)
2323
=> TryExtractAzureDevopsDataFromRemoteUrl(remoteUrl, out _, out _, out _);

src/app/GitUI/CommandsDialogs/FormBrowse.cs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,14 @@ protected override void OnDeactivate(EventArgs e)
576576

577577
protected override void OnFormClosing(FormClosingEventArgs e)
578578
{
579+
// Restore state at startup if file history mode, ignore the forced setting
580+
if (_isFileHistoryMode)
581+
{
582+
MainSplitContainer.Panel1Collapsed = _fileBlameHistoryLeftPanelStartupState;
583+
}
584+
585+
_splitterManager.SaveSplitters();
586+
579587
SaveApplicationSettings();
580588

581589
foreach (Control control in this.FindDescendants())
@@ -587,23 +595,11 @@ protected override void OnFormClosing(FormClosingEventArgs e)
587595
base.OnFormClosing(e);
588596
}
589597

590-
protected override void OnClosing(CancelEventArgs e)
591-
{
592-
// Restore state at startup if file history mode, ignore the forced setting
593-
if (_isFileHistoryMode)
594-
{
595-
MainSplitContainer.Panel1Collapsed = _fileBlameHistoryLeftPanelStartupState;
596-
}
597-
598-
_splitterManager.SaveSplitters();
599-
base.OnClosing(e);
600-
}
601-
602-
protected override void OnClosed(EventArgs e)
598+
protected override void OnFormClosed(FormClosedEventArgs e)
603599
{
604600
PluginRegistry.Unregister(UICommands);
605601
RevisionGrid.CancelBackgroundTasks();
606-
base.OnClosed(e);
602+
base.OnFormClosed(e);
607603
}
608604

609605
protected override void OnUICommandsChanged(GitUICommandsChangedEventArgs e)

src/app/GitUI/CommandsDialogs/FormSparseWorkingCopy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private void BindSaveOnClose(FormSparseWorkingCopyViewModel sparse)
2525
{
2626
ArgumentNullException.ThrowIfNull(sparse);
2727

28-
Closing += (sender, args) =>
28+
FormClosing += (sender, args) =>
2929
{
3030
try
3131
{

src/app/GitUI/CommandsDialogs/FormSubmodules.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ protected override void OnLoad(EventArgs e)
4141
base.OnLoad(e);
4242
}
4343

44-
protected override void OnClosing(CancelEventArgs e)
44+
protected override void OnFormClosing(FormClosingEventArgs e)
4545
{
4646
_splitterManager.SaveSplitters();
47-
base.OnClosing(e);
47+
base.OnFormClosing(e);
4848
}
4949

5050
private void AddSubmoduleClick(object sender, EventArgs e)

src/app/GitUI/GitUI.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<Nullable>annotations</Nullable>
88

99
<ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
10-
<!-- Suppress suggestion to use experimental API ShowDialogAsync -->
11-
<NoWarn>$(NoWarn);WFO5002</NoWarn>
10+
1211
<!--
1312
For debug purposes uncomment these lines:
1413

src/plugins/Bitbucket/BitbucketRequestBase.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ protected BitbucketRequestBase(Settings settings)
2525

2626
public async Task<BitbucketResponse<T>> SendAsync()
2727
{
28-
if (Settings.DisableSSL)
29-
{
30-
#pragma warning disable SYSLIB0014 // Type or member is obsolete
31-
System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
32-
#pragma warning restore SYSLIB0014 // Type or member is obsolete
33-
}
34-
3528
Validates.NotNull(Settings.BitbucketUrl);
3629
Validates.NotNull(Settings.Username);
3730
Validates.NotNull(Settings.Password);
@@ -41,6 +34,10 @@ public async Task<BitbucketResponse<T>> SendAsync()
4134
BaseUrl = new Uri(Settings.BitbucketUrl),
4235
Authenticator = new HttpBasicAuthenticator(Settings.Username, Settings.Password)
4336
};
37+
if (Settings.DisableSSL)
38+
{
39+
client.RemoteCertificateValidationCallback = delegate { return true; };
40+
}
4441

4542
RestRequest request = new(ApiUrl, RequestMethod);
4643
if (RequestBody is not null)

src/plugins/BuildServerIntegration/TeamCityIntegration/TeamCityAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ private Task<XDocument> GetProjectsResponseAsync(CancellationToken cancellationT
549549

550550
private Task<XDocument> GetFilteredBuildsXmlResponseAsync(string buildTypeId, CancellationToken cancellationToken, DateTime? sinceDate = null, bool? running = null)
551551
{
552-
List<string> values = [ "branch:(default:any)"];
552+
List<string> values = ["branch:(default:any)"];
553553

554554
if (sinceDate.HasValue)
555555
{

src/plugins/Statistics/GitImpact/FormImpact.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public FormImpact(IGitModule module)
2121
}
2222
}
2323

24-
protected override void OnClosed(EventArgs e)
24+
protected override void OnFormClosed(FormClosedEventArgs e)
2525
{
2626
Impact.Stop();
2727

28-
base.OnClosed(e);
28+
base.OnFormClosed(e);
2929

3030
Impact.Dispose();
3131
}

0 commit comments

Comments
 (0)