Skip to content

Commit 4641b11

Browse files
kai-melchiorkai-melchior
committed
Allow generator to run under Linux or OSX
1 parent cf360f4 commit 4641b11

22 files changed

+67
-42
lines changed

‎Angular/KY.Generator.Angular.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>KY-Programming</Authors>
66
<Company>KY-Programming</Company>
77
<Product>KY.Generator</Product>
8-
<Version>4.0.0</Version>
8+
<Version>4.1.0</Version>
99
<Copyright>2020 - KY-Programming</Copyright>
1010
<Description>Angular Module for KY-Generator
1111
Download KY.Generator to use this module</Description>

‎AspDotNet/KY.Generator.AspDotNet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Company>KY-Programming</Company>
66
<Authors>KY-Programming</Authors>
7-
<Version>4.0.0</Version>
7+
<Version>4.1.0</Version>
88
<Product>KY.Generator</Product>
99
<Description>ASP.net Module for KY-Generator
1010
Download KY.Generator to use this module</Description>

‎CLI.Core/KY.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.2</TargetFramework>
6-
<Version>4.0.0</Version>
6+
<Version>4.1.0</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2020 - KY-Programming</Copyright>

‎CLI.Core/nuget.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>4.0.0</version>
6+
<version>4.1.0</version>
77
<title>KY.Generator</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI.Core/nuget.targets‎

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,52 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
23
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Target Name="KYGeneratorCLICoreBeforeTarget" BeforeTargets="BeforeBuild">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.0.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 msbuild beforeBuild"
4+
<Target Name="KYGeneratorBeforeTarget" BeforeTargets="BeforeBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
5+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 -plattform=%22windows%22 msbuild beforeBuild"
6+
CustomErrorRegularExpression="^Error:"
7+
CustomWarningRegularExpression="^Warning:">
8+
</Exec>
9+
</Target>
10+
<Target Name="KYGeneratorAfterTarget" AfterTargets="AfterBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
11+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 -plattform=%22windows%22 msbuild"
12+
CustomErrorRegularExpression="^Error:"
13+
CustomWarningRegularExpression="^Warning:">
14+
</Exec>
15+
</Target>
16+
<Target Name="KYGeneratorBeforeTarget" BeforeTargets="BeforeBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
17+
<Exec Command="dotnet %22~/.nuget/packages/ky.generator/4.1.0/tools/KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)%22 -assembly=%22$(TargetPath)%22 -plattform=%22osx%22 msbuild beforeBuild"
18+
CustomErrorRegularExpression="^Error:"
19+
CustomWarningRegularExpression="^Warning:">
20+
</Exec>
21+
</Target>
22+
<Target Name="KYGeneratorAfterTarget" AfterTargets="AfterBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
23+
<Exec Command="dotnet %22~/.nuget/packages/ky.generator/4.1.0/tools/KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)%22 -assembly=%22$(TargetPath)%22 -plattform=%22osx%22 msbuild"
24+
CustomErrorRegularExpression="^Error:"
25+
CustomWarningRegularExpression="^Warning:">
26+
</Exec>
27+
</Target>
28+
<Target Name="KYGeneratorBeforeTarget" BeforeTargets="BeforeBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
29+
<Exec Command="dotnet %22~/.nuget/packages/ky.generator/4.1.0/tools/KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)%22 -assembly=%22$(TargetPath)%22 -plattform=%22linux%22 msbuild beforeBuild"
30+
CustomErrorRegularExpression="^Error:"
31+
CustomWarningRegularExpression="^Warning:">
32+
</Exec>
33+
</Target>
34+
<Target Name="KYGeneratorAfterTarget" AfterTargets="AfterBuild" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
35+
<Exec Command="dotnet %22~/.nuget/packages/ky.generator/4.1.0/tools/KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir\%22 -assembly=%22$(TargetPath)%22 -plattform=%22linux%22 msbuild"
36+
CustomErrorRegularExpression="^Error:"
37+
CustomWarningRegularExpression="^Warning:">
38+
</Exec>
39+
</Target>
40+
<Target Name="KYGeneratorBeforeTarget" BeforeTargets="BeforeBuild">
41+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 -plattform=%22windows2%22 msbuild beforeBuild"
542
CustomErrorRegularExpression="^Error:"
6-
CustomWarningRegularExpression="^Warning:"></Exec>
43+
CustomWarningRegularExpression="^Warning:">
44+
</Exec>
745
</Target>
8-
<Target Name="KYGeneratorCLICoreAfterTarget" AfterTargets="AfterBuild">
9-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.0.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 msbuild"
46+
<Target Name="KYGeneratorAfterTarget" AfterTargets="AfterBuild">
47+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator\4.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 -output=%22$(ProjectDir)\%22 -assembly=%22$(TargetPath)%22 -plattform=%22windows2%22 msbuild"
1048
CustomErrorRegularExpression="^Error:"
11-
CustomWarningRegularExpression="^Warning:"></Exec>
49+
CustomWarningRegularExpression="^Warning:">
50+
</Exec>
1251
</Target>
1352
</Project>

‎CLI/KY.Generator.CLI.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<ItemGroup>
6363
<None Include="App.config" />
6464
<None Include="nuget.nuspec" />
65-
<None Include="nuget.targets" />
6665
<None Include="packages.config" />
6766
</ItemGroup>
6867
<ItemGroup>

‎CLI/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.0.0")]
36-
[assembly: AssemblyFileVersion("4.0.0.0")]
35+
[assembly: AssemblyVersion("4.1.0")]
36+
[assembly: AssemblyFileVersion("4.1.0.0")]

‎CLI/nuget.nuspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>4.0.0</version>
6+
<version>4.1.0</version>
77
<title>KY.Generator.CLI</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>
@@ -22,6 +22,5 @@ Support for Angular, ASP.NET, ASP.NET Core, C# POCOs, TypeScript POCOs, Entity F
2222
<files>
2323
<file src="bin\Release\*.exe" target="tools" />
2424
<file src="bin\Release\*.dll" target="tools" />
25-
<file src="nuget.targets" target="build\KY.Generator.CLI.targets" />
2625
</files>
2726
</package>

‎CLI/nuget.targets‎

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

‎Core/KY.Generator.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Company>KY-Programming</Company>
66
<Authors>KY-Programming</Authors>
77
<Product>KY.Generator</Product>
8-
<Version>4.0.0</Version>
8+
<Version>4.1.0</Version>
99
<Description>Core elements for KY-Generator
1010
Download KY.Generator to use this module</Description>
1111
<Copyright>2020 - KY-Programming</Copyright>

0 commit comments

Comments
 (0)