From c451f46d00904407129e928984492f787b8c627f Mon Sep 17 00:00:00 2001
From: Olmo del Corral <olmo@signumsoftware.com>
Date: Sat, 1 Dec 2018 08:40:58 +0100
Subject: [PATCH] update Framework and Extensions, remove Tooling and use
 Signum.TSGenerator and Signum.MSBuildTask as Nuget

---
 Extensions                                    |  2 +-
 Framework                                     |  2 +-
 Southwind.Entities/Southwind.Entities.csproj  | 12 +++---------
 Southwind.Load/Southwind.Load.csproj          | 10 ++--------
 Southwind.Logic/Southwind.Logic.csproj        | 10 ++--------
 Southwind.React/Southwind.React.csproj        | 19 ++-----------------
 .../Southwind.Test.Environment.csproj         |  2 +-
 .../Southwind.Test.Logic.csproj               |  2 +-
 .../Southwind.Test.React.csproj               |  2 +-
 Southwind.sln                                 | 16 ----------------
 10 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/Extensions b/Extensions
index 68240221..385be5cc 160000
--- a/Extensions
+++ b/Extensions
@@ -1 +1 @@
-Subproject commit 6824022154dfd2049faac5ff2ff8c2f8a3fc3fdd
+Subproject commit 385be5ccb5f15dec8f504165032dbe6b05ae53f6
diff --git a/Framework b/Framework
index 9d538260..5349daae 160000
--- a/Framework
+++ b/Framework
@@ -1 +1 @@
-Subproject commit 9d5382607e25ef73632c109ab31a21af6a81fa3f
+Subproject commit 5349daae18d2bad028aa3634546da11446cca5ec
diff --git a/Southwind.Entities/Southwind.Entities.csproj b/Southwind.Entities/Southwind.Entities.csproj
index f70d534c..7ccb0bb2 100644
--- a/Southwind.Entities/Southwind.Entities.csproj
+++ b/Southwind.Entities/Southwind.Entities.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
+    <PackageReference Include="Signum.MSBuildTask" Version="1.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,11 +23,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
-  <Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
-    <Exec command="dotnet &quot;..\Framework\Signum.MSBuildTask\Binaries\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
-      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>
-  </Target>
 </Project>
diff --git a/Southwind.Load/Southwind.Load.csproj b/Southwind.Load/Southwind.Load.csproj
index 849bc970..bab94abc 100644
--- a/Southwind.Load/Southwind.Load.csproj
+++ b/Southwind.Load/Southwind.Load.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -42,6 +42,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
+    <PackageReference Include="Signum.MSBuildTask" Version="1.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -71,11 +72,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
-  <Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
-    <Exec command="dotnet &quot;..\Framework\Signum.MSBuildTask\Binaries\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
-      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>
-  </Target>
 </Project>
diff --git a/Southwind.Logic/Southwind.Logic.csproj b/Southwind.Logic/Southwind.Logic.csproj
index a3e821b6..86316950 100644
--- a/Southwind.Logic/Southwind.Logic.csproj
+++ b/Southwind.Logic/Southwind.Logic.csproj
@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
+    <PackageReference Include="Signum.MSBuildTask" Version="1.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -20,11 +21,4 @@
     <ProjectReference Include="..\Framework\Signum.Utilities\Signum.Utilities.csproj" />
     <ProjectReference Include="..\Southwind.Entities\Southwind.Entities.csproj" />
   </ItemGroup>
-
-  <Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
-    <Exec command="dotnet &quot;..\Framework\Signum.MSBuildTask\Binaries\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
-      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>
-  </Target>
 </Project>
diff --git a/Southwind.React/Southwind.React.csproj b/Southwind.React/Southwind.React.csproj
index 8ba7263c..19b3d23a 100644
--- a/Southwind.React/Southwind.React.csproj
+++ b/Southwind.React/Southwind.React.csproj
@@ -44,11 +44,12 @@
   <ItemGroup>
     <PackageReference Include="CNTK.CPUOnly" Version="2.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Signum.TSGenerator" Version="1.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
@@ -64,22 +65,6 @@
     <ProjectReference Include="..\Southwind.Logic\Southwind.Logic.csproj" />
   </ItemGroup>
 
-  <Target Name="GenerateSignumTS">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumContent.txt" Lines="@(Content);@(None)" Overwrite="true" Encoding="Unicode" />
-    <Exec command="dotnet &quot;..\Framework\Signum.TSGenerator\Binaries\netcoreapp2.1\Signum.TSGenerator.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot; &quot;$(BaseIntermediateOutputPath)SignumContent.txt&quot;" ConsoleToMSBuild="false">
-      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>
-  </Target>
-
-  <PropertyGroup>
-    <CompileTypeScriptDependsOn>
-      GenerateSignumTS;
-      $(CompileTypeScriptDependsOn);
-    </CompileTypeScriptDependsOn>
-  </PropertyGroup>
-
-
   <Target Name="PublishCollectDist" AfterTargets="ComputeFilesToPublish">
     <!-- Include the newly-built files in the publish output -->
     <ItemGroup>
