Skip to content

Commit a2310fe

Browse files
committed
fix: resolve all CA warnings for CI -warnaserror
1 parent 61a3e0d commit a2310fe

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

src/TSG/Installer.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public async Task UninstallAsync()
5656
if (File.Exists(host.ShellProfilePath))
5757
{
5858
var content = await File.ReadAllTextAsync(host.ShellProfilePath);
59-
var start = content.IndexOf(Marker);
60-
var end = content.IndexOf(EndMarker);
59+
var start = content.IndexOf(Marker, StringComparison.Ordinal);
60+
var end = content.IndexOf(EndMarker, StringComparison.Ordinal);
6161
if (start >= 0 && end >= 0)
6262
{
6363
content = content[..start] + content[(end + EndMarker.Length)..];
@@ -78,7 +78,7 @@ void ExtractScripts()
7878
var assembly = System.Reflection.Assembly.GetExecutingAssembly();
7979
var folder = OperatingSystem.IsWindows() ? ".Scripts.windows." : ".Scripts.linux.";
8080

81-
foreach (var name in assembly.GetManifestResourceNames().Where(n => n.Contains(folder)))
81+
foreach (var name in assembly.GetManifestResourceNames().Where(n => n.Contains(folder, StringComparison.Ordinal)))
8282
{
8383
var fileName = name[(name.LastIndexOf('.', name.LastIndexOf('.') - 1) + 1)..];
8484
var destPath = Path.Combine(host.TsgDir, fileName);
@@ -97,8 +97,8 @@ void ConfigurePwshProfile()
9797
var existing = File.Exists(host.ShellProfilePath) ? File.ReadAllText(host.ShellProfilePath) : "";
9898

9999
// Remove old block
100-
var start = existing.IndexOf(Marker);
101-
var end = existing.IndexOf(EndMarker);
100+
var start = existing.IndexOf(Marker, StringComparison.Ordinal);
101+
var end = existing.IndexOf(EndMarker, StringComparison.Ordinal);
102102
if (start >= 0 && end >= 0)
103103
existing = existing[..start] + existing[(end + EndMarker.Length)..];
104104

src/TSG/Platform/LinuxHost.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public async Task InstallTerminalIntegrationAsync()
3232
var profilePath = ShellProfilePath;
3333
var existing = File.Exists(profilePath) ? await File.ReadAllTextAsync(profilePath) : "";
3434

35-
if (existing.Contains("# TSG START"))
35+
if (existing.Contains("# TSG START", StringComparison.Ordinal))
3636
{
3737
Console.WriteLine(" ✅ Shell integration already installed");
3838
return;
@@ -64,8 +64,8 @@ public async Task RemoveTerminalIntegrationAsync()
6464
if (!File.Exists(profilePath)) return;
6565

6666
var content = await File.ReadAllTextAsync(profilePath);
67-
var start = content.IndexOf("# TSG START");
68-
var end = content.IndexOf("# TSG END");
67+
var start = content.IndexOf("# TSG START", StringComparison.Ordinal);
68+
var end = content.IndexOf("# TSG END", StringComparison.Ordinal);
6969
if (start >= 0 && end >= 0)
7070
{
7171
content = content[..start] + content[(end + "# TSG END".Length)..];

src/TSG/Platform/WindowsHost.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public async Task InstallTerminalIntegrationAsync()
4444
{
4545
Directory.CreateDirectory(FragmentDir);
4646

47-
var tsgDir = TsgDir.Replace("\\", "\\\\");
47+
var tsgDir = TsgDir.Replace("\\", "\\\\", StringComparison.Ordinal);
4848
var fragment = $$"""
4949
{
5050
"profiles": [
@@ -98,6 +98,7 @@ public async Task RemoveTerminalIntegrationAsync()
9898
p?.WaitForExit();
9999
return p?.ExitCode == 0 ? exe : null;
100100
}
101-
catch { return null; }
101+
catch (Exception ex) when (ex is InvalidOperationException or System.ComponentModel.Win32Exception or IOException)
102+
{ return null; }
102103
}
103104
}

src/TSG/TSG.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<NuGetAuditLevel>low</NuGetAuditLevel>
1818
<NuGetAuditMode>all</NuGetAuditMode>
1919
<!-- Suppress non-applicable for CLI tool -->
20-
<NoWarn>CA1303;CA2007;CA1724;CA1852</NoWarn>
20+
<NoWarn>CA1303;CA2007;CA1724;CA1852;CA1515;CA1308</NoWarn>
2121

2222
<!-- NuGet Tool -->
2323
<PackAsTool>true</PackAsTool>

0 commit comments

Comments
 (0)