diff --git a/ArcaneLibs b/ArcaneLibs
-Subproject 412a14c2ad2fed85066155d1060c35cbe23d6c9
+Subproject 491a3c65481c4e5a41b4435106e3dc8ba81efdc
diff --git a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
index 31dfe16..f1dcbec 100644
--- a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
+++ b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
@@ -7,10 +7,8 @@
</PropertyGroup>
<ItemGroup>
- <!-- <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.20250806-011111" Condition="'$(Configuration)' == 'Release'" />-->
- <!-- <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(Configuration)' == 'Debug'"/>-->
<ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
- <PackageReference Include="ArcaneLibs" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+ <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.2025*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
</ItemGroup>
</Project>
diff --git a/LibMatrix.Federation/LibMatrix.Federation.csproj b/LibMatrix.Federation/LibMatrix.Federation.csproj
index 851bf25..84721fe 100644
--- a/LibMatrix.Federation/LibMatrix.Federation.csproj
+++ b/LibMatrix.Federation/LibMatrix.Federation.csproj
@@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2"/>
- <PackageReference Include="Microsoft.Extensions.Primitives" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.Extensions.Primitives" Version="10.0.0" />
</ItemGroup>
</Project>
diff --git a/LibMatrix.Federation/deps.json b/LibMatrix.Federation/deps.json
index cccc7bb..edecdc2 100644
--- a/LibMatrix.Federation/deps.json
+++ b/LibMatrix.Federation/deps.json
@@ -1,22 +1,27 @@
[
{
+ "pname": "ArcaneLibs",
+ "version": "1.0.0-preview.20251205-114150",
+ "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA="
+ },
+ {
"pname": "BouncyCastle.Cryptography",
"version": "2.6.2",
"hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-1nh8z2nglCizQkl0iWwJ/au4BAuuBu0xghKHGBeTM1I="
+ "version": "10.0.0",
+ "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-krml7WL+lF7oiYOvQ8NHQp7BVpHJrLIHhyxUgkHO+WE="
+ "version": "10.0.0",
+ "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-jvjZK/c8TGYIUA4zw7yR9uAFJmw90YE7TD3+DaxX9Ls="
+ "version": "10.0.0",
+ "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I="
}
]
diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj
index 7d4ca5c..71e17c8 100644
--- a/LibMatrix/LibMatrix.csproj
+++ b/LibMatrix/LibMatrix.csproj
@@ -12,16 +12,14 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0"/>
<ProjectReference Include="..\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj"/>
</ItemGroup>
<ItemGroup>
- <!-- <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.20250313-104848" Condition="'$(Configuration)' == 'Release'" />-->
- <!-- <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(Configuration)' == 'Debug'"/>-->
- <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj"/>
- <PackageReference Include="ArcaneLibs" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+ <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+ <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.2025*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
</ItemGroup>
</Project>
diff --git a/LibMatrix/deps.json b/LibMatrix/deps.json
index d6ba81b..0fbc71d 100644
--- a/LibMatrix/deps.json
+++ b/LibMatrix/deps.json
@@ -1,12 +1,17 @@
[
{
+ "pname": "ArcaneLibs",
+ "version": "1.0.0-preview.20251205-114150",
+ "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA="
+ },
+ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-1nh8z2nglCizQkl0iWwJ/au4BAuuBu0xghKHGBeTM1I="
+ "version": "10.0.0",
+ "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-krml7WL+lF7oiYOvQ8NHQp7BVpHJrLIHhyxUgkHO+WE="
+ "version": "10.0.0",
+ "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
}
]
diff --git a/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj b/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
index 234b978..a82471b 100644
--- a/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
+++ b/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
@@ -10,11 +10,11 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"/>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3"/>
- <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="9.2.2"/>
+ <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="10.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
diff --git a/Utilities/LibMatrix.DebugDataValidationApi/LibMatrix.DebugDataValidationApi.csproj b/Utilities/LibMatrix.DebugDataValidationApi/LibMatrix.DebugDataValidationApi.csproj
index c077e4e..a7b81e0 100644
--- a/Utilities/LibMatrix.DebugDataValidationApi/LibMatrix.DebugDataValidationApi.csproj
+++ b/Utilities/LibMatrix.DebugDataValidationApi/LibMatrix.DebugDataValidationApi.csproj
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6"/>
+ <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/Utilities/LibMatrix.E2eeTestKit/LibMatrix.E2eeTestKit.csproj b/Utilities/LibMatrix.E2eeTestKit/LibMatrix.E2eeTestKit.csproj
index 65d9242..8c3f405 100644
--- a/Utilities/LibMatrix.E2eeTestKit/LibMatrix.E2eeTestKit.csproj
+++ b/Utilities/LibMatrix.E2eeTestKit/LibMatrix.E2eeTestKit.csproj
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.2.25502.107" PrivateAssets="all"/>
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
diff --git a/Utilities/LibMatrix.FederationTest/LibMatrix.FederationTest.csproj b/Utilities/LibMatrix.FederationTest/LibMatrix.FederationTest.csproj
index 445eafe..58e336e 100644
--- a/Utilities/LibMatrix.FederationTest/LibMatrix.FederationTest.csproj
+++ b/Utilities/LibMatrix.FederationTest/LibMatrix.FederationTest.csproj
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/Utilities/LibMatrix.HomeserverEmulator/LibMatrix.HomeserverEmulator.csproj b/Utilities/LibMatrix.HomeserverEmulator/LibMatrix.HomeserverEmulator.csproj
index 6f32b58..733cd7f 100644
--- a/Utilities/LibMatrix.HomeserverEmulator/LibMatrix.HomeserverEmulator.csproj
+++ b/Utilities/LibMatrix.HomeserverEmulator/LibMatrix.HomeserverEmulator.csproj
@@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="EasyCompressor.LZMA" Version="2.1.0"/>
- <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6"/>
+ <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/Utilities/LibMatrix.TestDataGenerator/LibMatrix.TestDataGenerator.csproj b/Utilities/LibMatrix.TestDataGenerator/LibMatrix.TestDataGenerator.csproj
index 1678502..090b515 100644
--- a/Utilities/LibMatrix.TestDataGenerator/LibMatrix.TestDataGenerator.csproj
+++ b/Utilities/LibMatrix.TestDataGenerator/LibMatrix.TestDataGenerator.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="appsettings*.json">
diff --git a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
index 80d43be..09e9a86 100644
--- a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
+++ b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
@@ -13,9 +13,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107"/>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0"/>
</ItemGroup>
diff --git a/Utilities/LibMatrix.Utilities.Bot/deps.json b/Utilities/LibMatrix.Utilities.Bot/deps.json
index da8051b..4d5a0c8 100644
--- a/Utilities/LibMatrix.Utilities.Bot/deps.json
+++ b/Utilities/LibMatrix.Utilities.Bot/deps.json
@@ -1,142 +1,147 @@
[
{
+ "pname": "ArcaneLibs",
+ "version": "1.0.0-preview.20251205-114150",
+ "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA="
+ },
+ {
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-Bxb3LNyZsDlGyYxBjDnUIgj8ZfIDAb0fJqbBdGRocPY="
+ "version": "10.0.0",
+ "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-224s03xAtaxcp6T0D17a/aK2qGkPlajGS1THd6HXV8A="
+ "version": "10.0.0",
+ "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-gPBNpr7vAB08NXWESFwt3G/b83ds/RDw17QN/op57kM="
+ "version": "10.0.0",
+ "hash": "sha256-YSiWoA3VQR22k6+bSEAUqeG7UDzZlJfHWDTubUO5V8U="
},
{
"pname": "Microsoft.Extensions.Configuration.CommandLine",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-kZdKla41vPzV6XdCfz0ObTQW54Z4oVn17J5V8zouGa8="
+ "version": "10.0.0",
+ "hash": "sha256-ldTiRFqnv8/pA0gl6UR+4DDGAIZOf9+MhaLWOuKOXOI="
},
{
"pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-dNZaIOJ2TV9Chj9fIDshZTP8UbIvsCqEkQNv65iuX+8="
+ "version": "10.0.0",
+ "hash": "sha256-UayfeqrAmNyfOkuhcBKfj8UpjQqV/ZMqWrDyxCSG1MA="
},
{
"pname": "Microsoft.Extensions.Configuration.FileExtensions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-X5e1bqK6OhslICJQQGA1HORX94rJBV1f3RMRZ4chwaE="
+ "version": "10.0.0",
+ "hash": "sha256-rN+3rqrHiTaBfHgP+E4dA8Qm2cFJPfbEcd93yKLsqlQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Json",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-C6NixHkhPrNCX44U2KhJUlDbry1drXwKTKjTI5sDw5I="
+ "version": "10.0.0",
+ "hash": "sha256-VCFukgsxiQ2MFGE6RDMFTGopBHbcZL2t0ER7ENaFXRY="
},
{
"pname": "Microsoft.Extensions.Configuration.UserSecrets",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-tfmsy6K0UoSK0dh36XLypPm6cjJy0xyU9Pgm5YpKV+o="
+ "version": "10.0.0",
+ "hash": "sha256-uIoIpbDPRMfFqT8Y6j/wHbFCAly6H1N9qpxnomRbHIo="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-LhtRtPoZbwgZrfaaFa2MNDK2TDsZby7T0UtlE2pqhwk="
+ "version": "10.0.0",
+ "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-1nh8z2nglCizQkl0iWwJ/au4BAuuBu0xghKHGBeTM1I="
+ "version": "10.0.0",
+ "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
},
{
"pname": "Microsoft.Extensions.Diagnostics",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-LAKtLFZMBJ6qPp/h9rKbRCxk6lT2OsNQLqeKutIO5Go="
+ "version": "10.0.0",
+ "hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ="
},
{
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-tLxHtLTe1KsvE00xgXlTfL4WrtURuzZyVT6hl5Kdx9g="
+ "version": "10.0.0",
+ "hash": "sha256-cix7QxQ/g3sj6reXu3jn0cRv2RijzceaLLkchEGTt5E="
},
{
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-UpNf7I8nhNDhEIIxZ3TD3EHJxBlAFLGB8qIrXvahZSQ="
+ "version": "10.0.0",
+ "hash": "sha256-CHDs2HCN8QcfuYQpgNVszZ5dfXFe4yS9K2GoQXecc20="
},
{
"pname": "Microsoft.Extensions.FileProviders.Physical",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-WcY2e493OhzTx2YKUMpWZctrxmvPhW6pvB4zRPcRhBA="
+ "version": "10.0.0",
+ "hash": "sha256-2Rw/cwBO+/A3QY2IjN/c8Y0LhtC1qTBL7VdJiD1J2UQ="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-tgcgrmF89f+UZkBwdQEdEJlnJ+DnhPHM6E7zo5wfAdc="
+ "version": "10.0.0",
+ "hash": "sha256-ETfVTdsdBtp69EggLg/AARTQW4lLQYVdVldXIQrsjZA="
},
{
"pname": "Microsoft.Extensions.Hosting",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-6psfqOUKyucgKUZx5sNtTFjiDPyXIDNatPWtTrqSz2I="
+ "version": "10.0.0",
+ "hash": "sha256-tY0g6lCy2yFprE+NmriiU6FGmwpzxV8LqE0ZFNKIwuM="
},
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-mPojrILhm+IhpZj8b0tGnosAxMorekKtC/6otju6qaI="
+ "version": "10.0.0",
+ "hash": "sha256-Sub3Thay/+eR84cEODk/nPh1oYIYtawvDX6r0duReqo="
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-HUDcfhht8zuN4g1Ku0YbUKQzM1tIv5qK9tUt1EWACFU="
+ "version": "10.0.0",
+ "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-krml7WL+lF7oiYOvQ8NHQp7BVpHJrLIHhyxUgkHO+WE="
+ "version": "10.0.0",
+ "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-nmwnKAorvZ49MurYaBBooxEpNZIbCtNcgYqZg83mS0M="
+ "version": "10.0.0",
+ "hash": "sha256-7/TWO1aq8hdgbcTEKDBWIjgSC9KpFN3kRnMX+12bOkU="
},
{
"pname": "Microsoft.Extensions.Logging.Console",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-+h4QtdYmFnXZ0ul7lYT/mq6ioidurFhN+neh413MWPU="
+ "version": "10.0.0",
+ "hash": "sha256-Rsblo7GSMTOr43876KkdvqS6wU9Typ1yoFK3tL50CBk="
},
{
"pname": "Microsoft.Extensions.Logging.Debug",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-7imEDh57muZuPU0gqj4ZwbLwG7ElqC/M2vQNLE0m/kY="
+ "version": "10.0.0",
+ "hash": "sha256-n/+KRVlsgKm17cJImaoAPHAObHpApW/hf6mMsQFGrvY="
},
{
"pname": "Microsoft.Extensions.Logging.EventLog",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-qWTH3yQ9OJdOC63gFR/j1kMWwwCphqmD4pOLEC00Ncg="
+ "version": "10.0.0",
+ "hash": "sha256-4RJ2r80RtI3QUAhCAYbGnA0YcTmouqtZvQU9o3CrB38="
},
{
"pname": "Microsoft.Extensions.Logging.EventSource",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-3KkZT6gfLRHOcVb7GUvRC6os5JN5ftRT5Yyhz8XcjWA="
+ "version": "10.0.0",
+ "hash": "sha256-tqC13Qwkf4x14iGxOYlXTyeoN8KPVX+mupv2LdpzGHo="
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-0gis7GC+wzUJiWlP1EPi0vCrWDrV8sU6KHmt4WkI5bQ="
+ "version": "10.0.0",
+ "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA="
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-woY7sow2/WfzCN1K9IaJe1EtYuz/LZZhPvlU9b70Q+I="
+ "version": "10.0.0",
+ "hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-jvjZK/c8TGYIUA4zw7yR9uAFJmw90YE7TD3+DaxX9Ls="
+ "version": "10.0.0",
+ "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I="
},
{
"pname": "System.Diagnostics.EventLog",
- "version": "10.0.0-rc.2.25502.107",
- "hash": "sha256-WGW3a4boNTJcuPNKT0RH7G7K3HGatXqmmBIRIjHTKN4="
+ "version": "10.0.0",
+ "hash": "sha256-pN3tld926Fp0n5ZNjjzIJviUQrynlOAB0vhc1aoso6E="
}
]
diff --git a/flake.lock b/flake.lock
index 5627b33..917a7a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
]
},
"locked": {
- "lastModified": 1763321335,
- "narHash": "sha256-cjNR58eGCHYtL+78anpUdxDg/Y/5oermkY4XWJQ5ybI=",
+ "lastModified": 1764934856,
+ "narHash": "sha256-ypuVuTHImU2JkzgkFmV4Z4AVNoz4yQAPkCbP5opo464=",
"owner": "TheArcaneBrony",
"repo": "ArcaneLibs",
- "rev": "412a14c2ad2fed85066155d1060c35cbe23d6c91",
+ "rev": "491a3c65481c4e5a41b4435106e3dc8ba81efdc3",
"type": "github"
},
"original": {
@@ -59,15 +59,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1762977756,
- "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
- "owner": "nixos",
+ "lastModified": 1764667669,
+ "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+ "rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github"
},
"original": {
- "owner": "nixos",
+ "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
diff --git a/flake.nix b/flake.nix
index 3349b45..3555952 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
{
- inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.arcanelibs.url = "github:TheArcaneBrony/ArcaneLibs";
inputs.arcanelibs.inputs.nixpkgs.follows = "nixpkgs";
@@ -41,7 +41,7 @@
# dotnetFlags = [ "-v:diag" ];
dotnet-sdk = pkgs.dotnet-sdk_10;
dotnet-runtime = pkgs.dotnet-aspnetcore_10;
- src = ./.;
+ src = pkgs.lib.cleanSource ./.;
packNupkg = true;
meta = with pkgs.lib; {
description = "Rory&::LibMatrix";
@@ -99,6 +99,30 @@
checks = pkgs.lib.attrsets.unionOfDisjoint {
# Actual checks
} self.packages;
+ nupkgs.x86_64-linux = pkgs.lib.mapAttrs (
+ name: pkg:
+ (
+ with pkgs;
+ pkgs.runCommand (pkg.pname + "-" + pkg.version + ".nupkg") { } ''
+ echo 'Creating zip archive for ${name}'
+ set -x
+ cd "${pkg.out}/share/nuget/packages/${lib.toLower pkg.pname}/${pkg.version}"
+ ls -la
+ # NuGet doesn't care about compression flags
+ ${lib.getExe pkgs.zip} -db -ds 32k -9 -r "$out" *
+ set +x
+ ''
+ )
+ ) self.packages.x86_64-linux;
+ nugetArtifactDir.x86_64-linux =
+ let
+ outPaths = pkgs.lib.mapAttrsToList (name: pkg: pkg.out) self.nupkgs.x86_64-linux;
+ in
+ pkgs.runCommand "nuget-artifacts" { } ''
+ mkdir -p $out
+ for path in ${pkgs.lib.concatStringsSep " " outPaths}; do
+ ln -vs ''\${path} $out/
+ done
+ '';
};
-
}
diff --git a/scripts/publish.sh b/scripts/publish.sh
index 2fd910f..ac59da0 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -1,20 +1,5 @@
-BASEDIR="$PWD"
-rm ./result* *.nupkg
-
-for p in `nix flake show --json | jq '.packages."x86_64-linux" | keys[]' -r`
-do
- nix build .\#${p} -j4 -L --out-link ./result-${p//-/\.} &
-done
-wait
-
-for p in result*/share/nuget/packages/*/*/.unpacked
-do
- PNAME=$(basename `realpath "${p}/../.."`)
- PRNAME=$(basename $(cd "${p}/../../../../../.." && echo $PWD))
- echo $PNAME: $PRNAME
- cd "${p}" || continue
- zip -db -ds 32k -9 -r "${BASEDIR}/${PNAME//./-}.nupkg" *
- cd -
- dotnet nuget push *.nupkg -k ${NUGET_KEY} --source https://api.nuget.org/v3/index.json --skip-duplicate
- rm -rfv "${PRNAME}" "${PNAME//./-}.nupkg"
+nom build .\#nugetArtifactDir.x86_64-linux -j4 -L
+for p in ./result/*.nupkg; do
+ echo "Pushing $p to NuGet..."
+ dotnet nuget push "$p" -k ${NUGET_KEY} --source https://api.nuget.org/v3/index.json --skip-duplicate
done
\ No newline at end of file
|
