Skip to content

Commit ffcb390

Browse files
ky-oneky-one
committed
- Execute other configuration
1 parent 432299f commit ffcb390

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+251
-79
lines changed

‎Angular/KY.Generator.Angular.csproj

+1-1
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>3.0.0</Version>
8+
<Version>3.1.0</Version>
99
<Copyright>2019 - KY-Programming</Copyright>
1010
<Description>Angular Module for KY-Generator
1111
Download KY.Generator.CLI to use this module</Description>

‎AspDotNet/KY.Generator.AspDotNet.csproj

+1-1
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>3.0.0</Version>
7+
<Version>3.1.0</Version>
88
<Product>KY.Generator</Product>
99
<Description>ASP.net Module for KY-Generator
1010
Download KY.Generator.CLI to use this module</Description>

‎CLI.Core.Full/KY.Generator.CLI.Core.Full.csproj

+1-1
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>3.0.0</Version>
6+
<Version>3.1.0</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

‎CLI.Core.Full/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI.Core.Full/nuget.nuspec

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Core.Full</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI.Core.Full</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>
@@ -17,17 +17,17 @@ Generate classes from oData, .NET assembly, JSON or TSQL to C# or TypeScript. Su
1717
<copyright>Copyright 2019</copyright>
1818
<tags>KY-Generator KY Generator .netCore CLI</tags>
1919
<dependencies>
20-
<dependency id="KY.Generator.Angular" version="3.0.0" />
21-
<dependency id="KY.Generator.AspDotNet" version="3.0.0" />
22-
<dependency id="KY.Generator.Core" version="3.0.0" />
23-
<dependency id="KY.Generator.Csharp" version="3.0.0" />
24-
<dependency id="KY.Generator.EntityFramework" version="3.0.0" />
25-
<dependency id="KY.Generator.Json" version="3.0.0" />
26-
<dependency id="KY.Generator.OData" version="3.0.0" />
27-
<dependency id="KY.Generator.OpenApi" version="3.0.0" />
28-
<dependency id="KY.Generator.Reflection" version="3.0.0" />
29-
<dependency id="KY.Generator.Tsql" version="3.0.0" />
30-
<dependency id="KY.Generator.TypeScript" version="3.0.0" />
20+
<dependency id="KY.Generator.Angular" version="3.1.0" />
21+
<dependency id="KY.Generator.AspDotNet" version="3.1.0" />
22+
<dependency id="KY.Generator.Core" version="3.1.0" />
23+
<dependency id="KY.Generator.Csharp" version="3.1.0" />
24+
<dependency id="KY.Generator.EntityFramework" version="3.1.0" />
25+
<dependency id="KY.Generator.Json" version="3.1.0" />
26+
<dependency id="KY.Generator.OData" version="3.1.0" />
27+
<dependency id="KY.Generator.OpenApi" version="3.1.0" />
28+
<dependency id="KY.Generator.Reflection" version="3.1.0" />
29+
<dependency id="KY.Generator.Tsql" version="3.1.0" />
30+
<dependency id="KY.Generator.TypeScript" version="3.1.0" />
3131
</dependencies>
3232
</metadata>
3333
<files>

‎CLI.Core.Full/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.0.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.full\3.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎CLI.Core.Minimal/KY.Generator.CLI.Core.Minimal.csproj

+1-1
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>3.0.0</Version>
6+
<Version>3.1.0</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

