Strong name assemblies

searchpioneer · Nov 18, 2024 · 394875d · 394875d
1 parent 54e2668
commit 394875d
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 45 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,10 +10,13 @@
     <PackageReleaseNotes>https://github.com/searchpioneer/ranklib-dotnet/releases</PackageReleaseNotes>
     <PackageTags>search;ranking;learning-to-rank;ranklib;machine-learning;ltr;ml;lambdamart;mart;ranknet;rankboost;adarank;lambdarank</PackageTags>
     <LangVersion>latest</LangVersion>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
 
   <PropertyGroup>
     <SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), RankLib.sln))</SolutionRoot>
+    <AssemblyOriginatorKeyFile>$(SolutionRoot)build\keys\keypair.snk</AssemblyOriginatorKeyFile>
+    <PublicKey>0024000004800000940000000602000000240000525341310004000001000100190c74f306768e3fb8f83a87bad2bd8629d2c7e1632dc9122bdd142e949899d0c0955417f7864a71ec6baa64ab2d77dd73440778672a3575005912cec51f7fafe904d0e168645766084730f9c31b41498ec9084cd7c11f5562af4e3a9e1786de2932b9d5347b78ec0c66a3f04298a8fa92da26b430b50690ac8898ffff3697f8</PublicKey>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="MathNet.Numerics" Version="5.0.0" />
+    <PackageVersion Include="MathNet.Numerics.Signed" Version="5.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1"/>
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
@@ -22,6 +22,7 @@
   <ItemGroup>
     <PackageVersion Include="Meziantou.Extensions.Logging.Xunit" Version="1.0.7" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="StrongNamer" Version="0.2.5"/>
     <PackageVersion Include="xunit" Version="2.9.2"/>
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>

diff --git a/build/keys/keypair.snk b/build/keys/keypair.snk
diff --git a/build/keys/publickey.snk b/build/keys/publickey.snk
diff --git a/nuget-icon.png b/nuget-icon.png
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
+    <SignAssembly>true</SignAssembly>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/RankLib.Cli/RankLib.Cli.csproj b/src/RankLib.Cli/RankLib.Cli.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <PackageId>SearchPioneer.RankLib.Cli</PackageId>
+    <Title>RankLib.Cli</Title>
+    <Description>Learning to Rank (LTR) command line interface (CLI) tool for .NET, with implementations of popular ranking algorithms</Description>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -24,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="$(AssemblyName).Tests"/>
-    <InternalsVisibleTo Include="RankLib.Comparison.Tests"/>
+    <InternalsVisibleTo Include="$(AssemblyName).Tests" Key="$(PublicKey)" />
+    <InternalsVisibleTo Include="RankLib.Comparison.Tests" Key="$(PublicKey)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RankLib/RankLib.csproj b/src/RankLib/RankLib.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <PackageId>SearchPioneer.RankLib</PackageId>
+    <Title>RankLib</Title>
+    <Description>Learning to Rank (LTR) library for .NET, with implementations of popular ranking algorithms</Description>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -9,12 +12,12 @@
 
   <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Logging" />
-      <PackageReference Include="MathNet.Numerics" />
+      <PackageReference Include="MathNet.Numerics.Signed" />
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
-    <InternalsVisibleTo Include="$(AssemblyName).Cli" />
+    <InternalsVisibleTo Include="$(AssemblyName).Tests" Key="$(PublicKey)" />
+    <InternalsVisibleTo Include="$(AssemblyName).Cli" Key="$(PublicKey)" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -3,5 +3,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 </Project>
diff --git a/tests/RankLib.Cli.Tests/ProgramTests.cs b/tests/RankLib.Cli.Tests/ProgramTests.cs
@@ -15,15 +15,6 @@ public class ProgramTests
 
 	private static readonly object DataPointLock = new();
 
-	[Fact]
-	public void TestCLINoArgs()
-	{
-		lock (DataPointLock)
-		{
-			Program.Main([]);
-		}
-	}
-
 	[Fact]
 	public void TestCoorAscent()
 	{
@@ -91,7 +82,7 @@ private void WriteRandomDataCount(TempFile dataFile, int numQ, int numD)
 	}
 
 	[Fact]
-	public void TestRF()
+	public void TestRandomForests()
 	{
 		using var dataFile = new TempFile();
 		using var modelFile = new TempFile();
@@ -101,7 +92,7 @@ public void TestRF()
 	}
 
 	[Fact]
-	public void TestLinearReg()
+	public void TestLinearRegression()
 	{
 		using var dataFile = new TempFile();
 		using var modelFile = new TempFile();
@@ -111,7 +102,7 @@ public void TestLinearReg()
 	}
 
 	[Fact]
-	public void TestCAscent()
+	public void TestCoordinateAscent()
 	{
 		using var dataFile = new TempFile();
 		using var modelFile = new TempFile();

diff --git a/tests/RankLib.Cli.Tests/RankLib.Cli.Tests.csproj b/tests/RankLib.Cli.Tests/RankLib.Cli.Tests.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Meziantou.Extensions.Logging.Xunit" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="StrongNamer" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>

diff --git a/tests/RankLib.Comparison.Tests/RankLib.Comparison.Tests.csproj b/tests/RankLib.Comparison.Tests/RankLib.Comparison.Tests.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Meziantou.Extensions.Logging.Xunit" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="StrongNamer" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>

diff --git a/tests/RankLib.Tests/RankLib.Tests.csproj b/tests/RankLib.Tests/RankLib.Tests.csproj
@@ -1,33 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\RankLib\RankLib.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Meziantou.Extensions.Logging.Xunit" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\RankLib\RankLib.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Meziantou.Extensions.Logging.Xunit"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="StrongNamer"/>
+    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-      <Content Include="..\data\lambdamart.model">
-        <Link>lambdamart.model</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-      <Content Include="..\data\sample_judgments_with_features.txt">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-    </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\data\lambdamart.model">
+      <Link>lambdamart.model</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\data\sample_judgments_with_features.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 
 </Project>