merge into one csproj

myssto · myssto · commit d003680cac42 · 2025-08-08T06:31:04.000-05:00
diff --git a/OpenSkillSharp.Domain/OpenSkillSharp.Domain.csproj b/OpenSkillSharp.Domain/OpenSkillSharp.Domain.csproj
diff --git a/OpenSkillSharp.Tests/Extensions/RatingExtensionTests.cs b/OpenSkillSharp.Tests/Extensions/RatingExtensionTests.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
diff --git a/OpenSkillSharp.Tests/ModelUtilTests.cs b/OpenSkillSharp.Tests/ModelUtilTests.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 
diff --git a/OpenSkillSharp.Tests/Models/BradleyTerryFullTests.cs b/OpenSkillSharp.Tests/Models/BradleyTerryFullTests.cs
@@ -1,5 +1,5 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
+using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
 
 namespace OpenSkillSharp.Tests.Models;
diff --git a/OpenSkillSharp.Tests/Models/BradleyTerryPartTests.cs b/OpenSkillSharp.Tests/Models/BradleyTerryPartTests.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
diff --git a/OpenSkillSharp.Tests/Models/PlackettLuceTests.cs b/OpenSkillSharp.Tests/Models/PlackettLuceTests.cs
@@ -1,5 +1,5 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
+using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
 
 namespace OpenSkillSharp.Tests.Models;
diff --git a/OpenSkillSharp.Tests/Models/ThurstoneMostellerFullTests.cs b/OpenSkillSharp.Tests/Models/ThurstoneMostellerFullTests.cs
@@ -1,5 +1,5 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
+using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
 
 namespace OpenSkillSharp.Tests.Models;
diff --git a/OpenSkillSharp.Tests/Models/ThurstoneMostellerPartTests.cs b/OpenSkillSharp.Tests/Models/ThurstoneMostellerPartTests.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
diff --git a/OpenSkillSharp.Tests/PredictDrawTests.cs b/OpenSkillSharp.Tests/PredictDrawTests.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Model;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 
diff --git a/OpenSkillSharp.Tests/PredictWinTests.cs b/OpenSkillSharp.Tests/PredictWinTests.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Model;
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
 using OpenSkillSharp.Rating;
 
diff --git a/OpenSkillSharp.Tests/Rating/RatingTests.cs b/OpenSkillSharp.Tests/Rating/RatingTests.cs
@@ -1,5 +1,5 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Models;
+using OpenSkillSharp.Rating;
 using OpenSkillSharp.Tests.Util;
 
 namespace OpenSkillSharp.Tests.Rating;
diff --git a/OpenSkillSharp.Tests/Util/Assertions.cs b/OpenSkillSharp.Tests/Util/Assertions.cs
@@ -1,4 +1,4 @@
-using OpenSkillSharp.Domain.Rating;
+using OpenSkillSharp.Rating;
 
 namespace OpenSkillSharp.Tests.Util;
 
diff --git a/OpenSkillSharp.Tests/Util/ModelTestData.cs b/OpenSkillSharp.Tests/Util/ModelTestData.cs
@@ -2,7 +2,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 
 namespace OpenSkillSharp.Tests.Util;
diff --git a/OpenSkillSharp.Tests/Util/TestDataExtensions.cs b/OpenSkillSharp.Tests/Util/TestDataExtensions.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Model;
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 
 namespace OpenSkillSharp.Tests.Util;
