Tidy nupkg

jet · Jan 4, 2019 · 5f94a1f · 5f94a1f
1 parent 41691fa
commit 5f94a1f
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 68 deletions.
diff --git a/equinox-web-csharp/.template.config/template.json b/equinox-web-csharp/.template.config/template.json
@@ -2,18 +2,19 @@
   "$schema": "http://json.schemastore.org/template",
   "author": "@jet @bartelink",
   "classifications": [
-    "F#",
+    "C#",
     "Web",
     "Equinox",
     "Event Sourcing"
   ],
   "tags": {
-    "language": "F#"
+    "language": "C#"
   },
-  "identity": "Equinox.Template",
+  "identity": "Equinox.Template.CSharp",
+  "groupIdentity": "Equinox.Web",
   "name": "Equinox Web App",
   "shortName": "equinoxweb",
-  "sourceName": "TodoBackend",
+  "sourceName": "TodoBackendTemplate",
   "preferNameDirectory": true,
 
   "symbols": {
@@ -48,12 +49,6 @@
       "dataType": "bool",
       "defaultValue": "false",
       "description": "Store Events in an Azure CosmosDb Account"
-    },
-    "cosmosSimulator": {
-      "type": "parameter",
-      "dataType": "bool",
-      "defaultValue": "false",
-      "description": "Include code/comments regarding Azure CosmosDb simulator"
     }
   },
   "sources": [
@@ -63,15 +58,15 @@
           "condition": "(!todos)",
           "exclude": [
             "*/Controllers/**/*",
-            "**/TodosService.fs",
-            "**/ClientId.fs",
+            "**/Todo.cs",
+            "**/ClientId.cs",
             "README.md"
           ]
         },
         {
           "condition": "(!aggregate)",
           "exclude": [
-            "**/Aggregate.fs"
+            "**/Aggregate.cs"
           ]
         }
       ]