diff --git a/Southwind.Test.Environment/Southwind.Test.Environment.csproj b/Southwind.Test.Environment/Southwind.Test.Environment.csproj
index 1ccad521..29f9efbf 100644
--- a/Southwind.Test.Environment/Southwind.Test.Environment.csproj
+++ b/Southwind.Test.Environment/Southwind.Test.Environment.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Southwind.Test.Logic/Southwind.Test.Logic.csproj b/Southwind.Test.Logic/Southwind.Test.Logic.csproj
index 77405647..89438456 100644
--- a/Southwind.Test.Logic/Southwind.Test.Logic.csproj
+++ b/Southwind.Test.Logic/Southwind.Test.Logic.csproj
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Southwind.Test.React/Southwind.Test.React.csproj b/Southwind.Test.React/Southwind.Test.React.csproj
index 1cde3259..1d1f42ce 100644
--- a/Southwind.Test.React/Southwind.Test.React.csproj
+++ b/Southwind.Test.React/Southwind.Test.React.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="1.0.0" />
+    <PackageReference Include="Signum.Analyzer" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Southwind.sln b/Southwind.sln
index 0927bef5..fe8816c1 100644
--- a/Southwind.sln
+++ b/Southwind.sln
@@ -39,12 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{57685A51-6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Southwind.Test.Logic", "Southwind.Test.Logic\Southwind.Test.Logic.csproj", "{53EA9614-840B-40C6-9C0B-035705475C66}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.TSGenerator", "Framework\Signum.TSGenerator\Signum.TSGenerator.csproj", "{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.MSBuildTask", "Framework\Signum.MSBuildTask\Signum.MSBuildTask.csproj", "{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Tooling", "0.Tooling", "{556D90B5-CDFF-4358-9FFA-65F92E9E02BD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Southwind.Test.React", "Southwind.Test.React\Southwind.Test.React.csproj", "{8118420A-2FEB-47D7-8EE1-32B8E94B1FEF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signum.React.Extensions.Selenium", "Extensions\Signum.React.Extensions.Selenium\Signum.React.Extensions.Selenium.csproj", "{B80F1384-E5B6-463C-8316-28E847DFB8C8}"
@@ -115,14 +109,6 @@ Global
 		{53EA9614-840B-40C6-9C0B-035705475C66}.Debug|x64.Build.0 = Debug|x64
 		{53EA9614-840B-40C6-9C0B-035705475C66}.Release|x64.ActiveCfg = Release|x64
 		{53EA9614-840B-40C6-9C0B-035705475C66}.Release|x64.Build.0 = Release|x64
-		{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60}.Debug|x64.ActiveCfg = Debug|x64
-		{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60}.Debug|x64.Build.0 = Debug|x64
-		{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60}.Release|x64.ActiveCfg = Release|x64
-		{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60}.Release|x64.Build.0 = Release|x64
-		{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA}.Debug|x64.ActiveCfg = Debug|x64
-		{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA}.Debug|x64.Build.0 = Debug|x64
-		{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA}.Release|x64.ActiveCfg = Release|x64
-		{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA}.Release|x64.Build.0 = Release|x64
 		{8118420A-2FEB-47D7-8EE1-32B8E94B1FEF}.Debug|x64.ActiveCfg = Debug|x64
 		{8118420A-2FEB-47D7-8EE1-32B8E94B1FEF}.Debug|x64.Build.0 = Debug|x64
 		{8118420A-2FEB-47D7-8EE1-32B8E94B1FEF}.Release|x64.ActiveCfg = Release|x64
@@ -147,8 +133,6 @@ Global
 		{4B17650F-0340-4CA0-A983-A2ECB8AC2629} = {8BE6A286-E197-4F84-AE56-58E37CBEEEB5}
 		{A6014F4A-A27F-4B48-804C-F4664082EF01} = {57685A51-6D20-4D5B-865A-F78AC5F5B148}
 		{53EA9614-840B-40C6-9C0B-035705475C66} = {57685A51-6D20-4D5B-865A-F78AC5F5B148}
-		{86737ADE-0A6C-4DD9-8A24-7F1770DB6F60} = {556D90B5-CDFF-4358-9FFA-65F92E9E02BD}
-		{22E9F143-7C75-45B9-B75E-BBE7A22DC4FA} = {556D90B5-CDFF-4358-9FFA-65F92E9E02BD}
 		{8118420A-2FEB-47D7-8EE1-32B8E94B1FEF} = {57685A51-6D20-4D5B-865A-F78AC5F5B148}
 		{B80F1384-E5B6-463C-8316-28E847DFB8C8} = {8BE6A286-E197-4F84-AE56-58E37CBEEEB5}
 	EndGlobalSection