‎CLI.Core.Minimal/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Program
77
{
88
static void Main(string[] args)
99
{
10-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
10+
Generator.InitializeLogger(args);
1111

1212
bool success = Generator.Initialize()
1313
.SetParameters(args)

‎CLI.Core.Minimal/nuget.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Core.Minimal</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI.Core.Minimal</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI.Core.Minimal/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.0.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core.minimal\3.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎CLI.Core.Standalone/KY.Generator.CLI.Core.Standalone.csproj

+1-1
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>3.0.0</Version>
6+
<Version>3.1.0</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

‎CLI.Core.Standalone/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI.Core.Standalone/nuget.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Core.Standalone</id>
5-
<version>3.0.0</version>
5+
<version>3.1.0</version>
66
<title>KY.Generator.CLI.Core.Standalone</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI.Core/KY.Generator.CLI.Core.csproj

+1-1
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>3.0.0</Version>
6+
<Version>3.1.0</Version>
77
<Authors>KY-Programming</Authors>
88
<Product>KY.Generator</Product>
99
<Copyright>2019 - KY-Programming</Copyright>

‎CLI.Core/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI.Core/nuget.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Core</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI.Core</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI.Core/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core\3.0.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="dotnet %22%25USERPROFILE%25\.nuget\packages\ky.generator.cli.core\3.1.0\tools\KY.Generator.dll%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎CLI.Full/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI.Full/Properties/AssemblyInfo.cs

+2-2
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("3.0.0")]
36-
[assembly: AssemblyFileVersion("3.0.0.0")]
35+
[assembly: AssemblyVersion("3.1.0")]
36+
[assembly: AssemblyFileVersion("3.1.0.0")]

‎CLI.Full/nuget.nuspec

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Full</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI.Full</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>
@@ -17,17 +17,17 @@ Generate classes from oData, .NET assembly, JSON or TSQL to C# or TypeScript. Su
1717
<copyright>Copyright 2019</copyright>
1818
<tags>KY-Generator KY Generator CLI</tags>
1919
<dependencies>
20-
<dependency id="KY.Generator.Angular" version="3.0.0" />
21-
<dependency id="KY.Generator.AspDotNet" version="3.0.0" />
22-
<dependency id="KY.Generator.Core" version="3.0.0" />
23-
<dependency id="KY.Generator.Csharp" version="3.0.0" />
24-
<dependency id="KY.Generator.EntityFramework" version="3.0.0" />
25-
<dependency id="KY.Generator.Json" version="3.0.0" />
26-
<dependency id="KY.Generator.OData" version="3.0.0" />
27-
<dependency id="KY.Generator.OpenApi" version="3.0.0" />
28-
<dependency id="KY.Generator.Reflection" version="3.0.0" />
29-
<dependency id="KY.Generator.Tsql" version="3.0.0" />
30-
<dependency id="KY.Generator.TypeScript" version="3.0.0" />
20+
<dependency id="KY.Generator.Angular" version="3.1.0" />
21+
<dependency id="KY.Generator.AspDotNet" version="3.1.0" />
22+
<dependency id="KY.Generator.Core" version="3.1.0" />
23+
<dependency id="KY.Generator.Csharp" version="3.1.0" />
24+
<dependency id="KY.Generator.EntityFramework" version="3.1.0" />
25+
<dependency id="KY.Generator.Json" version="3.1.0" />
26+
<dependency id="KY.Generator.OData" version="3.1.0" />
27+
<dependency id="KY.Generator.OpenApi" version="3.1.0" />
28+
<dependency id="KY.Generator.Reflection" version="3.1.0" />
29+
<dependency id="KY.Generator.Tsql" version="3.1.0" />
30+
<dependency id="KY.Generator.TypeScript" version="3.1.0" />
3131
</dependencies>
3232
</metadata>
3333
<files>

‎CLI.Full/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.full.3.0.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.full.3.1.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎CLI.Minimal/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal class Program
77
{
88
private static void Main(string[] args)
99
{
10-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
10+
Generator.InitializeLogger(args);
1111

1212
bool success = Generator.Initialize()
1313
.SetParameters(args)

‎CLI.Minimal/Properties/AssemblyInfo.cs

+2-2
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("3.0.0")]
36-
[assembly: AssemblyFileVersion("3.0.0.0")]
35+
[assembly: AssemblyVersion("3.1.0")]
36+
[assembly: AssemblyFileVersion("3.1.0.0")]

‎CLI.Minimal/nuget.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>KY.Generator.CLI.Minimal</id>
55
<!-- Ensure nuget.targets version is also updated -->
6-
<version>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI.Minimal</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI.Minimal/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.minimal.3.0.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.minimal.3.1.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎CLI.Standalone/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI.Standalone/Properties/AssemblyInfo.cs

+2-2
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("3.0.0")]
36-
[assembly: AssemblyFileVersion("3.0.0.0")]
35+
[assembly: AssemblyVersion("3.1.0")]
36+
[assembly: AssemblyFileVersion("3.1.0.0")]

‎CLI.Standalone/nuget.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>KY.Generator.CLI.Standalone</id>
5-
<version>3.0.0</version>
5+
<version>3.1.0</version>
66
<title>KY.Generator.CLI</title>
77
<authors>KY-Programming</authors>
88
<owners>KY-Programming</owners>

‎CLI/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal class Program
1818
{
1919
private static void Main(string[] args)
2020
{
21-
Logger.AllTargets.Add(Logger.VisualStudioOutput);
21+
Generator.InitializeLogger(args);
2222

2323
bool success = Generator.Initialize()
2424
.PreloadModule<AngularModule>()

‎CLI/Properties/AssemblyInfo.cs

+2-2
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("3.0.0")]
36-
[assembly: AssemblyFileVersion("3.0.0.0")]
35+
[assembly: AssemblyVersion("3.1.0")]
36+
[assembly: AssemblyFileVersion("3.1.0.0")]

‎CLI/nuget.nuspec

+1-1
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>3.0.0</version>
6+
<version>3.1.0</version>
77
<title>KY.Generator.CLI</title>
88
<authors>KY-Programming</authors>
99
<owners>KY-Programming</owners>

‎CLI/nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="KYGeneratorCLITarget" AfterTargets="Build">
4-
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.3.0.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
4+
<Exec Command="%22$(SolutionDir)packages\ky.generator.cli.3.1.0\tools\KY.Generator.exe%22 %22$(ProjectDir)generator.json%22 %22$(ProjectDir)\%22 msbuild"
55
CustomErrorRegularExpression="^Error:"
66
CustomWarningRegularExpression="^Warning:"
77
></Exec>

‎Core/Configurations/ExecuteConfiguration.cs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace KY.Generator.Configurations
2+
{
3+
public class ExecuteConfiguration : ReadConfigurationBase
4+
{
5+
public string File { get; set; }
6+
}
7+
}

‎Core/CoreModule.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public override void Initialize()
3939
.Map<CookieConfiguration, CookieReader>("cookie")
4040
.Map<GeneratorConfiguration, GeneratorGenerator>("generator")
4141
.Map<ModelWriteConfiguration, ModelWriter>("model")
42-
.Map<DemoConfiguration, DemoWriter>("demo");
42+
.Map<DemoConfiguration, DemoWriter>("demo")
43+
.Map<ExecuteConfiguration, ExecuteReader>("generator", "execute");
4344
}
4445
}
4546
}

0 commit comments

Comments
 (0)