Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Shared/Extensions/ProjectExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace SqlProjectsPowerTools
internal static class ProjectExtension
{
private const string SqlServerRulesPackageId = "ErikEJ.DacFX.SqlServer.Rules";
private const string TSqlSmellRulesPackageId = "ErikEJ.DacFX.TSQLSmellSCA";
private const string Indent = "\n ";
private const string EndElementIndent = "\n ";
Comment on lines 14 to 16
private const string NewLine = "\n";
Expand Down Expand Up @@ -200,8 +199,7 @@ public static async Task<bool> HasRulesPackagesAsync(this Project project)
return false;
}

return await project.IsInstalledAsync(SqlServerRulesPackageId)
|| await project.IsInstalledAsync(TSqlSmellRulesPackageId);
return await project.IsInstalledAsync(SqlServerRulesPackageId);
}

public static async Task<string> AddRulesPackagesAsync(this Project project)
Expand All @@ -226,7 +224,7 @@ public static async Task<string> AddRulesPackagesAsync(this Project project)
return "Unable to locate the selected project file.";
}

foreach (var packageId in new[] { SqlServerRulesPackageId, TSqlSmellRulesPackageId })
foreach (var packageId in new[] { SqlServerRulesPackageId })
{
if (await project.IsInstalledAsync(packageId))
{
Expand Down
5 changes: 0 additions & 5 deletions src/Shared/ViewModels/RuleViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@ private static string GetHelpLink(string id, string category)
return $"https://github.com/ErikEJ/SqlServer.Rules/blob/master/docs/{categoryName}/{ruleId}.md";
}

if (id.StartsWith("Smells.", StringComparison.OrdinalIgnoreCase))
{
return $"https://github.com/ErikEJ/SqlServer.Rules/blob/master/docs/CodeSmells/{ruleId}.md";
}

return string.Empty;
}

Expand Down
4 changes: 2 additions & 2 deletions src/SsmsVsix/Dialogs/ManageRulesDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
Margin="0,4,0,8"
VerticalAlignment="Center">
<TextBlock TextWrapping="Wrap"
Text="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules and ErikEJ.DacFX.TSQLSmellSCA)" />
Text="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules)" />
</CheckBox>

<!-- Enable Code Analysis checkbox -->
Expand All @@ -67,7 +67,7 @@
Visibility="{Binding ShowNoRulesPackageWarning, Converter={StaticResource BoolToVisibility}}">
<TextBlock TextWrapping="Wrap"
Foreground="#FF000000"
Text="No code analysis rules packages are referenced in this project. Consider adding NuGet packages such as 'ErikEJ.DacFX.TSQLSmellSCA' or 'ErikEJ.DacFX.SqlServer.Rules' to get additional rules." />
Text="No code analysis rules packages are referenced in this project. Consider adding NuGet packages such as 'ErikEJ.DacFX.SqlServer.Rules' to get additional rules." />
</Border>

<!-- Search and Severity filter row -->
Expand Down
1 change: 0 additions & 1 deletion src/SsmsVsix/Linter/Linting/AnalyzerUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ public static (string Filename, int Line, int Column, string RuleId, string Desc
}

// C:\Users\ErikEjlskovJensen(De\AppData\Local\Temp\tsqlanalyzerscratch.sql(23,1): SqlServer.Rules.SRN0007 : Index 'IFK_EmployeeReportsTo' does not follow the company naming standard. Please use a format that starts with IX_Employee*. (https://github.com/ErikEJ/SqlServer.Rules/blob/master/docs/Naming/SRN0007.md)
// C:\Users\ErikEjlskovJensen(De\AppData\Local\Temp\tsqlanalyzerscratch.sql(6,9): Smells.SML005 : Avoid use of 'Select *'. (https://github.com/ErikEJ/SqlServer.Rules/blob/master/docs/CodeSmells/SML005.md)
var fileAndPosition = parts[0].Trim();
var lineColumnStart = fileAndPosition.LastIndexOf('(');
var lineColumnEnd = fileAndPosition.LastIndexOf(')');
Expand Down
6 changes: 3 additions & 3 deletions src/Vsix/Dialogs/ManageRulesDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
IsEnabled="{Binding CanInstallRulesPackages}"
Margin="0,4,0,8"
VerticalAlignment="Center"
ToolTip="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules and ErikEJ.DacFX.TSQLSmellSCA)">
ToolTip="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules)">
<TextBlock TextWrapping="Wrap"
Text="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules and ErikEJ.DacFX.TSQLSmellSCA)" />
Text="Install community code analyzers (ErikEJ.DacFX.SqlServer.Rules)" />
</CheckBox>

<!-- Enable Code Analysis checkbox -->
Expand All @@ -68,7 +68,7 @@
Visibility="{Binding ShowNoRulesPackageWarning, Converter={StaticResource BoolToVisibility}}">
<TextBlock TextWrapping="Wrap"
Foreground="#FF000000"
Text="No code analysis rules packages are referenced in this project. Consider adding NuGet packages such as 'ErikEJ.DacFX.TSQLSmellSCA' or 'ErikEJ.DacFX.SqlServer.Rules' to get additional rules." />
Text="No code analysis rules packages are referenced in this project. Consider adding NuGet packages such as 'ErikEJ.DacFX.SqlServer.Rules' to get additional rules." />
</Border>

<!-- Search and Severity filter row -->
Expand Down
Loading