From 093bb4ccd7191557ea223d11d509d76c79e8dfac Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 5 Dec 2025 14:42:40 +0100
Subject: Packaging work

---
 LibMatrix.EventTypes/LibMatrix.EventTypes.csproj              |  7 +++++++
 LibMatrix.Federation/LibMatrix.Federation.csproj              | 11 +++++++++--
 LibMatrix/LibMatrix.csproj                                    |  7 +++++++
 .../LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj    |  9 ++++++++-
 flake.nix                                                     | 10 +++++-----
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
index f1dcbec..e633aef 100644
--- a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
+++ b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
@@ -4,8 +4,15 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <PackageId>RoryLibMatrix.EventTypes</PackageId>
+        <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="\"/>
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
         <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.2025*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
diff --git a/LibMatrix.Federation/LibMatrix.Federation.csproj b/LibMatrix.Federation/LibMatrix.Federation.csproj
index 84721fe..2a9a0d8 100644
--- a/LibMatrix.Federation/LibMatrix.Federation.csproj
+++ b/LibMatrix.Federation/LibMatrix.Federation.csproj
@@ -5,16 +5,23 @@
         <LangVersion>preview</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <PackageId>RoryLibMatrix.Federation</PackageId>
+        <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="\"/>
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\LibMatrix\LibMatrix.csproj"/>
-        <PackageReference Include="LibMatrix" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <PackageReference Include="RoryLibMatrix" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2"/>
-        <PackageReference Include="Microsoft.Extensions.Primitives" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Primitives" Version="10.0.0"/>
     </ItemGroup>
 
 </Project>
diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj
index 71e17c8..f9e5ce3 100644
--- a/LibMatrix/LibMatrix.csproj
+++ b/LibMatrix/LibMatrix.csproj
@@ -9,8 +9,15 @@
         <Optimize>true</Optimize>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Required for UnicodeJsonEncoder... -->
+        <PackageId>RoryLibMatrix</PackageId>
+        <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="\"/>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0"/>
diff --git a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
index 09e9a86..8c3bfcb 100644
--- a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
+++ b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
@@ -5,11 +5,18 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>preview</LangVersion>
+        <PackageId>RoryLibMatrix.Utilities.Bot</PackageId>
+        <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../../README.md" Pack="true" PackagePath="\"/>
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\..\LibMatrix\LibMatrix.csproj"/>
-        <PackageReference Include="LibMatrix" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <PackageReference Include="RoryLibMatrix" Version="*-*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/flake.nix b/flake.nix
index 3555952..45a0b4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
           name,
           nugetDeps ? null,
           projectReferences ? [ ],
-          projectFile ? "${name}/${name}.csproj",
+          projectFile ? "${pkgs.lib.replaceString "RoryLibMatrix" "LibMatrix" name}/${pkgs.lib.replaceString "RoryLibMatrix" "LibMatrix" name}.csproj",
         }@args:
         pkgs.buildDotnetModule rec {
           inherit projectReferences nugetDeps projectFile;
@@ -67,19 +67,19 @@
         in
         {
           LibMatrix = makeNupkg {
-            name = "LibMatrix";
+            name = "RoryLibMatrix";
             nugetDeps = LibMatrix/deps.json;
             projectReferences = [ ArcaneLibs ];
           };
           LibMatrix-EventTypes = makeNupkg {
-            name = "LibMatrix.EventTypes";
+            name = "RoryLibMatrix.EventTypes";
             projectReferences = [
               ArcaneLibs
               #              LibMatrix
             ];
           };
           LibMatrix-Federation = makeNupkg {
-            name = "LibMatrix.Federation";
+            name = "RoryLibMatrix.Federation";
             nugetDeps = LibMatrix.Federation/deps.json;
             projectReferences = [
               ArcaneLibs
@@ -87,7 +87,7 @@
             ];
           };
           LibMatrix-Bot-Utils = makeNupkg {
-            name = "LibMatrix.Utilities.Bot";
+            name = "RoryLibMatrix.Utilities.Bot";
             nugetDeps = Utilities/LibMatrix.Utilities.Bot/deps.json;
             projectFile = "Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj";
             projectReferences = [
-- 
cgit 1.5.1