diff --git a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
index ec908385..d8d93c5b 100644
--- a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
+++ b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
@@ -10,23 +10,25 @@
<ItemGroup>
<PackageReference Include="ArcaneLibs" Version="1.0.1-preview.20260126-091403"/>
<PackageReference Include="ArcaneLibs.StringNormalisation" Version="1.0.1-preview.20260126-091403"/>
- <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
+ <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3"/>
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\DataMappings\Spacebar.DataMappings.Generic\Spacebar.DataMappings.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.DataMappings.Generic" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Interop\Spacebar.Interop.Authentication.AspNetCore\Spacebar.Interop.Authentication.AspNetCore.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Interop.Authentication.AspNetCore" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Interop\Spacebar.Interop.Replication.UnixSocket\Spacebar.Interop.Replication.UnixSocket.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Interop.Replication.UnixSocket" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Models\Spacebar.Models.AdminApi\Spacebar.Models.AdminApi.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Models.AdminApi" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Models\Spacebar.Models.Config\Spacebar.Models.Config.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Models.Config" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Models.Db" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
- <ProjectReference Include="..\Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="Spacebar.Models.Generic" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+ <ItemGroup Condition="'$(ContinuousIntegrationBuild)'!='true'">
+ <ProjectReference Include="..\DataMappings\Spacebar.DataMappings.Generic\Spacebar.DataMappings.Generic.csproj"/>
+ <ProjectReference Include="..\Interop\Spacebar.Interop.Authentication.AspNetCore\Spacebar.Interop.Authentication.AspNetCore.csproj"/>
+ <ProjectReference Include="..\Interop\Spacebar.Interop.Replication.UnixSocket\Spacebar.Interop.Replication.UnixSocket.csproj"/>
+ <ProjectReference Include="..\Models\Spacebar.Models.Config\Spacebar.Models.Config.csproj"/>
+ <ProjectReference Include="..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj"/>
+ <ProjectReference Include="..\Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj"/>
+ </ItemGroup>
+
+ <!-- For nix... -->
+ <ItemGroup Condition="'$(ContinuousIntegrationBuild)'=='true'">
+ <PackageReference Include="Spacebar.DataMappings.Generic" Version="*-preview*"/>
+ <PackageReference Include="Spacebar.Interop.Authentication.AspNetCore" Version="*-preview*"/>
+ <PackageReference Include="Spacebar.Interop.Replication.UnixSocket" Version="*-preview*"/>
+ <PackageReference Include="Spacebar.Models.Config" Version="*-preview*"/>
+ <PackageReference Include="Spacebar.Models.Db" Version="*-preview*"/>
+ <PackageReference Include="Spacebar.Models.Generic" Version="*-preview*"/>
</ItemGroup>
</Project>
diff --git a/extra/admin-api/Spacebar.UApi/deps.json b/extra/admin-api/Spacebar.UApi/deps.json
index da63af91..26570079 100644
--- a/extra/admin-api/Spacebar.UApi/deps.json
+++ b/extra/admin-api/Spacebar.UApi/deps.json
@@ -1,68 +1,68 @@
[
{
- "pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.0",
- "hash": "sha256-xfgrlxhtOkQwF5Q7j8gSm41URJiH8IuJ/T/Dh88++hE="
+ "pname": "ArcaneLibs",
+ "version": "1.0.1-preview.20260126-091403",
+ "hash": "sha256-CSmNE16nDi05qyDAcJR+8SqQQ2ReAeX0+/dRP3WpNsg="
},
{
- "pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.0",
- "hash": "sha256-UDgZbRQcGPaKsE53EH6bvJiv+Q4KSxAbnsVhTVFGG4Q="
+ "pname": "ArcaneLibs.StringNormalisation",
+ "version": "1.0.1-preview.20260126-091403",
+ "hash": "sha256-XcwbLG9w4OFzMVA54pvTvRJ9692tvE8D0tMVcteSQL0="
},
{
- "pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.0",
- "hash": "sha256-7Q0jYJO50cqGI+u6gLpootbB8GZvgsgtg0F9FZI1jig="
+ "pname": "BCrypt.Net-Next",
+ "version": "4.1.0",
+ "hash": "sha256-Efjrsw4FXgVKA2vQV6ztc40pLsonnV3JxwxW7eOyfDk="
},
{
- "pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.0",
- "hash": "sha256-vOP2CE5YA551BlpbOuIy6RuAiAEPEpCVS1cEE33/zN4="
+ "pname": "Microsoft.AspNetCore.OpenApi",
+ "version": "10.0.3",
+ "hash": "sha256-j7lAYuz2585j/j24XkptImH7WHx9rBp+tY8ZXqpC77k="
},
{
- "pname": "Microsoft.Extensions.Caching.Abstractions",
+ "pname": "Microsoft.EntityFrameworkCore",
"version": "10.0.0",
- "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI="
+ "hash": "sha256-xfgrlxhtOkQwF5Q7j8gSm41URJiH8IuJ/T/Dh88++hE="
},
{
- "pname": "Microsoft.Extensions.Caching.Memory",
+ "pname": "Microsoft.EntityFrameworkCore.Abstractions",
"version": "10.0.0",
- "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4="
+ "hash": "sha256-UDgZbRQcGPaKsE53EH6bvJiv+Q4KSxAbnsVhTVFGG4Q="
},
{
- "pname": "Microsoft.Extensions.Configuration.Abstractions",
+ "pname": "Microsoft.EntityFrameworkCore.Analyzers",
"version": "10.0.0",
- "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0="
+ "hash": "sha256-7Q0jYJO50cqGI+u6gLpootbB8GZvgsgtg0F9FZI1jig="
},
{
- "pname": "Microsoft.Extensions.DependencyInjection",
+ "pname": "Microsoft.EntityFrameworkCore.Relational",
"version": "10.0.0",
- "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ="
+ "hash": "sha256-vOP2CE5YA551BlpbOuIy6RuAiAEPEpCVS1cEE33/zN4="
},
{
- "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.0",
- "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
+ "pname": "Microsoft.IdentityModel.Abstractions",
+ "version": "8.16.0",
+ "hash": "sha256-OpTFQpTtg1A8I1bBIOqv/n9pwYXTqzMI8ZLXLZDti5w="
},
{
- "pname": "Microsoft.Extensions.Logging",
- "version": "10.0.0",
- "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs="
+ "pname": "Microsoft.IdentityModel.JsonWebTokens",
+ "version": "8.16.0",
+ "hash": "sha256-Cctf2iuIXLMklTuCvzWv721v2mHs0HEBA47BqAKhp9I="
},
{
- "pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.0",
- "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
+ "pname": "Microsoft.IdentityModel.Logging",
+ "version": "8.16.0",
+ "hash": "sha256-355u+3LIn/QfiCHFMXD+3ipdRTnbXLAQNzC4sWEFapQ="
},
{
- "pname": "Microsoft.Extensions.Options",
- "version": "10.0.0",
- "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA="
+ "pname": "Microsoft.IdentityModel.Tokens",
+ "version": "8.16.0",
+ "hash": "sha256-6s8ZLnKw32W6+KbnahCVe1v9YzpoemnpHNQ3VbFSV4M="
},
{
- "pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.0",
- "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I="
+ "pname": "Microsoft.OpenApi",
+ "version": "2.0.0",
+ "hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
},
{
"pname": "Npgsql",
@@ -73,5 +73,15 @@
"pname": "Npgsql.EntityFrameworkCore.PostgreSQL",
"version": "10.0.0",
"hash": "sha256-XIJxnTMektQVP1qtslEIGbmBGrIQsvjQjCMRTs9UIbg="
+ },
+ {
+ "pname": "System.IdentityModel.Tokens.Jwt",
+ "version": "8.16.0",
+ "hash": "sha256-wCEkUPnKDjO7Kpfr1vpr5Icvk69gFHgEWcSLbFtD6pg="
+ },
+ {
+ "pname": "Unidecode.NET",
+ "version": "2.2.1",
+ "hash": "sha256-erDK7cXaIyuwntBhRpop3OlwwnpFJREYQBwE7xqpCGk="
}
]
diff --git a/extra/admin-api/outputs.nix b/extra/admin-api/outputs.nix
index 9d6d5908..32f2d6df 100644
--- a/extra/admin-api/outputs.nix
+++ b/extra/admin-api/outputs.nix
@@ -230,6 +230,8 @@ flake-utils.lib.eachSystem flake-utils.lib.allSystems (
proj.Spacebar-Interop-Authentication
proj.Spacebar-Interop-Authentication-AspNetCore
proj.Spacebar-Interop-Replication-Abstractions
+ proj.Spacebar-Interop-Replication-UnixSocket
+ proj.Spacebar-Models-Config
proj.Spacebar-Models-Db
proj.Spacebar-Models-Gateway
proj.Spacebar-Models-Generic
diff --git a/extra/admin-api/update-deps-Spacebar-UApi b/extra/admin-api/update-deps-Spacebar-UApi
new file mode 120000
index 00000000..b5517577
--- /dev/null
+++ b/extra/admin-api/update-deps-Spacebar-UApi
@@ -0,0 +1 @@
+/nix/store/gjjaggaav5p5v447mwkaxw16f3bjh6n9-Spacebar.UApi-1.0.0-preview.20260221-041617-fetch-deps
\ No newline at end of file
diff --git a/extra/admin-api/update-deps.cs b/extra/admin-api/update-deps.cs
index 0ec7bd21..ed44aa98 100755
--- a/extra/admin-api/update-deps.cs
+++ b/extra/admin-api/update-deps.cs
@@ -20,7 +20,7 @@ var ss = new SemaphoreSlim(1, 1);
var tasks = outs.Select(outp => Task.Run(async () => {
Console.WriteLine(ConsoleUtils.ColoredString($" ==> Updating {outp}...", 0x80, 0x80, 0xff));
Console.Write(ConsoleUtils.ColoredString($" ==> Getting project root directory... ", 0x80, 0xff, 0xff));
- var rootDir = JsonSerializer.Deserialize<string>(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.srcRoot", silent: true, stderr: false)).Split("/extra/admin-api/",2)[1];
+ var rootDir = JsonSerializer.Deserialize<string>(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.srcRoot", silent: true, stderr: false)).Split("/extra/admin-api/", 2)[1];
Console.WriteLine(ConsoleUtils.ColoredString($"{rootDir}", 0x80, 0xff, 0xff));
if (rootDir.Length <= 1) throw new Exception("Invalid project file count?");
@@ -35,12 +35,12 @@ var tasks = outs.Select(outp => Task.Run(async () => {
Console.WriteLine(ConsoleUtils.ColoredString($" ==> Building fetch-deps script {fname}...", 0x80, 0xff, 0x80));
Util.RunCommandSync("nix", $"build .#{outp}.passthru.fetch-deps --out-link {fname}");
- Console.WriteLine(ConsoleUtils.ColoredString($" ==> Running fetch-deps script...", 0x80, 0xff, 0x80));
+ Console.WriteLine(ConsoleUtils.ColoredString($" ==> Running fetch-deps script, writing into {nugetDepsFilePath}...", 0x80, 0xff, 0x80));
Util.RunCommandSync(fname, nugetDepsFilePath);
var deps = JsonSerializer.Deserialize<object[]>(await File.ReadAllTextAsync(nugetDepsFilePath));
Console.WriteLine(ConsoleUtils.ColoredString($" ==> Locked {deps.Length} dependencies...", (byte)(deps.Length == 0 ? 0xff : 0x80), (byte)(deps.Length == 0 ? 0x80 : 0xff), 0x80));
- File.Delete(fname);
+ // File.Delete(fname);
// await Task.Delay(250);
|
