Squashed commit of the following:

commit d36a0a6ede6f257b1bc2b518ba82c61888ede219 Author: Timo Wolters <[email protected]> Date: Thu Aug 12 14:14:12 2021 +0200 Update FileConfigurationStorage.cs The default configuration will be returned instead of throwing an exception. This should help make the application more resilient during startup. commit deabce5 Author: Timo Wolters <[email protected]> Date: Thu Aug 12 13:44:19 2021 +0200 Updating to LibGit2Sharp Prelease The prerelease version should be able to handle missing dlls better than the official release based on libgit2/libgit2sharp#1741 commit 98808bc Author: Timo Wolters <[email protected]> Date: Thu Aug 12 12:59:09 2021 +0200 Fixed issues with failing integration tests. Enabled integration tests in Github Actions again. Bugfix: Integration tests will no longer execute in parallel to avoid accessing shared resources. Bugfix: Fixed an issue with misleading messages during initial setup.
offis · Aug 12, 2021 · fb6e2d7 · fb6e2d7
1 parent b5081b3
commit fb6e2d7
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -21,4 +21,4 @@ jobs:
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-build --verbosity normal --filter Type!=Integration
+      run: dotnet test --no-build --verbosity normal
diff --git a/src/LotsenApp.Client.Configuration.File/FileConfigurationStorage.cs b/src/LotsenApp.Client.Configuration.File/FileConfigurationStorage.cs
@@ -93,7 +93,8 @@ public Task<GlobalConfiguration> GetGlobalConfiguration(AccessMode accessMode =
                 }
             }
 
-            throw new Exception("There was an error accessing the global configuration");
+            return Task.FromResult(new GlobalConfiguration());
+            // throw new Exception("There was an error accessing the global configuration");
         }
 
         public Task SaveGlobalConfiguration(GlobalConfiguration configuration)

diff --git a/test/LotsenApp.Client.Electron.Test/CustomWebApplicationFactory.cs b/test/LotsenApp.Client.Electron.Test/CustomWebApplicationFactory.cs
@@ -26,9 +26,11 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using System.Net;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Razor;
@@ -67,10 +69,11 @@ public string LotsenAppRepositoryRoot
         public CustomWebApplicationFactory()
         {
             _directory = $"src/LotsenApp.Client.Electron/obj/Debug/{Guid.NewGuid().ToString()}";
-            // Directory.CreateDirectory(Path.Join(LotsenAppRepositoryRoot, _directory));
         }
         protected override void ConfigureWebHost(IWebHostBuilder builder)
         {
+            var dir = Directory.CreateDirectory(Path.Join(Environment.CurrentDirectory, Guid.NewGuid().ToString()));
+            Environment.CurrentDirectory = dir.FullName;
             Startup.Mode = ApplicationMode.Server;
             // builder.UseStartup<Startup>();
             builder.UseSolutionRelativeContentRoot("src/LotsenApp.Client.Electron");

diff --git a/test/LotsenApp.Client.Electron.Test/xunit.runner.json b/test/LotsenApp.Client.Electron.Test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "parallelizeAssembly": false,
+  "parallelizeTestCollections": false
+}
diff --git a/tools/LotsenApp.Development.Setup/AbstractNpmInstallProvider.cs b/tools/LotsenApp.Development.Setup/AbstractNpmInstallProvider.cs
@@ -21,13 +21,11 @@ public Task PerformSetup()
             for (var i = interval; i < maxExecutionTime; i+= interval)
             {
                 var j = i;
-                // ReSharper disable once MethodSupportsCancellation
-                Task.Delay(TimeSpan.FromSeconds(j))
-                    // ReSharper disable once MethodSupportsCancellation
+                Task.Delay(TimeSpan.FromSeconds(j), cancellationToken.Token)
                     .ContinueWith(_ =>
                 {
                     Console.Write($"\rnpm install ran for {j} seconds and will be cancelled in {maxExecutionTime - j} seconds. Press 'c' to cancel the operation immediately.");
-                });
+                }, cancellationToken.Token);
             }
 
             // ReSharper disable once MethodSupportsCancellation

diff --git a/tools/LotsenApp.LicenseManager/Assets/licenses.json b/tools/LotsenApp.LicenseManager/Assets/licenses.json
@@ -654,5 +654,16 @@
     "SeeAlso": null,
     "IsOsiApproved": false,
     "LicenseTextHtml": null