diff --git a/OpenSkillSharp.sln b/OpenSkillSharp.sln
@@ -2,8 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSkillSharp", "OpenSkillSharp\OpenSkillSharp.csproj", "{B91B7D23-2D74-403A-83CF-E5A6C078FA50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSkillSharp.Domain", "OpenSkillSharp.Domain\OpenSkillSharp.Domain.csproj", "{21FED378-2ECC-47BA-80A3-B788611498C0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSkillSharp.Tests", "OpenSkillSharp.Tests\OpenSkillSharp.Tests.csproj", "{7B24FC35-02E2-40FB-AC4B-0165DF4EC27B}"
 EndProject
 Global
@@ -16,10 +14,6 @@ Global
 		{B91B7D23-2D74-403A-83CF-E5A6C078FA50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B91B7D23-2D74-403A-83CF-E5A6C078FA50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B91B7D23-2D74-403A-83CF-E5A6C078FA50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21FED378-2ECC-47BA-80A3-B788611498C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21FED378-2ECC-47BA-80A3-B788611498C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21FED378-2ECC-47BA-80A3-B788611498C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21FED378-2ECC-47BA-80A3-B788611498C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B24FC35-02E2-40FB-AC4B-0165DF4EC27B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B24FC35-02E2-40FB-AC4B-0165DF4EC27B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B24FC35-02E2-40FB-AC4B-0165DF4EC27B}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSkillSharp/GammaFactory.cs b/OpenSkillSharp/GammaFactory.cs
@@ -1,6 +1,6 @@
-using OpenSkillSharp.Domain.Rating;
+using OpenSkillSharp.Rating;
 
-namespace OpenSkillSharp.Domain.Model;
+namespace OpenSkillSharp;
 
 /// <summary>
 /// Represents a function to calculate a gamma value.
diff --git a/OpenSkillSharp/IOpenSkillModel.cs b/OpenSkillSharp/IOpenSkillModel.cs
@@ -1,6 +1,6 @@
-using OpenSkillSharp.Domain.Rating;
+using OpenSkillSharp.Rating;
 
-namespace OpenSkillSharp.Domain.Model;
+namespace OpenSkillSharp;
 
 public interface IOpenSkillModel
 {
diff --git a/OpenSkillSharp/Models/BradleyTerryFull.cs b/OpenSkillSharp/Models/BradleyTerryFull.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/Models/BradleyTerryPart.cs b/OpenSkillSharp/Models/BradleyTerryPart.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/Models/PlackettLuce.cs b/OpenSkillSharp/Models/PlackettLuce.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/Models/ThurstoneMostellerFull.cs b/OpenSkillSharp/Models/ThurstoneMostellerFull.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/Models/ThurstoneMostellerPart.cs b/OpenSkillSharp/Models/ThurstoneMostellerPart.cs
@@ -1,4 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/OpenSkillModelBase.cs b/OpenSkillSharp/OpenSkillModelBase.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Model;
-using OpenSkillSharp.Domain.Rating;
 using OpenSkillSharp.Rating;
 using OpenSkillSharp.Util;
 
diff --git a/OpenSkillSharp/OpenSkillSharp.csproj b/OpenSkillSharp/OpenSkillSharp.csproj
@@ -8,19 +8,21 @@
         <Authors>myssto</Authors>
         <Description>A faster, open-license alternative to Microsoft TrueSkill </Description>
         <PackageProjectUrl>https://github.com/myssto/OpenSkillSharp</PackageProjectUrl>
-        <PackageLicenseUrl></PackageLicenseUrl>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <RepositoryUrl>https://github.com/myssto/OpenSkillSharp.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>ranking, rating, elo, trueskill, openskill, bayesian</PackageTags>
         <Copyright>Copyright (c) 2025 Patrick Lacni</Copyright>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\OpenSkillSharp.Domain\OpenSkillSharp.Domain.csproj"/>
+        <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+        <None Include="..\README.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MathNet.Numerics" Version="6.0.0-beta2"/>
+        <PackageReference Include="MathNet.Numerics" Version="5.0.0"/>
     </ItemGroup>
 
 </Project>
diff --git a/OpenSkillSharp/Rating/IRating.cs b/OpenSkillSharp/Rating/IRating.cs
@@ -1,4 +1,4 @@
-namespace OpenSkillSharp.Domain.Rating;
+namespace OpenSkillSharp.Rating;
 
 /// <summary>
 /// Interfaces an object representing player rating data.
diff --git a/OpenSkillSharp/Rating/ITeam.cs b/OpenSkillSharp/Rating/ITeam.cs
@@ -1,4 +1,4 @@
-namespace OpenSkillSharp.Domain.Rating;
+namespace OpenSkillSharp.Rating;
 
 /// <summary>
 /// Interfaces an object representing a team of player ratings.
diff --git a/OpenSkillSharp/Rating/ITeamRating.cs b/OpenSkillSharp/Rating/ITeamRating.cs
@@ -1,4 +1,4 @@
-namespace OpenSkillSharp.Domain.Rating;
+namespace OpenSkillSharp.Rating;
 
 /// <summary>
 /// Interfaces an object representing the collective rating of a team.
diff --git a/OpenSkillSharp/Rating/Rating.cs b/OpenSkillSharp/Rating/Rating.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
-
 namespace OpenSkillSharp.Rating;
 
 public class Rating : IRating
diff --git a/OpenSkillSharp/Rating/Team.cs b/OpenSkillSharp/Rating/Team.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
-
 namespace OpenSkillSharp.Rating;
 
 public class Team : ITeam
diff --git a/OpenSkillSharp/Rating/TeamRating.cs b/OpenSkillSharp/Rating/TeamRating.cs
@@ -1,5 +1,3 @@
-using OpenSkillSharp.Domain.Rating;
-
 namespace OpenSkillSharp.Rating;
 
 public class TeamRating : Team, ITeamRating
diff --git a/OpenSkillSharp/Util/RatingExtensions.cs b/OpenSkillSharp/Util/RatingExtensions.cs
@@ -1,4 +1,4 @@
-using OpenSkillSharp.Domain.Rating;
+using OpenSkillSharp.Rating;
 
 namespace OpenSkillSharp.Util;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using OpenSkillSharp.Domain.Rating;`
`2`	`1`	`using OpenSkillSharp.Models;`
`3`	`2`	`using OpenSkillSharp.Rating;`
`4`	`3`	`using OpenSkillSharp.Util;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using OpenSkillSharp.Domain.Model;`
`2`	`1`	`using OpenSkillSharp.Models;`
`3`	`2`	`using OpenSkillSharp.Rating;`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using OpenSkillSharp.Domain.Model;`
`2`		`-using OpenSkillSharp.Domain.Rating;`
`3`	`1`	`using OpenSkillSharp.Models;`
`4`	`2`	`using OpenSkillSharp.Rating;`
`5`	`3`