swcs/mixtape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use cap files from submodule instead of copied references

Browse Source
This commit is contained in:
Tobias Klika
2026-04-30 15:29:56 +02:00
parent 884ff91ab8
commit 0c18916113
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -0,0 +1,3 @@
[submodule "Finch/Includes/cap"]
path = Finch/Includes/cap
url = https://github.com/tiagozip/cap.git
Finch/Finch.csproj
+2 -1
View File
@@ -27,7 +27,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Resources\**\*" /> <EmbeddedResource LogicalName="finch/res/cap/cap.js" Include="Includes\cap\widget\src\cap.min.js" />
<EmbeddedResource LogicalName="finch/res/cap/cap.wasm" Include="Includes\cap/wasm/src/browser/cap_wasm_bg.wasm" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Finch/Includes/cap
Submodule
+1
Submodule Finch/Includes/cap added at 8584867e44
Finch/Logging/LogLevelOverrides.cs
+3 -3
View File
@@ -26,10 +26,10 @@ public class LogLevelOverrides : Dictionary<string, LogLevel>
this["System.Net.Http.HttpClient"] = LogLevel.Warning; this["System.Net.Http.HttpClient"] = LogLevel.Warning;
this["Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager"] = LogLevel.Error; this["Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager"] = LogLevel.Error;
string executingAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name; string entryAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name;
if (executingAssemblyName != null) if (entryAssemblyName != null)
{ {
this[executingAssemblyName] = LogLevel.Debug; this[entryAssemblyName] = LogLevel.Debug;
} }
} }
} }
Finch/Resources/cap_min_0_1_41.js
-1
View File
File diff suppressed because one or more lines are too long
Finch/Resources/cap_wasm_bg_0_0_6.wasm
BIN
View File
Binary file not shown.
Finch/Security/CaptchaController.cs
+2 -2
View File
@@ -57,7 +57,7 @@ public class CaptchaController(ICaptchaService captchaService) : FinchController
public IActionResult GetWasmFile() public IActionResult GetWasmFile()
{ {
Assembly assembly = typeof(FinchSecurityModule).GetTypeInfo().Assembly; Assembly assembly = typeof(FinchSecurityModule).GetTypeInfo().Assembly;
Stream resource = assembly.GetManifestResourceStream("Finch.Resources.cap_wasm_bg_0_0_6.wasm"); Stream resource = assembly.GetManifestResourceStream("finch/res/cap/cap.wasm");
if (resource is null) if (resource is null)
{ {
@@ -72,7 +72,7 @@ public class CaptchaController(ICaptchaService captchaService) : FinchController
public IActionResult GetWidgetJsFile() public IActionResult GetWidgetJsFile()
{ {
Assembly assembly = typeof(FinchSecurityModule).GetTypeInfo().Assembly; Assembly assembly = typeof(FinchSecurityModule).GetTypeInfo().Assembly;
Stream resource = assembly.GetManifestResourceStream("Finch.Resources.cap_min_0_1_41.js"); Stream resource = assembly.GetManifestResourceStream("finch/res/cap/cap.js");
if (resource is null) if (resource is null)
{ {