Move files to Equinox.Storage

jet · Sep 22, 2019 · a7875e2 · a7875e2
1 parent 08d8c78
commit a7875e2
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 9 deletions.
diff --git a/Equinox.sln b/Equinox.sln
@@ -58,6 +58,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Tutorial", "samples\Tutoria
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Equinox.Tools.TestHarness", "tools\Equinox.Tools.TestHarness\Equinox.Tools.TestHarness.fsproj", "{C2EE7D8E-6982-41AD-ADCC-E6F586E93524}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Equinox.Storage", "src\Equinox.Storage\Equinox.Storage.fsproj", "{3021659A-5CA4-4E06-AF00-2457ED3F105B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -132,6 +134,10 @@ Global
 		{C2EE7D8E-6982-41AD-ADCC-E6F586E93524}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2EE7D8E-6982-41AD-ADCC-E6F586E93524}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2EE7D8E-6982-41AD-ADCC-E6F586E93524}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3021659A-5CA4-4E06-AF00-2457ED3F105B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3021659A-5CA4-4E06-AF00-2457ED3F105B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3021659A-5CA4-4E06-AF00-2457ED3F105B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3021659A-5CA4-4E06-AF00-2457ED3F105B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build.proj b/build.proj
@@ -18,6 +18,7 @@
     <Exec Command="dotnet pack src/Equinox.Cosmos $(Cfg) $(PackOptions)" />
     <Exec Command="dotnet pack src/Equinox.EventStore $(Cfg) $(PackOptions)" />
     <Exec Command="dotnet pack src/Equinox.MemoryStore $(Cfg) $(PackOptions)" />
+    <Exec Command="dotnet pack src/Equinox.Storage $(Cfg) $(PackOptions)" />
     <Exec Command="dotnet pack tools/Equinox.Tools.TestHarness $(Cfg) $(PackOptions)" />
     <Exec Command='dotnet publish tools/Equinox.Tool $(Cfg) -f net461 -o "$(ThisDirAbsolute)/bin/equinox-tool/net461" ' />
     <Exec Command="dotnet pack tools/Equinox.Tool $(Cfg) $(PackOptions) /p:PackAsTool=true" />

diff --git a/src/Equinox.Cosmos/Equinox.Cosmos.fsproj b/src/Equinox.Cosmos/Equinox.Cosmos.fsproj
@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Equinox.MemoryStore\StoreHelpers.fs" Link="StoreHelpers.fs" />
-    <Compile Include="..\Equinox.EventStore\Infrastructure.fs" Link="Infrastructure.fs" />
+    <Compile Include="..\Equinox.Storage\StoreHelpers.fs" Link="StoreHelpers.fs" />
+    <Compile Include="..\Equinox.Storage\Infrastructure.fs" Link="Infrastructure.fs" />
     <Compile Include="Cosmos.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Equinox\Equinox.fsproj" />
+    <ProjectReference Include="..\Equinox.Storage\Equinox.Storage.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj
@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Equinox.MemoryStore\StoreHelpers.fs" Link="StoreHelpers.fs" />
-    <Compile Include="Infrastructure.fs" />
+    <Compile Include="..\Equinox.Storage\StoreHelpers.fs" Link="StoreHelpers.fs" />
+    <Compile Include="..\Equinox.Storage\Infrastructure.fs" Link="Infrastructure.fs" />
     <Compile Include="EventStore.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Equinox\Equinox.fsproj" />
+    <ProjectReference Include="..\Equinox.Storage\Equinox.Storage.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj
@@ -9,16 +9,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="StoreHelpers.fs" />
+    <Compile Include="..\Equinox.Storage\StoreHelpers.fs" Link="StoreHelpers.fs" />
     <Compile Include="MemoryStore.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Equinox\Equinox.fsproj" />
+    <ProjectReference Include="..\Equinox.Storage\Equinox.Storage.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="2.0.0-alpha.2" PrivateAssets="All" />
 
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />

diff --git a/src/Equinox.Storage/Equinox.Storage.fsproj b/src/Equinox.Storage/Equinox.Storage.fsproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <WarningLevel>5</WarningLevel>
+    <IsTestProject>false</IsTestProject>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+    <DefineConstants Condition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);NET461</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="StoreHelpers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Equinox\Equinox.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="2.0.0-alpha.2" PrivateAssets="All" />
+
+    <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
+    <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
+
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
+    <Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.0'" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Equinox.EventStore/Infrastructure.fs → src/Equinox.Storage/Infrastructure.fs b/src/Equinox.EventStore/Infrastructure.fs → src/Equinox.Storage/Infrastructure.fs
diff --git a/src/Equinox.MemoryStore/StoreHelpers.fs → src/Equinox.Storage/StoreHelpers.fs b/src/Equinox.MemoryStore/StoreHelpers.fs → src/Equinox.Storage/StoreHelpers.fs