Merge pull request #37 from HenrikWM/f-include-referenced-project

Create Core-project as NuGet-package
HenrikWM · Dec 8, 2020 · 1875fff · 1875fff
2 parents 7edc134 + a574856
commit 1875fff
Show file tree

Hide file tree

Showing 34 changed files with 40 additions and 38 deletions.
diff --git a/AnonymousTokens.sln b/AnonymousTokens.sln
@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnonymousTokens.Core", "src\AnonymousTokens.Core\AnonymousTokens.Core.csproj", "{EAD6EEA6-8866-4D23-BCE0-891AEE53BE98}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnonymousTokens.Benchmarks", "test\AnonymousTokens.Benchmarks\AnonymousTokens.Benchmarks.csproj", "{FE1684A8-5257-48B5-A067-836D75831D15}"
 EndProject

diff --git a/samples/ClientServer/Client/Client.Console/Client.Console.csproj b/samples/ClientServer/Client/Client.Console/Client.Console.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\AnonymousTokens.Client\AnonymousTokens.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\src\AnonymousTokens\AnonymousTokens.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ClientServer/Client/Client.Console/Program.cs b/samples/ClientServer/Client/Client.Console/Program.cs
@@ -1,6 +1,6 @@
 
 using AnonymousTokens.Client.Protocol;
-using AnonymousTokens.Services.InMemory;
+using AnonymousTokens.Core.Services.InMemory;
 
 using AnonymousTokensConsole.ApiClients.TokenApi;
 

diff --git a/samples/ClientServer/Server/Server.Token.Api/Controllers/TokenController.cs b/samples/ClientServer/Server/Server.Token.Api/Controllers/TokenController.cs
@@ -1,5 +1,5 @@
+using AnonymousTokens.Core.Services;
 using AnonymousTokens.Server.Protocol;
-using AnonymousTokens.Services;
 
 using Microsoft.AspNetCore.Mvc;
 
@@ -23,7 +23,7 @@ public class TokenController : ControllerBase
         private readonly ITokenVerifier _tokenVerifier;
 
         private readonly X9ECParameters _ecParameters;
