Merge pull request #77 from atc-net/feature/issues-68-has-internet-connection

davidkallesen · web-flow · commit 22ada5964fcb · 2022-02-17T23:30:14.000+01:00
Fix issues 68  - has internet connection check
diff --git a/.editorconfig b/.editorconfig
@@ -505,7 +505,6 @@ dotnet_diagnostic.S1135.severity = suggestion       # https://github.com/atc-net
 
 dotnet_diagnostic.IDE0057.severity = none           # Substring can be simplified
 
-dotnet_diagnostic.CA1031.severity = none            # Do not catch general exception types
 dotnet_diagnostic.CA1054.severity = none            # URI parameters should not be strings
 dotnet_diagnostic.CA1848.severity = none            # For improved performance, use the LoggerMessage delegates instead of calling 'LoggerExtensions.LogTrace(ILogger, string, params object[])'
 dotnet_diagnostic.CA2007.severity = none            # Consider calling ConfigureAwait on the awaited task
diff --git a/.github/workflows/post-integration.yml b/.github/workflows/post-integration.yml
@@ -50,7 +50,7 @@ jobs:
         run: dotnet build -c Release --no-restore /p:UseSourceLink=true
 
       - name: 🧪 Run unit tests
-        run: dotnet test -c Release --no-build
+        run: dotnet test -c Release --no-build --filter "Category!=Integration"
 
       - name: 🌩️ SonarCloud install scanner
         run: dotnet tool install --global dotnet-sonarscanner
diff --git a/.github/workflows/pre-integration.yml b/.github/workflows/pre-integration.yml
@@ -55,4 +55,4 @@ jobs:
         run: dotnet build -c Release --no-restore /p:UseSourceLink=true
 
       - name: 🧪 Run unit tests
-        run: dotnet test -c Release --no-build
+        run: dotnet test -c Release --no-build --filter "Category!=Integration"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,3 +54,9 @@ jobs:
 
       - name: 📦 Push packages to NuGet
         run: dotnet nuget push ${GITHUB_WORKSPACE}/packages/'atc-coding-rules-updater.'${NBGV_NuGetPackageVersion}'.nupkg' -k ${{ secrets.NUGET_KEY }} -s ${{ env.NUGET_REPO_URL }} --skip-duplicate --no-symbols
+
+      - name: 🌩️ ATC-API invalidate cache for CLI-Tool
+        uses: satak/webrequest-action@master
+        with:
+          url: https://atc-api.azurewebsites.net/nuget-search/package?packageId=atc-coding-rules-updater&invalidateCache=true
+          method: GET
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj b/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.60" />
+    <PackageReference Include="Atc" Version="2.0.67" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
   </ItemGroup>
 
diff --git a/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj b/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.60" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.60" />
+    <PackageReference Include="Atc" Version="2.0.67" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.67" />
     <PackageReference Include="EPPlus" Version="5.8.6" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
   </ItemGroup>
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/AnalyzerProvidersCacheCleanupCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/AnalyzerProvidersCacheCleanupCommand.cs
@@ -1,5 +1,6 @@
 namespace Atc.CodingRules.Updater.CLI.Commands;
 
+[SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
 public class AnalyzerProvidersCacheCleanupCommand : Command
 {
     private readonly ILogger<AnalyzerProvidersCacheCleanupCommand> logger;
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/AnalyzerProvidersCollectCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/AnalyzerProvidersCollectCommand.cs
@@ -17,6 +17,7 @@ public override Task<int> ExecuteAsync(
         return ExecuteInternalAsync(settings);
     }
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     private async Task<int> ExecuteInternalAsync(
         AnalyzerProvidersCollectCommandSettings settings)
     {
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileCreateCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileCreateCommand.cs
@@ -14,6 +14,7 @@ public override Task<int> ExecuteAsync(
         return ExecuteInternalAsync(settings);
     }
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     private async Task<int> ExecuteInternalAsync(
         ProjectCommandSettings settings)
     {
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileValidateCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileValidateCommand.cs
@@ -15,6 +15,7 @@ public override Task<int> ExecuteAsync(
         return ExecuteInternalAsync(settings);
     }
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     private async Task<int> ExecuteInternalAsync(
         ProjectBaseCommandSettings settings)
     {
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/RootCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/RootCommand.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.Updater.CLI.Commands;
 
+[SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
+[SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "OK.")]
 public class RootCommand : AsyncCommand<RootCommandSettings>
 {
     public override Task<int> ExecuteAsync(
@@ -14,6 +16,12 @@ public override Task<int> ExecuteAsync(
     private static async Task<int> ExecuteInternalAsync(
         RootCommandSettings settings)
     {
+        if (!NetworkInformationHelper.HasConnection())
+        {
+            System.Console.WriteLine("This tool requires internet connection!");
+            return ConsoleExitStatusCodes.Failure;
+        }
+
         if (settings.IsOptionValueTrue(settings.Version))
         {
             try
@@ -30,7 +38,6 @@ private static async Task<int> ExecuteInternalAsync(
         return ConsoleExitStatusCodes.Success;
     }
 
-    [SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "OK.")]
     private static void HandleVersionOption()
     {
         System.Console.WriteLine(CliHelper.GetCurrentVersion().ToString());
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/RunCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/RunCommand.cs
@@ -1,9 +1,7 @@
 // ReSharper disable SuggestBaseTypeForParameter
-
-using Atc.CodingRules.Updater.CLI.Models.Options;
-
 namespace Atc.CodingRules.Updater.CLI.Commands;
 
+[SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "OK.")]
 public class RunCommand : AsyncCommand<RunCommandSettings>
 {
     private readonly ILogger<RunCommand> logger;
@@ -19,9 +17,16 @@ public override Task<int> ExecuteAsync(
         return ExecuteInternalAsync(settings);
     }
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     private async Task<int> ExecuteInternalAsync(
         RunCommandSettings settings)
     {
+        if (!NetworkInformationHelper.HasConnection())
+        {
+            System.Console.WriteLine("This tool requires internet connection!");
+            return ConsoleExitStatusCodes.Failure;
+        }
+
         ConsoleHelper.WriteHeader();
 
         var projectPath = new DirectoryInfo(settings.ProjectPath);
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/SanityCheckCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/SanityCheckCommand.cs
@@ -17,6 +17,7 @@ public override Task<int> ExecuteAsync(
         return ExecuteInternalAsync(settings);
     }
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     private async Task<int> ExecuteInternalAsync(
         ProjectCommandSettings settings)
     {
diff --git a/src/Atc.CodingRules.Updater.CLI/GlobalUsings.cs b/src/Atc.CodingRules.Updater.CLI/GlobalUsings.cs
@@ -13,6 +13,7 @@
 global using Atc.CodingRules.Updater.CLI.Commands.DescriptionAttributes;
 global using Atc.CodingRules.Updater.CLI.Commands.Settings;
 global using Atc.CodingRules.Updater.CLI.Extensions;
+global using Atc.CodingRules.Updater.CLI.Models.Options;
 global using Atc.Console.Spectre;
 global using Atc.Console.Spectre.CommandSettings;
 global using Atc.Console.Spectre.Factories;
diff --git a/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj b/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.60" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.60" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.60" />
+    <PackageReference Include="Atc" Version="2.0.67" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.67" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.67" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.CodingRules/Atc.CodingRules.csproj b/src/Atc.CodingRules/Atc.CodingRules.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.60" />
+    <PackageReference Include="Atc" Version="2.0.67" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.CodingRules/AtcApiNugetClientHelper.cs b/src/Atc.CodingRules/AtcApiNugetClientHelper.cs
@@ -5,6 +5,7 @@ public static class AtcApiNugetClientHelper
     private const string BaseAddress = "https://atc-api.azurewebsites.net/nuget-search";
     private static readonly ConcurrentDictionary<string, Version> Cache = new (StringComparer.Ordinal);
 
+    [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]
     public static Version? GetLatestVersionForPackageId(
         string packageId,
         CancellationToken cancellationToken = default)
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj b/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj
@@ -6,7 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Atc.XUnit" Version="2.0.67" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/GlobalUsings.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/GlobalUsings.cs
@@ -1,6 +1,5 @@
-global using System.Threading.Tasks;
-
 global using Atc.CodingRules.AnalyzerProviders.Providers;
+global using Atc.XUnit;
 
 global using Microsoft.Extensions.Logging.Abstractions;
 
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/AsyncFixerProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/AsyncFixerProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class AsyncFixerProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/AsyncifyProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/AsyncifyProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class AsyncifyProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MeziantouProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MeziantouProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class MeziantouProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCodeAnalysisNetAnalyzersProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCodeAnalysisNetAnalyzersProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class MicrosoftCodeAnalysisNetAnalyzersProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class MicrosoftCompilerErrorsProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderUndocumentedTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderUndocumentedTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class MicrosoftCompilerErrorsProviderUndocumentedTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/SecurityCodeScanVs2019ProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/SecurityCodeScanVs2019ProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class SecurityCodeScanVs2019ProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/SonarAnalyzerCSharpProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/SonarAnalyzerCSharpProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class SonarAnalyzerCSharpProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/StyleCopAnalyzersProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/StyleCopAnalyzersProviderTests.cs
@@ -1,5 +1,7 @@
 namespace Atc.CodingRules.AnalyzerProviders.Tests.Providers;
 
+[Trait(Traits.Category, Traits.Categories.Integration)]
+[Trait(Traits.Category, Traits.Categories.SkipWhenLiveUnitTesting)]
 public class StyleCopAnalyzersProviderTests
 {
     [Theory]
diff --git a/test/Atc.CodingRules.Updater.Tests/Atc.CodingRules.Updater.Tests.csproj b/test/Atc.CodingRules.Updater.Tests/Atc.CodingRules.Updater.Tests.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Divergic.Logging.Xunit" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace Atc.CodingRules.Updater.CLI.Commands;`
`2`	`2`
	`3`	`+[SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]`
`3`	`4`	`public class AnalyzerProvidersCacheCleanupCommand : Command`
`4`	`5`	`{`
`5`	`6`	`private readonly ILogger<AnalyzerProvidersCacheCleanupCommand> logger;`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public override Task<int> ExecuteAsync(`
`17`	`17`	`return ExecuteInternalAsync(settings);`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]`
`20`	`21`	`private async Task<int> ExecuteInternalAsync(`
`21`	`22`	`AnalyzerProvidersCollectCommandSettings settings)`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public override Task<int> ExecuteAsync(`
`14`	`14`	`return ExecuteInternalAsync(settings);`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]`
`17`	`18`	`private async Task<int> ExecuteInternalAsync(`
`18`	`19`	`ProjectCommandSettings settings)`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public override Task<int> ExecuteAsync(`
`15`	`15`	`return ExecuteInternalAsync(settings);`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "OK.")]`
`18`	`19`	`private async Task<int> ExecuteInternalAsync(`
`19`	`20`	`ProjectBaseCommandSettings settings)`
`20`	`21`	`{`