diff --git a/equinox-web-csharp/Domain/Todo.cs b/equinox-web-csharp/Domain/Todo.cs
@@ -5,11 +5,8 @@
 using Serilog;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data.SqlTypes;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.FSharp.Collections;
 
 namespace TodoBackendTemplate
 {

diff --git a/equinox-web-csharp/Web/CosmosContext.cs b/equinox-web-csharp/Web/CosmosContext.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
 using Equinox;
 using Equinox.Cosmos;
-using Equinox.Store;
 using Equinox.UnionCodec;
 using Microsoft.FSharp.Control;
 using Microsoft.FSharp.Core;
 using Serilog;
+using System;
+using System.Collections.Generic;
 
 namespace TodoBackendTemplate
 {

diff --git a/equinox-web-csharp/Web/EquinoxContext.cs b/equinox-web-csharp/Web/EquinoxContext.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
 using Equinox;
 using Microsoft.FSharp.Core;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using TypeShape;
 
 namespace TodoBackendTemplate

diff --git a/equinox-web-csharp/Web/EventStoreContext.cs b/equinox-web-csharp/Web/EventStoreContext.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
 using Equinox;
 using Equinox.EventStore;
 using Equinox.Store;
 using Equinox.UnionCodec;
 using Microsoft.FSharp.Control;
 using Microsoft.FSharp.Core;
+using System;
+using System.Collections.Generic;
 
 namespace TodoBackendTemplate
 {

diff --git a/equinox-web-csharp/Web/MemoryStoreContext.cs b/equinox-web-csharp/Web/MemoryStoreContext.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
 using Equinox;
 using Equinox.MemoryStore;
 using Equinox.Store;
 using Equinox.UnionCodec;
 using Microsoft.FSharp.Core;
+using System;
+using System.Collections.Generic;
 
 namespace TodoBackendTemplate
 {

diff --git a/equinox-web-csharp/Web/Program.cs b/equinox-web-csharp/Web/Program.cs
@@ -1,8 +1,8 @@
-using System;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Serilog;
 using Serilog.Events;
+using System;
 
 namespace TodoBackendTemplate.Web
 {

diff --git a/equinox-web-csharp/Web/Startup.cs b/equinox-web-csharp/Web/Startup.cs
@@ -147,4 +147,4 @@ public Aggregate.Service CreateAggregateService() =>
 //                    Thing.Folds.compact));
 #endif
     }
-}
+}
diff --git a/equinox-web-csharp/Web/Web.csproj b/equinox-web-csharp/Web/Web.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;memoryStore;todos;aggregate</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP;NETCOREAPP2_1</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/equinox-web-csharp.sln → equinox-web-csharp/equinox-web.sln b/equinox-web-csharp.sln → equinox-web-csharp/equinox-web.sln
@@ -1,33 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Web", "equinox-web-csharp\Web\Web.csproj", "{6C72C937-ECFC-4DD4-9BA0-7355B237F974}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Domain", "equinox-web-csharp\Domain\Domain.csproj", "{E87F1E85-B2CE-436D-9992-702C068DD338}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{518EE7E2-76AF-4DE9-A127-C2DFF709A468}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E87F1E85-B2CE-436D-9992-702C068DD338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E87F1E85-B2CE-436D-9992-702C068DD338}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E87F1E85-B2CE-436D-9992-702C068DD338}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E87F1E85-B2CE-436D-9992-702C068DD338}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2232D6B6-0CA3-4E51-BFD4-DB0A42EF34BF}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Web", "Web\Web.csproj", "{6C72C937-ECFC-4DD4-9BA0-7355B237F974}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Domain", "Domain\Domain.csproj", "{E87F1E85-B2CE-436D-9992-702C068DD338}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{518EE7E2-76AF-4DE9-A127-C2DFF709A468}"
+ProjectSection(SolutionItems) = preProject
+	README.md = README.md
+EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C72C937-ECFC-4DD4-9BA0-7355B237F974}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E87F1E85-B2CE-436D-9992-702C068DD338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E87F1E85-B2CE-436D-9992-702C068DD338}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E87F1E85-B2CE-436D-9992-702C068DD338}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E87F1E85-B2CE-436D-9992-702C068DD338}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2232D6B6-0CA3-4E51-BFD4-DB0A42EF34BF}
+	EndGlobalSection
+EndGlobal
diff --git a/equinox-web/.template.config/template.json b/equinox-web/.template.config/template.json
@@ -11,6 +11,7 @@
     "language": "F#"
   },
   "identity": "Equinox.Template",
+  "groupIdentity": "Equinox.Web",
   "name": "Equinox Web App",
   "shortName": "equinoxweb",
   "sourceName": "TodoBackendTemplate",

diff --git a/equinox-web/Domain/TodosService.fs → equinox-web/Domain/Todo.fs b/equinox-web/Domain/TodosService.fs → equinox-web/Domain/Todo.fs
diff --git a/equinox-web/Web/Web.fsproj b/equinox-web/Web/Web.fsproj
@@ -4,10 +4,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;todos</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Controllers/*.fs" />
     <Compile Include="Startup.fs" />

diff --git a/src/Equinox.Templates/Equinox.Templates.fsproj b/src/Equinox.Templates/Equinox.Templates.fsproj
@@ -7,13 +7,14 @@
     <IsTestProject>false</IsTestProject>
     <PackageType>Template</PackageType>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-  </PropertyGroup>
+ </PropertyGroup>
 
  <ItemGroup>
-    <None Include="../../equinox-web/**/*.*" Exclude="**/bin/**/*;**/obj/**/*;**/.vs/**/*" Pack="true" PackagePath="content" />
-  </ItemGroup>
+    <None Include="../../equinox-*/**/*.*" Exclude="**/bin/**/*;**/obj/**/*;**/.vs/**/*;**/.idea/**/*" Pack="true" PackagePath="content" />
+ </ItemGroup>
 
   <ItemGroup>
       <PackageReference Include="MinVer" Version="1.0.0-beta.2" PrivateAssets="All" />
   </ItemGroup>
+
 </Project>