Skip to content

Commit fb6e2d7

Browse files
committed
Squashed commit of the following:
commit d36a0a6ede6f257b1bc2b518ba82c61888ede219 Author: Timo Wolters <85983987+TimoWolters@users.noreply.github.com> 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 <85983987+TimoWolters@users.noreply.github.com> 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 <85983987+TimoWolters@users.noreply.github.com> 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.
1 parent b5081b3 commit fb6e2d7

8 files changed

Lines changed: 68 additions & 8 deletions

File tree

.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Build
2222
run: dotnet build --no-restore
2323
- name: Test
24-
run: dotnet test --no-build --verbosity normal --filter Type!=Integration
24+
run: dotnet test --no-build --verbosity normal

src/LotsenApp.Client.Configuration.File/FileConfigurationStorage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ public Task<GlobalConfiguration> GetGlobalConfiguration(AccessMode accessMode =
9393
}
9494
}
9595

96-
throw new Exception("There was an error accessing the global configuration");
96+
return Task.FromResult(new GlobalConfiguration());
97+
// throw new Exception("There was an error accessing the global configuration");
9798
}
9899

99100
public Task SaveGlobalConfiguration(GlobalConfiguration configuration)

test/LotsenApp.Client.Electron.Test/CustomWebApplicationFactory.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

2828
using System;
29+
using System.Collections.Generic;
2930
using System.Diagnostics.CodeAnalysis;
3031
using System.IO;
3132
using System.Linq;
33+
using System.Net;
3234
using Microsoft.AspNetCore;
3335
using Microsoft.AspNetCore.Hosting;
3436
using Microsoft.AspNetCore.Mvc.Razor;
@@ -67,10 +69,11 @@ public string LotsenAppRepositoryRoot
6769
public CustomWebApplicationFactory()
6870
{
6971
_directory = $"src/LotsenApp.Client.Electron/obj/Debug/{Guid.NewGuid().ToString()}";
70-
// Directory.CreateDirectory(Path.Join(LotsenAppRepositoryRoot, _directory));
7172
}
7273
protected override void ConfigureWebHost(IWebHostBuilder builder)
7374
{
75+
var dir = Directory.CreateDirectory(Path.Join(Environment.CurrentDirectory, Guid.NewGuid().ToString()));
76+
Environment.CurrentDirectory = dir.FullName;
7477
Startup.Mode = ApplicationMode.Server;
7578
// builder.UseStartup<Startup>();
7679
builder.UseSolutionRelativeContentRoot("src/LotsenApp.Client.Electron");
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"parallelizeAssembly": false,
3+
"parallelizeTestCollections": false
4+
}

tools/LotsenApp.Development.Setup/AbstractNpmInstallProvider.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ public Task PerformSetup()
2121
for (var i = interval; i < maxExecutionTime; i+= interval)
2222
{
2323
var j = i;
24-
// ReSharper disable once MethodSupportsCancellation
25-
Task.Delay(TimeSpan.FromSeconds(j))
26-
// ReSharper disable once MethodSupportsCancellation
24+
Task.Delay(TimeSpan.FromSeconds(j), cancellationToken.Token)
2725
.ContinueWith(_ =>
2826
{
2927
Console.Write($"\rnpm install ran for {j} seconds and will be cancelled in {maxExecutionTime - j} seconds. Press 'c' to cancel the operation immediately.");
30-
});
28+
}, cancellationToken.Token);
3129
}
3230

3331
// ReSharper disable once MethodSupportsCancellation

tools/LotsenApp.LicenseManager/Assets/licenses.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,5 +654,16 @@
654654
"SeeAlso": null,
655655
"IsOsiApproved": false,
656656
"LicenseTextHtml": null
657+
},
658+
{
659+
"IsDeprecatedLicenseId": false,
660+
"IsFsfLibre": false,
661+
"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",
662+
"Name": null,
663+
"LicenseId": "https://www.bouncycastle.org/csharp/licence.html",
664+
"CrossRef": null,
665+
"SeeAlso": null,
666+
"IsOsiApproved": false,
667+
"LicenseTextHtml": null
657668
}
658669
]

tools/LotsenApp.LicenseManager/Assets/nuget-cache.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48780,5 +48780,48 @@
4878048780
"TargetFramework": ".NETStandard2.0"
4878148781
}
4878248782
]
48783+
},
48784+
"Portable.BouncyCastle@1.8.10": {
48785+
"@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json",
48786+
"@type": [
48787+
"PackageDetails",
48788+
"catalog:Permalink"
48789+
],
48790+
"Authors": "Claire Novotny",
48791+
"Copyright": "© 2000-2021 Legion of the Bouncy Castle Inc.",
48792+
"Created": "2021-02-19T21:14:13.537Z",
48793+
"Description": "BouncyCastle portable version with support for .NET 4, .NET Standard 2.0",
48794+
"IconFile": null,
48795+
"Id": "Portable.BouncyCastle",
48796+
"IsPrerelease": false,
48797+
"LastEdited": "2021-02-19T21:16:18.95Z",
48798+
"LicenseExpression": null,
48799+
"LicenseUrl": "https://www.bouncycastle.org/csharp/licence.html",
48800+
"Listed": true,
48801+
"MinClientVersion": null,
48802+
"PackageHash": "b7zjLYytAljmNGKnthuwXbiLKfPMNoi04YHUeWj8BwPMVI6R7dwJRQnnfMfOReSPxjU/KvKNJnO9I1Q5yn4EQA==",
48803+
"PackageHashAlgorithm": "SHA512",
48804+
"PackageSize": 3153922,
48805+
"ProjectUrl": "https://www.bouncycastle.org/csharp/",
48806+
"Published": "2021-02-19T21:14:13.537Z",
48807+
"Repository": "",
48808+
"RequireLicenseAcceptance": false,
48809+
"Title": "Bouncy Castle Portable",
48810+
"VerbatimVersion": "1.8.10",
48811+
"Version": "1.8.10",
48812+
"DependencyGroups": [
48813+
{
48814+
"@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json#dependencygroup/.netframework4.0",
48815+
"@type": "PackageDependencyGroup",
48816+
"Dependencies": [],
48817+
"TargetFramework": ".NETFramework4.0"
48818+
},
48819+
{
48820+
"@id": "https://api.nuget.org/v3/catalog0/data/2021.02.19.21.16.19/portable.bouncycastle.1.8.10.json#dependencygroup/.netstandard2.0",
48821+
"@type": "PackageDependencyGroup",
48822+
"Dependencies": [],
48823+
"TargetFramework": ".NETStandard2.0"
48824+
}
48825+
]
4878348826
}
4878448827
}

tools/LotsenApp.LicenseManager/LotsenApp.LicenseManager.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</PropertyGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
48+
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0102" />
4949
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.7" />
5050
<PackageReference Include="morelinq" Version="3.3.2" />
5151
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

0 commit comments

Comments
 (0)