+  },
+  {
+    "IsDeprecatedLicenseId": false,
+    "IsFsfLibre": false,
+    "LicenseText": "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n    \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n\t<title>bouncycastle.org</title>\n\t<meta http-equiv=\"Content-type\" content=\"text/html; charset=iso-8859-1\" />\n\t<meta http-equiv=\"Content-Language\" content=\"en-aus\" />\n\t<meta name=\"description\" content=\"Home of the Legion of the Bouncy Castle and their Java cryptography resources and open source code\" />\n\t<meta name=\"keywords\" content=\"Legion of the Bouncy Castle, Cryptography, JCE, Java Cryptography Extension, Cryptography Source Code, ASN.1, X.509, Open Source\" />\n\t<link rel=\"shortcut icon\" href=\"http://www.bouncycastle.org/favicon.ico\" type=\"image/x-icon\" />\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"../bouncycastle.css\" />\n</head>\n<body>\n\n\n<div id=\"header\">\n\t<div id=\"title\">\n\t\t<h1>The Legion of the Bouncy Castle</h1>\n\t</div>\n</div>\n\n\n<div id=\"container\">\n\n\t<div id=\"content\">\n                <div id=\"navigation\">\n                        <ul>\n                                <li><a href=\"index.html\" class=\"nav\">home</a></li>\n                                <li><a href=\"https://github.com/bcgit/bc-csharp/wiki\" class=\"nav\">wiki</a></li>\n                                <li><a href=\"https://github.com/bcgit/bc-csharp/issues\" class=\"nav\">issue tracker</a></li>\n                                <li><a href=\"mailing_lists.html\" class=\"nav\">mailing lists</a></li>\n                                <li><a href=\"resources.html\" class=\"nav\">resources</a></li>\n                                <li><a href=\"licence.html\" class=\"nav\">legal and licencing</a></li>\n                                <li><a href=\"contributors.html\" class=\"nav\">contributors</a></li>\n                        </ul>\n                        <div class=\"clearing\">&nbsp;</div>\n                </div>\n\t\t<div id=\"body\">\n<p><b>Please note:</b> our license is an adaptation of the <a href=\"http://opensource.org/licenses/mit-license.php\">MIT X11 License</a> and should be read as such.</p>\n <p><b>Please also note:</b> this licensing model is made possible through funding from <a href=\"https://www.bouncycastle.org/donate\">donations</a> and the sale of <a href=\"https://www.cryptoworkshop.com/support_faq.html\">support contracts</a>.</p>\n\t\t\t<h2 class=\"spot\">License</h2>\n\t\t\t<p>Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)\n\t\t\t<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\t\t\t<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\t\t\t<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n\t\t</div>\n\t\t<div class=\"clearing\">&nbsp;</div>\n\n\t</div>\n</div>\n<div class=\"clearing\">&nbsp;</div>\n\n\n<div id=\"footer\">\n\t<ul>\n\t\t<li>Site hosted by <a href=\"http://www.tauceti.org.au/\">Tau Ceti Co-operative Ltd</a>.</li>\n\t\t<li>Graphics provided by <a href=\"http://www.geoffhook.com/\">Geoff Hook</a>.</li>\n\t\t<li>Layout and design by <a href=\"http://www.prozacblues.com/\">Travis Winters</a>.</li>\n\t\t<li>C# is a registered trademark of <a href=\"http://www.microsoft.com/\">Microsoft</a> &#174;.</li>\n\t</ul>\n</div>\n\n</body>\n</html>\n",
+    "Name": null,
+    "LicenseId": "https://www.bouncycastle.org/csharp/licence.html",
+    "CrossRef": null,
+    "SeeAlso": null,
+    "IsOsiApproved": false,
+    "LicenseTextHtml": null
   }
 ]
diff --git a/tools/LotsenApp.LicenseManager/Assets/nuget-cache.json b/tools/LotsenApp.LicenseManager/Assets/nuget-cache.json
@@ -48780,5 +48780,48 @@
         "TargetFramework": ".NETStandard2.0"
       }
     ]
+  },
+  "[email protected]": {
+    "@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json",
+    "@type": [
+      "PackageDetails",
+      "catalog:Permalink"
+    ],
+    "Authors": "Claire Novotny",
+    "Copyright": "© 2000-2021 Legion of the Bouncy Castle Inc.",
+    "Created": "2021-02-19T21:14:13.537Z",
+    "Description": "BouncyCastle portable version with support for .NET 4, .NET Standard 2.0",
+    "IconFile": null,
+    "Id": "Portable.BouncyCastle",
+    "IsPrerelease": false,
+    "LastEdited": "2021-02-19T21:16:18.95Z",
+    "LicenseExpression": null,
+    "LicenseUrl": "https://www.bouncycastle.org/csharp/licence.html",
+    "Listed": true,
+    "MinClientVersion": null,
+    "PackageHash": "b7zjLYytAljmNGKnthuwXbiLKfPMNoi04YHUeWj8BwPMVI6R7dwJRQnnfMfOReSPxjU/KvKNJnO9I1Q5yn4EQA==",
+    "PackageHashAlgorithm": "SHA512",
+    "PackageSize": 3153922,
+    "ProjectUrl": "https://www.bouncycastle.org/csharp/",
+    "Published": "2021-02-19T21:14:13.537Z",
+    "Repository": "",
+    "RequireLicenseAcceptance": false,
+    "Title": "Bouncy Castle Portable",
+    "VerbatimVersion": "1.8.10",
+    "Version": "1.8.10",
+    "DependencyGroups": [
+      {
+        "@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json#dependencygroup/.netframework4.0",
+        "@type": "PackageDependencyGroup",
+        "Dependencies": [],
+        "TargetFramework": ".NETFramework4.0"
+      },
+      {
+        "@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json#dependencygroup/.netstandard2.0",
+        "@type": "PackageDependencyGroup",
+        "Dependencies": [],
+        "TargetFramework": ".NETStandard2.0"
+      }
+    ]
   }
 }
diff --git a/tools/LotsenApp.LicenseManager/LotsenApp.LicenseManager.csproj b/tools/LotsenApp.LicenseManager/LotsenApp.LicenseManager.csproj
@@ -45,7 +45,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
+        <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0102" />
         <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.7" />
         <PackageReference Include="morelinq" Version="3.3.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />