Merge pull request #31 from HenrikWM/f-split-into-client-server-nuget…

…-package Splits projects into Client, Server and a new shared library
HenrikWM · Nov 25, 2020 · 7afe4cc · 7afe4cc
2 parents f30c332 + 69e66eb
commit 7afe4cc
Show file tree

Hide file tree

Showing 25 changed files with 123 additions and 51 deletions.
diff --git a/AnonymousTokens.sln b/AnonymousTokens.sln
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server-side", "Server-side"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4DDE2573-8947-4348-95B4-688102A8294D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousTokens", "src\AnonymousTokens\AnonymousTokens.csproj", "{D98EB88A-9922-4AA5-8C97-6206C7196CD5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousTokens.Client", "src\AnonymousTokens.Client\AnonymousTokens.Client.csproj", "{D98EB88A-9922-4AA5-8C97-6206C7196CD5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.TokenGeneration.Api", "samples\ClientServer\Server\Server.TokenGeneration.Api\Server.TokenGeneration.Api.csproj", "{E691A98B-3EBC-4AE7-8858-67601E805909}"
 EndProject
@@ -31,11 +31,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\CI.yml = .github\workflows\CI.yml
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
 		.github\dependabot.yml = .github\dependabot.yml
-		Directory.Build.props = Directory.Build.props
+		src\Directory.Build.props = src\Directory.Build.props
 		readme.md = readme.md
 		.github\workflows\Release.yml = .github\workflows\Release.yml
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousTokens.Server", "src\AnonymousTokens.Server\AnonymousTokens.Server.csproj", "{EF827382-7F6E-4230-A917-9D11415ECAD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousTokens", "src\AnonymousTokens\AnonymousTokens.csproj", "{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,6 +66,14 @@ Global
 		{E24CF8EE-6D9B-49AC-92A5-EB1F81FDAAA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E24CF8EE-6D9B-49AC-92A5-EB1F81FDAAA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E24CF8EE-6D9B-49AC-92A5-EB1F81FDAAA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF827382-7F6E-4230-A917-9D11415ECAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF827382-7F6E-4230-A917-9D11415ECAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF827382-7F6E-4230-A917-9D11415ECAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF827382-7F6E-4230-A917-9D11415ECAD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -75,6 +87,8 @@ Global
 		{A4143A14-789E-4AD0-BAD9-BF5B32E24EC7} = {FC4D5FE2-898D-4C67-8094-FDB6E71247CD}
 		{E24CF8EE-6D9B-49AC-92A5-EB1F81FDAAA2} = {4FB09123-E5E6-4367-BEDD-FF3D9906A2BA}
 		{017DB04E-CA83-4400-90FD-4CA10428EC51} = {645EAD64-C3E7-41AA-B7E4-E423DFFCEEDF}
+		{EF827382-7F6E-4230-A917-9D11415ECAD6} = {4DDE2573-8947-4348-95B4-688102A8294D}
+		{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98} = {4DDE2573-8947-4348-95B4-688102A8294D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EC41792F-67C9-4BD6-B598-E3E2ECDD924C}

diff --git a/Build.ps1 b/Build.ps1
@@ -32,4 +32,5 @@ exec { & dotnet build -c Release }
 
 exec { & dotnet test -c Release -r $artifacts --no-build -l trx --verbosity=normal }
 
-exec { & dotnet pack .\src\AnonymousTokens\AnonymousTokens.csproj -c Release -o $artifacts --no-build }
+exec { & dotnet pack .\src\AnonymousTokens.Client\AnonymousTokens.Client.csproj -c Release -o $artifacts --no-build }
+exec { & dotnet pack .\src\AnonymousTokens.Server\AnonymousTokens.Server.csproj -c Release -o $artifacts --no-build }
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/samples/ClientServer/Client/Client.Console/Client.Console.csproj b/samples/ClientServer/Client/Client.Console/Client.Console.csproj
@@ -10,6 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\AnonymousTokens.Client\AnonymousTokens.Client.csproj" />
     <ProjectReference Include="..\..\..\..\src\AnonymousTokens\AnonymousTokens.csproj" />
   </ItemGroup>
 

diff --git a/samples/ClientServer/Client/Client.Console/Program.cs b/samples/ClientServer/Client/Client.Console/Program.cs
@@ -1,9 +1,9 @@
 
-using AnonymousTokensConsole.ApiClients.TokenGeneration;
-
 using AnonymousTokens.Protocol;
 using AnonymousTokens.Services.InMemory;
 
+using AnonymousTokensConsole.ApiClients.TokenGeneration;
+
 using Client.Console.ApiClients.TokenVerification;
 
 using Org.BouncyCastle.Asn1.X9;

diff --git a/samples/ClientServer/Server/Server.TokenGeneration.Api/Controllers/TokenController.cs b/samples/ClientServer/Server/Server.TokenGeneration.Api/Controllers/TokenController.cs
@@ -1,4 +1,4 @@
-using AnonymousTokens.Protocol;
+using AnonymousTokens.Server.Protocol;
 using AnonymousTokens.Services.InMemory;
 
 using Microsoft.AspNetCore.Mvc;

diff --git a/samples/ClientServer/Server/Server.TokenGeneration.Api/Server.TokenGeneration.Api.csproj b/samples/ClientServer/Server/Server.TokenGeneration.Api/Server.TokenGeneration.Api.csproj
@@ -5,11 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\AnonymousTokens\AnonymousTokens.csproj" />
+    <ProjectReference Include="..\..\..\..\src\AnonymousTokens.Server\AnonymousTokens.Server.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ClientServer/Server/Server.TokenVerification.Api/Controllers/TokenController.cs b/samples/ClientServer/Server/Server.TokenVerification.Api/Controllers/TokenController.cs
@@ -1,4 +1,5 @@
-using AnonymousTokens.Protocol;
+
+using AnonymousTokens.Server.Protocol;
 using AnonymousTokens.Services;
 using AnonymousTokens.Services.InMemory;
 

diff --git a/samples/ClientServer/Server/Server.TokenVerification.Api/Server.TokenVerification.Api.csproj b/samples/ClientServer/Server/Server.TokenVerification.Api/Server.TokenVerification.Api.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\AnonymousTokens\AnonymousTokens.csproj" />
+    <ProjectReference Include="..\..\..\..\src\AnonymousTokens.Server\AnonymousTokens.Server.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AnonymousTokens.Client/AnonymousTokens.Client.csproj b/src/AnonymousTokens.Client/AnonymousTokens.Client.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Anonymous tokens client-implementation in .NET based on Privacy Pass</Description>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <AssemblyName>AnonymousTokens.Client</AssemblyName>
+    <RootNamespace>AnonymousTokens.Client</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AnonymousTokens\AnonymousTokens.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/AnonymousTokens/Protocol/Initiator.cs → ...nymousTokens.Client/Protocol/Initiator.cs b/src/AnonymousTokens/Protocol/Initiator.cs → ...nymousTokens.Client/Protocol/Initiator.cs
@@ -1,3 +1,4 @@
+
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;

diff --git a/src/AnonymousTokens.Server/AnonymousTokens.Server.csproj b/src/AnonymousTokens.Server/AnonymousTokens.Server.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Anonymous tokens server-implementation in .NET based on Privacy Pass</Description>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <AssemblyName>AnonymousTokens.Server</AssemblyName>
+    <RootNamespace>AnonymousTokens.Server</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Services\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AnonymousTokens\AnonymousTokens.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...nonymousTokens/Protocol/TokenGenerator.cs → ...sTokens.Server/Protocol/TokenGenerator.cs b/...nonymousTokens/Protocol/TokenGenerator.cs → ...sTokens.Server/Protocol/TokenGenerator.cs
@@ -1,3 +1,4 @@
+
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;
@@ -7,7 +8,7 @@
 
 using ECPoint = Org.BouncyCastle.Math.EC.ECPoint;
 
-namespace AnonymousTokens.Protocol
+namespace AnonymousTokens.Server.Protocol
 {
     public class TokenGenerator
     {

diff --git a/...AnonymousTokens/Protocol/TokenVerifier.cs → ...usTokens.Server/Protocol/TokenVerifier.cs b/...AnonymousTokens/Protocol/TokenVerifier.cs → ...usTokens.Server/Protocol/TokenVerifier.cs
@@ -3,7 +3,7 @@
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
 
-namespace AnonymousTokens.Protocol
+namespace AnonymousTokens.Server.Protocol
 {
     public class TokenVerifier
     {

diff --git a/src/AnonymousTokens/AnonymousTokens.csproj b/src/AnonymousTokens/AnonymousTokens.csproj
@@ -1,26 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Authors>Henrik Walker Moe, Tjerand Silde, Martin Strand</Authors>
-    <Description>Anonymous tokens implementation in .NET based on Privacy Pass</Description>
-    <Copyright>Copyright Henrik Walker Moe, Tjerand Silde, Martin Strand</Copyright>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <Features>strict</Features>
-    <PackageTags>privacy-pass;anonymous-tokens</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <MinVerTagPrefix>v</MinVerTagPrefix>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Deterministic>true</Deterministic>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
-    <Version>0.1.0</Version>
-    <RepositoryUrl>https://github.com/HenrikWM/anonymous-tokens</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <AssemblyName>AnonymousTokens</AssemblyName>
+    <RootNamespace>AnonymousTokens</RootNamespace>
+    <IsPackable>false</IsPackable>
+    <PackageId>AnonymousTokens</PackageId>
+    <Product>AnonymousTokens</Product>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,10 +20,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
   </ItemGroup>
+
 </Project>
diff --git a/...usTokens/Protocol/CPChallengeGenerator.cs → src/AnonymousTokens/CPChallengeGenerator.cs b/...usTokens/Protocol/CPChallengeGenerator.cs → src/AnonymousTokens/CPChallengeGenerator.cs
@@ -1,4 +1,4 @@
-
+
 using Org.BouncyCastle.Math;
 
 using System.Collections.Generic;
@@ -8,7 +8,7 @@
 
 using ECPoint = Org.BouncyCastle.Math.EC.ECPoint;
 
-namespace AnonymousTokens.Protocol
+namespace AnonymousTokens
 {
     public static class CPChallengeGenerator
     {

diff --git a/src/AnonymousTokens/ECCurveHash.cs b/src/AnonymousTokens/ECCurveHash.cs
@@ -1,3 +1,4 @@
+
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
 

diff --git a/src/AnonymousTokens/ECCurveRandomNumberGenerator.cs b/src/AnonymousTokens/ECCurveRandomNumberGenerator.cs
@@ -1,4 +1,4 @@
-using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
 using Org.BouncyCastle.Security;
 

diff --git a/src/AnonymousTokens/Services/IPrivateKeyStore.cs b/src/AnonymousTokens/Services/IPrivateKeyStore.cs
@@ -1,4 +1,4 @@
-using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math;
 
 namespace AnonymousTokens.Services
 {

diff --git a/src/AnonymousTokens/Services/IPublicKeyStore.cs b/src/AnonymousTokens/Services/IPublicKeyStore.cs
@@ -1,4 +1,4 @@
-using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Crypto.Parameters;
 
 namespace AnonymousTokens.Services
 {

diff --git a/src/AnonymousTokens/Services/InMemory/EmbeddedPemResource.cs b/src/AnonymousTokens/Services/InMemory/EmbeddedPemResource.cs
@@ -1,4 +1,4 @@
-
+
 using System.IO;
 using System.Reflection;
 

diff --git a/src/AnonymousTokens/Services/InMemory/EmbeddedResourceConstants.cs b/src/AnonymousTokens/Services/InMemory/EmbeddedResourceConstants.cs
@@ -1,4 +1,4 @@
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Services.InMemory
 {
     internal static class EmbeddedResourceConstants
     {

diff --git a/src/AnonymousTokens/Services/InMemory/InMemoryPublicKeyStore.cs b/src/AnonymousTokens/Services/InMemory/InMemoryPublicKeyStore.cs
@@ -1,4 +1,4 @@
-using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Crypto.Parameters;
 
 namespace AnonymousTokens.Services.InMemory
 {

diff --git a/src/AnonymousTokens/Services/InMemory/InMemorySeedStore.cs b/src/AnonymousTokens/Services/InMemory/InMemorySeedStore.cs
@@ -1,3 +1,4 @@
+
 using Org.BouncyCastle.Utilities.Encoders;
 
 using System.Collections.Generic;

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,28 @@
+<Project>
+  <PropertyGroup>
+    <Authors>Henrik Walker Moe, Tjerand Silde, Martin Strand</Authors>
+    <Description>Anonymous tokens implementation in .NET based on Privacy Pass</Description>
+    <Copyright>Copyright Henrik Walker Moe, Tjerand Silde, Martin Strand</Copyright>
+    <LangVersion>latest</LangVersion>
+    <Features>strict</Features>
+    <Nullable>enable</Nullable>
+    <PackageTags>privacy-pass;anonymous-tokens</PackageTags>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <MinVerTagPrefix>v</MinVerTagPrefix>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <IsPackable>True</IsPackable>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <Deterministic>true</Deterministic>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    <Version>0.2.0</Version>
+    <RepositoryUrl>https://github.com/HenrikWM/anonymous-tokens</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <LangVersion>latest</LangVersion>
+    <NoWarn>$(NoWarn);CS1701;CS1702;CS1591;CS1570</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>