Merge branch 'master' of https://shdebonvtfs1.bechtle.net/DefaultColl…

…ection/Spitzlei/_git/Framework
signumsoftware · Feb 13, 2020 · df215a2 · df215a2
2 parents ac650a2 + e3c1db5
commit df215a2
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 28 deletions.
diff --git a/Signum.Engine/Signum.Engine.csproj b/Signum.Engine/Signum.Engine.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Npgsql" Version="4.1.3" />
     <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
-    <PackageReference Include="Signum.MSBuildTask" Version="1.1.4" />
+    <PackageReference Include="Signum.MSBuildTask" Version="2.0.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.0" />
   </ItemGroup>
 

diff --git a/Signum.Entities/Signum.Entities.csproj b/Signum.Entities/Signum.Entities.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -12,20 +12,13 @@
   <ItemGroup>
     <PackageReference Include="Npgsql" Version="4.1.3" />
     <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
-    <PackageReference Include="Signum.MSBuildTask" Version="1.1.4" />
+    <PackageReference Include="Signum.MSBuildTask" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Signum.Utilities\Signum.Utilities.csproj" />
   </ItemGroup>
-
-  <!--<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
-    <Exec command="dotnet &quot;C:\Users\Olmo\.nuget\packages\signum.msbuildtask\1.1.2\build\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
-      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>
-  </Target>-->
-
+
   <ItemGroup>
     <None Update="Translations\*.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Signum.MSBuildTask/Signum.MSBuildTask.csproj b/Signum.MSBuildTask/Signum.MSBuildTask.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <StartupObject>Signum.MSBuildTask.Program</StartupObject>
@@ -10,7 +10,7 @@
     <LangVersion>latest</LangVersion>
     <Platforms>x64;AnyCPU</Platforms>
     <NuSpecFile>Signum.MSBuildTask.nuspec</NuSpecFile>
-    <Version>1.1.4</Version>
+    <Version>2.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Signum.MSBuildTask/Signum.MSBuildTask.nuspec b/Signum.MSBuildTask/Signum.MSBuildTask.nuspec
@@ -2,21 +2,23 @@
 <package >
   <metadata>
     <id>Signum.MSBuildTask</id>
-    <version>1.1.4</version>
+    <version>2.0.0</version>
     <title>IL rewriter for Signum Framework applications</title>
     <authors>Olmo del Corral</authors>
-	<license type="expression">MIT</license>
     <projectUrl>http://www.signumframework.com</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/signumsoftware/framework/master/SignumLogo.png</iconUrl>
+    <icon>SignumLogo.png</icon>
+    <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>IL rewriter for Signum Framework applications (auto-properties in entities, [AutoInit] and [ExpressionField])</description>
-    <copyright>Copyright 2018</copyright>
+    <copyright>Copyright 2020</copyright>
     <tags>signum msbuild linq react</tags>
   </metadata>
   <files>
+    <file src="SignumLogo.png" target="" />
     <file src="bin\**\*.*" target="lib" exclude="bin\**\*.*" />
-    <file src=".\bin\$configuration$\netcoreapp2.1\*.dll" target="build" />
-    <file src=".\bin\$configuration$\netcoreapp2.1\*.json" target="build" />
+    <file src="bin\Release\netcoreapp3.1\*.dll" target="build" />
+    <file src="bin\Release\netcoreapp3.1\*.json" target="build" />
     <file src="Signum.MSBuildTask.targets" target="build" />
   </files>
 </package>
diff --git a/Signum.MSBuildTask/SignumLogo.png b/Signum.MSBuildTask/SignumLogo.png
diff --git a/Signum.React/Signum.React.csproj b/Signum.React/Signum.React.csproj
@@ -46,7 +46,7 @@
     <PackageReference Include="Npgsql" Version="4.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
-    <PackageReference Include="Signum.TSGenerator" Version="2.3.0" />
+    <PackageReference Include="Signum.TSGenerator" Version="3.0.0" />
   </ItemGroup>
 
 

diff --git a/Signum.TSGenerator/Signum.TSGenerator.csproj b/Signum.TSGenerator/Signum.TSGenerator.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <StartupObject>Signum.TSGenerator.Program</StartupObject>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>latest</LangVersion>
     <Platforms>x64;AnyCPU</Platforms>
-    <Version>2.3.0</Version>
+    <NuSpecFile>Signum.TSGenerator.nuspec</NuSpecFile>
+    <Version>3.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Signum.TSGenerator/Signum.TSGenerator.nuspec b/Signum.TSGenerator/Signum.TSGenerator.nuspec
@@ -2,21 +2,23 @@
 <package >
   <metadata>
     <id>Signum.TSGenerator</id>
-    <version>2.3.0</version>
+    <version>3.0.0</version>
     <title>TypeScript generator for Signum Framework applications</title>
     <authors>Olmo del Corral</authors>
     <license type="expression">MIT</license>
     <projectUrl>http://www.signumframework.com</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/signumsoftware/framework/master/SignumLogo.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/signumsoftware/framework/master/SignumLogo.png</iconUrl>
+    <icon>SignumLogo.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>For every file 'SomeEntitiesNamespace.t4s' in your React project generates a 'SomeEntitiesNamespace.ts' with the Entities, Queries, Messages, Operations, etc..</description>
-    <copyright>Copyright 2019</copyright>
+    <copyright>Copyright 2020</copyright>
     <tags>signum msbuild typescript csharp linq react</tags>
   </metadata>
   <files>
+    <file src="SignumLogo.png" target="" />
     <file src="bin\**\*.*" target="lib" exclude="bin\**\*.*" />
-    <file src=".\bin\$configuration$\netcoreapp2.1\*.dll" target="build" />
-    <file src=".\bin\$configuration$\netcoreapp2.1\*.json" target="build" />
+    <file src="bin\Release\netcoreapp3.1\*.dll" target="build" />
+    <file src="bin\Release\netcoreapp3.1\*.json" target="build" />
     <file src="Signum.TSGenerator.targets" target="build" />
   </files>
 </package>
diff --git a/Signum.TSGenerator/SignumLogo.png b/Signum.TSGenerator/SignumLogo.png
diff --git a/Signum.Test/Signum.Test.csproj b/Signum.Test/Signum.Test.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.MSBuildTask" Version="1.1.4" />
+    <PackageReference Include="Signum.MSBuildTask" Version="2.0.0" />
 
   </ItemGroup>