Skip to content

Commit bedc53e

Browse files
author
jbu
committed
Move MSBuildTask and TSGenerator to Nuget to simplify first compile
1 parent 79aea92 commit bedc53e

File tree

13 files changed

+80
-90
lines changed

13 files changed

+80
-90
lines changed

‎Signum.Analyzer/Signum.Analyzer/Signum.Analyzer.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
<RepositoryUrl>https://github.com/signumsoftware/framework</RepositoryUrl>
1515
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1616
<Description>Signum.Analyzer</Description>
17-
<Copyright>LGPL</Copyright>
17+
<Copyright></Copyright>
1818
<PackageTags>Signum.Analyzer, analyzers</PackageTags>
1919
<NoPackageAnalysis>true</NoPackageAnalysis>
20+
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
2021
</PropertyGroup>
2122

2223
<ItemGroup>

‎Signum.Engine/Signum.Engine.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Signum.Analyzer" Version="1.0.0" />
12+
<PackageReference Include="Signum.MSBuildTask" Version="1.0.0" />
13+
<PackageReference Include="Signum.MSBuildTask" Version="1.0.0" />
1214
</ItemGroup>
1315

1416
<ItemGroup>
@@ -19,12 +21,5 @@
1921
<ProjectReference Include="..\Signum.Entities\Signum.Entities.csproj" />
2022
<ProjectReference Include="..\Signum.Utilities\Signum.Utilities.csproj" />
2123
</ItemGroup>
22-
23-
<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
24-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
25-
<Exec command="dotnet &quot;..\Signum.MSBuildTask\Binaries\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
26-
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
27-
</Exec>
28-
</Target>
29-
24+
3025
</Project>

‎Signum.Entities/Signum.Entities.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Signum.Analyzer" Version="1.0.0" />
12+
<PackageReference Include="Signum.MSBuildTask" Version="1.0.0" />
1213
</ItemGroup>
1314

1415
<ItemGroup>
15-
<ProjectReference Include="..\Signum.MSBuildTask\Signum.MSBuildTask.csproj" />
1616
<ProjectReference Include="..\Signum.Utilities\Signum.Utilities.csproj" />
1717
</ItemGroup>
1818

@@ -21,11 +21,4 @@
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
</None>
2323
</ItemGroup>
24-
25-
<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
26-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
27-
<Exec command="dotnet &quot;..\Signum.MSBuildTask\Binaries\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
28-
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
29-
</Exec>
30-
</Target>
3124
</Project>

‎Signum.MSBuildTask/Signum.MSBuildTask.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
99
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
1010
<LangVersion>latest</LangVersion>
11-
<OutputPath>Binaries\</OutputPath>
1211
<Platforms>x64</Platforms>
12+
<NuSpecFile>Signum.MSBuildTask.nuspec</NuSpecFile>
1313
</PropertyGroup>
1414

15-
<ItemGroup>
15+
<ItemGroup>
1616
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
1717
</ItemGroup>
1818

‎Signum.MSBuildTask/Signum.MSBuildTask.nuspec‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>Signum.MSBuildTask</id>
5+
<version>1.0.0</version>
6+
<title>IL rewriter for Signum Framework applications</title>
7+
<authors>Olmo del Corral</authors>
8+
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
9+
<projectUrl>http://www.signumframework.com</projectUrl>
10+
<iconUrl>http://www.signumsoftware.com/Images/Framework/LogoFramework.png</iconUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>IL Weaver for Signum Framework applications (auto-properties in entities, [AutoInit] and [ExpressionField])</description>
13+
<copyright>Copyright 2018</copyright>
14+
<tags>signum msbuild linq react</tags>
15+
</metadata>
16+
<files>
17+
<file src="bin\**\*.*" target="lib" exclude="bin\**\*.*" />
18+
<file src=".\bin\$configuration$\netcoreapp2.1\*.dll" target="build" />
19+
<file src=".\bin\$configuration$\netcoreapp2.1\*.json" target="build" />
20+
<file src="Signum.MSBuildTask.targets" target="build" />
21+
</files>
22+
</package>

‎Signum.MSBuildTask/Signum.MSBuildTask.sln‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Signum.MSBuildTask/Signum.MSBuildTask.targets‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
3+
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
4+
<Exec command="dotnet &quot;$(MSBuildThisFileDirectory)\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
5+
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
6+
</Exec>
7+
</Target>
8+
</Project>

‎Signum.React/Signum.React.csproj‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="Signum.Analyzer" Version="1.0.0" />
27-
<ProjectReference Include="..\Signum.TSGenerator\Signum.TSGenerator.csproj" />
27+
<PackageReference Include="Signum.TSGenerator" Version="1.0.0" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
@@ -41,21 +41,5 @@
4141
<TypeScriptCompile Include="**\*.tsx" />
4242
<TypeScriptCompile Include="**\*.ts" />
4343
</ItemGroup>
44-
45-
<Target Name="GenerateSignumTS">
46-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
47-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumContent.txt" Lines="@(Content);@(None)" Overwrite="true" Encoding="Unicode" />
48-
<Exec command="dotnet &quot;..\Signum.TSGenerator\Binaries\netcoreapp2.1\Signum.TSGenerator.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot; &quot;$(BaseIntermediateOutputPath)SignumContent.txt&quot;" ConsoleToMSBuild="false">
49-
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
50-
</Exec>
51-
</Target>
52-
53-
<PropertyGroup>
54-
<CompileTypeScriptDependsOn>
55-
GenerateSignumTS;
56-
$(CompileTypeScriptDependsOn);
57-
</CompileTypeScriptDependsOn>
58-
<ApplicationIcon />
59-
</PropertyGroup>
60-
44+
6145
</Project>

‎Signum.TSGenerator/Signum.TSGenerator.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<OutputType>Exe</OutputType>
77
<StartupObject>Signum.TSGenerator.Program</StartupObject>
88
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
9-
<OutputPath>Binaries\</OutputPath>
109
<LangVersion>latest</LangVersion>
1110
<Platforms>x64</Platforms>
1211
</PropertyGroup>

‎Signum.TSGenerator/Signum.TSGenerator.nuspec‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<title>Typescript generator for Signum Framework applications</title>
7+
<authors>Olmo del Corral</authors>
8+
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
9+
<projectUrl>http://www.signumframework.com</projectUrl>
10+
<iconUrl>http://www.signumsoftware.com/Images/Framework/LogoFramework.png</iconUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>For every SomeEntitiesNamespace.t4s files in your React project generates a SomeEntitiesNamespace.ts with defined Entities, Queries, Messages, Operations, etc..</description>
13+
<copyright>Copyright 2018</copyright>
14+
<tags>signum msbuild linq react</tags>
15+
</metadata>
16+
<files>
17+
<file src="bin\**\*.*" target="lib" exclude="bin\**\*.*" />
18+
<file src=".\bin\$configuration$\netcoreapp2.1\*.dll" target="build" />
19+
<file src=".\bin\$configuration$\netcoreapp2.1\*.json" target="build" />
20+
<file src="Signum.TSGenerator.targets" target="build" />
21+
</files>
22+
</package>

0 commit comments

Comments
 (0)