-        
+
         public TokenController(
             IPrivateKeyStore privateKeyStore,
             IPublicKeyStore publicKeyStore,

diff --git a/samples/ClientServer/Server/Server.Token.Api/Startup.cs b/samples/ClientServer/Server/Server.Token.Api/Startup.cs
@@ -1,7 +1,7 @@
 
+using AnonymousTokens.Core.Services;
+using AnonymousTokens.Core.Services.InMemory;
 using AnonymousTokens.Server.Protocol;
-using AnonymousTokens.Services;
-using AnonymousTokens.Services.InMemory;
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;

diff --git a/src/AnonymousTokens.Client/AnonymousTokens.Client.csproj b/src/AnonymousTokens.Client/AnonymousTokens.Client.csproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AnonymousTokens\AnonymousTokens.csproj" />
+    <ProjectReference Include="..\AnonymousTokens.Core\AnonymousTokens.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/AnonymousTokens.Client/Protocol/Initiator.cs b/src/AnonymousTokens.Client/Protocol/Initiator.cs
@@ -1,4 +1,6 @@
 
+using AnonymousTokens.Core;
+
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;

diff --git a/src/AnonymousTokens/AnonymousTokens.csproj → ...usTokens.Core/AnonymousTokens.Core.csproj b/src/AnonymousTokens/AnonymousTokens.csproj → ...usTokens.Core/AnonymousTokens.Core.csproj
@@ -2,11 +2,9 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <AssemblyName>AnonymousTokens</AssemblyName>
-    <RootNamespace>AnonymousTokens</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <PackageId>AnonymousTokens</PackageId>
-    <Product>AnonymousTokens</Product>
+    <AssemblyName>AnonymousTokens.Core</AssemblyName>
+    <RootNamespace>AnonymousTokens.Core</RootNamespace>
+    <PackageId>AnonymousTokens.Core</PackageId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...onymousTokens/AnonymousTokensException.cs → ...usTokens.Core/AnonymousTokensException.cs b/...onymousTokens/AnonymousTokensException.cs → ...usTokens.Core/AnonymousTokensException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace AnonymousTokens
+namespace AnonymousTokens.Core
 {
     public class AnonymousTokensException
         : Exception

diff --git a/src/AnonymousTokens/CPChallengeGenerator.cs → ...nymousTokens.Core/CPChallengeGenerator.cs b/src/AnonymousTokens/CPChallengeGenerator.cs → ...nymousTokens.Core/CPChallengeGenerator.cs
@@ -8,7 +8,7 @@
 
 using ECPoint = Org.BouncyCastle.Math.EC.ECPoint;
 
-namespace AnonymousTokens
+namespace AnonymousTokens.Core
 {
     public static class CPChallengeGenerator
     {

diff --git a/src/AnonymousTokens/ECCurveHash.cs → src/AnonymousTokens.Core/ECCurveHash.cs b/src/AnonymousTokens/ECCurveHash.cs → src/AnonymousTokens.Core/ECCurveHash.cs
@@ -7,7 +7,7 @@
 using ECCurve = Org.BouncyCastle.Math.EC.ECCurve;
 using ECPoint = Org.BouncyCastle.Math.EC.ECPoint;
 
-namespace AnonymousTokens
+namespace AnonymousTokens.Core
 {
     public static class ECCurveHash
     {

diff --git a/...ousTokens/ECCurveRandomNumberGenerator.cs → ...kens.Core/ECCurveRandomNumberGenerator.cs b/...ousTokens/ECCurveRandomNumberGenerator.cs → ...kens.Core/ECCurveRandomNumberGenerator.cs
@@ -2,7 +2,7 @@
 using Org.BouncyCastle.Math.EC;
 using Org.BouncyCastle.Security;
 
-namespace AnonymousTokens
+namespace AnonymousTokens.Core
 {
     public static class ECCurveRandomNumberGenerator
     {

diff --git a/src/AnonymousTokens/ECPointVerifier.cs → src/AnonymousTokens.Core/ECPointVerifier.cs b/src/AnonymousTokens/ECPointVerifier.cs → src/AnonymousTokens.Core/ECPointVerifier.cs
@@ -1,6 +1,6 @@
 using Org.BouncyCastle.Math.EC;
 
-namespace AnonymousTokens
+namespace AnonymousTokens.Core
 {
     public static class ECPointVerifier
     {

diff --git a/...nymousTokens/Services/IPrivateKeyStore.cs → ...sTokens.Core/Services/IPrivateKeyStore.cs b/...nymousTokens/Services/IPrivateKeyStore.cs → ...sTokens.Core/Services/IPrivateKeyStore.cs
@@ -2,7 +2,7 @@
 
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services
+namespace AnonymousTokens.Core.Services
 {
     public interface IPrivateKeyStore
     {

diff --git a/...onymousTokens/Services/IPublicKeyStore.cs → ...usTokens.Core/Services/IPublicKeyStore.cs b/...onymousTokens/Services/IPublicKeyStore.cs → ...usTokens.Core/Services/IPublicKeyStore.cs
@@ -2,7 +2,7 @@
 
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services
+namespace AnonymousTokens.Core.Services
 {
     public interface IPublicKeyStore
     {

diff --git a/src/AnonymousTokens/Services/ISeedStore.cs → ...onymousTokens.Core/Services/ISeedStore.cs b/src/AnonymousTokens/Services/ISeedStore.cs → ...onymousTokens.Core/Services/ISeedStore.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services
+namespace AnonymousTokens.Core.Services
 {
     public interface ISeedStore
     {

diff --git a/.../Services/InMemory/EmbeddedPemResource.cs → .../Services/InMemory/EmbeddedPemResource.cs b/.../Services/InMemory/EmbeddedPemResource.cs → .../Services/InMemory/EmbeddedPemResource.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Core.Services.InMemory
 {
     public static class EmbeddedPemResource
     {

diff --git a/...ces/InMemory/EmbeddedResourceConstants.cs → ...ces/InMemory/EmbeddedResourceConstants.cs b/...ces/InMemory/EmbeddedResourceConstants.cs → ...ces/InMemory/EmbeddedResourceConstants.cs
@@ -1,7 +1,7 @@
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Core.Services.InMemory
 {
     internal static class EmbeddedResourceConstants
     {
-        internal const string ResourceBasePath = "AnonymousTokens.Services.InMemory.";
+        internal const string ResourceBasePath = "AnonymousTokens.Core.Services.InMemory.";
     }
 }
diff --git a/...InMemory/GenerateDummyKeysWithOpenSsl.txt → ...InMemory/GenerateDummyKeysWithOpenSsl.txt b/...InMemory/GenerateDummyKeysWithOpenSsl.txt → ...InMemory/GenerateDummyKeysWithOpenSsl.txt
diff --git a/...vices/InMemory/InMemoryPrivateKeyStore.cs → ...vices/InMemory/InMemoryPrivateKeyStore.cs b/...vices/InMemory/InMemoryPrivateKeyStore.cs → ...vices/InMemory/InMemoryPrivateKeyStore.cs
@@ -4,7 +4,7 @@
 
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Core.Services.InMemory
 {
     public class InMemoryPrivateKeyStore : IPrivateKeyStore
     {

diff --git a/...rvices/InMemory/InMemoryPublicKeyStore.cs → ...rvices/InMemory/InMemoryPublicKeyStore.cs b/...rvices/InMemory/InMemoryPublicKeyStore.cs → ...rvices/InMemory/InMemoryPublicKeyStore.cs
@@ -2,7 +2,7 @@
 
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Core.Services.InMemory
 {
     public class InMemoryPublicKeyStore : IPublicKeyStore
     {

diff --git a/...ns/Services/InMemory/InMemorySeedStore.cs → ...re/Services/InMemory/InMemorySeedStore.cs b/...ns/Services/InMemory/InMemorySeedStore.cs → ...re/Services/InMemory/InMemorySeedStore.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace AnonymousTokens.Services.InMemory
+namespace AnonymousTokens.Core.Services.InMemory
 {
     public class InMemorySeedStore : ISeedStore
     {

diff --git a/...sTokens/Services/InMemory/private-key.pem → ...ns.Core/Services/InMemory/private-key.pem b/...sTokens/Services/InMemory/private-key.pem → ...ns.Core/Services/InMemory/private-key.pem
diff --git a/...usTokens/Services/InMemory/public-key.pem → ...ens.Core/Services/InMemory/public-key.pem b/...usTokens/Services/InMemory/public-key.pem → ...ens.Core/Services/InMemory/public-key.pem
diff --git a/src/AnonymousTokens.Server/AnonymousTokens.Server.csproj b/src/AnonymousTokens.Server/AnonymousTokens.Server.csproj
@@ -7,10 +7,6 @@
     <RootNamespace>AnonymousTokens.Server</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Services\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
   </ItemGroup>
@@ -20,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AnonymousTokens\AnonymousTokens.csproj" />
+    <ProjectReference Include="..\AnonymousTokens.Core\AnonymousTokens.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AnonymousTokens.Server/Protocol/TokenGenerator.cs b/src/AnonymousTokens.Server/Protocol/TokenGenerator.cs
@@ -1,4 +1,6 @@
 
+using AnonymousTokens.Core;
+
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;

diff --git a/src/AnonymousTokens.Server/Protocol/TokenVerifier.cs b/src/AnonymousTokens.Server/Protocol/TokenVerifier.cs
@@ -1,4 +1,5 @@
-using AnonymousTokens.Services;
+using AnonymousTokens.Core;
+using AnonymousTokens.Core.Services;
 
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -18,7 +18,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <Deterministic>true</Deterministic>
     <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <RepositoryUrl>https://github.com/HenrikWM/anonymous-tokens</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <LangVersion>latest</LangVersion>

diff --git a/test/AnonymousTokens.Benchmarks/Protocol.cs b/test/AnonymousTokens.Benchmarks/Protocol.cs
@@ -1,6 +1,6 @@
 using AnonymousTokens.Client.Protocol;
+using AnonymousTokens.Core.Services.InMemory;
 using AnonymousTokens.Server.Protocol;
-using AnonymousTokens.Services.InMemory;
 
 using BenchmarkDotNet.Attributes;
 

diff --git a/test/AnonymousTokens.UnitTests/AnonymousTokens.UnitTests.csproj b/test/AnonymousTokens.UnitTests/AnonymousTokens.UnitTests.csproj
@@ -17,7 +17,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\AnonymousTokens.Client\AnonymousTokens.Client.csproj" />
     <ProjectReference Include="..\..\src\AnonymousTokens.Server\AnonymousTokens.Server.csproj" />
-    <ProjectReference Include="..\..\src\AnonymousTokens\AnonymousTokens.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AnonymousTokens.UnitTests/ECCurveHashTests.cs b/test/AnonymousTokens.UnitTests/ECCurveHashTests.cs
@@ -1,3 +1,5 @@
+using AnonymousTokens.Core;
+
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 

diff --git a/test/AnonymousTokens.UnitTests/ECPointVerifierTests.cs b/test/AnonymousTokens.UnitTests/ECPointVerifierTests.cs
@@ -1,4 +1,5 @@
 
+using AnonymousTokens.Core;
 using AnonymousTokens.UnitTests.TestUtilities;
 
 using Org.BouncyCastle.Asn1.X9;

diff --git a/test/AnonymousTokens.UnitTests/IntegrationTests/ProtocolTests.cs b/test/AnonymousTokens.UnitTests/IntegrationTests/ProtocolTests.cs
@@ -1,6 +1,7 @@
 using AnonymousTokens.Client.Protocol;
+using AnonymousTokens.Core;
+using AnonymousTokens.Core.Services.InMemory;
 using AnonymousTokens.Server.Protocol;
-using AnonymousTokens.Services.InMemory;
 
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Crypto.EC;

diff --git a/test/AnonymousTokens.UnitTests/Server/Protocol/TokenVerifierTests.cs b/test/AnonymousTokens.UnitTests/Server/Protocol/TokenVerifierTests.cs
@@ -1,6 +1,7 @@
 
+using AnonymousTokens.Core;
+using AnonymousTokens.Core.Services;
 using AnonymousTokens.Server.Protocol;
-using AnonymousTokens.Services;
 
 using Moq;