Skip to content

Commit f49e542

Browse files
committed
Standalone added
Tsql small bugfixes
1 parent e0eca16 commit f49e542

20 files changed

+273
-171
lines changed

AspDotNet/KY.Generator.AspDotNet.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<copyright>Copyright 2018</copyright>
1616
<tags>KY Generator ASP.net</tags>
1717
<dependencies>
18-
<dependency id="KY.Core.Common" version="3.5.0.1468" />
19-
<dependency id="KY.Generator.Core" version="0.7.0.1468" />
20-
<dependency id="KY.Generator.Csharp" version="0.7.0.1468" />
18+
<dependency id="KY.Core.Common" version="3.5.1480" />
19+
<dependency id="KY.Generator.Core" version="0.7.1480" />
20+
<dependency id="KY.Generator.Csharp" version="0.7.1480" />
2121
</dependencies>
2222
</metadata>
2323
</package>

AspDotNet/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
// You can specify all the values or you can default the Build and Revision Numbers
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.0.*")]
33-
[assembly: AssemblyVersion("0.7.0.1475")]
33+
[assembly: AssemblyVersion("0.7.1481")]
3434
[assembly: AssemblyFileVersion("0.7.0.0")]

Console/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
55
</startup>
6-
</configuration>
6+
</configuration>

Console/Configuration.xml

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

Console/KY.Generator.Console.csproj

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@
5858
</ItemGroup>
5959
<ItemGroup>
6060
<None Include="App.config" />
61-
<None Include="Object.json">
62-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63-
</None>
61+
<None Include="KY.Generator.Console.nuspec" />
6462
<None Include="packages.config" />
6563
</ItemGroup>
66-
<ItemGroup>
67-
<None Include="FodyWeavers.xml" />
68-
</ItemGroup>
6964
<ItemGroup>
7065
<ProjectReference Include="..\AspDotNet\KY.Generator.AspDotNet.csproj">
7166
<Project>{8c4bff64-ca84-4448-8bb5-738fd8c6c39b}</Project>
@@ -100,19 +95,10 @@
10095
<Name>KY.Generator.TypeScript</Name>
10196
</ProjectReference>
10297
</ItemGroup>
103-
<ItemGroup>
104-
<None Include="Configuration.xml">
105-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
106-
</None>
107-
</ItemGroup>
10898
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109-
<Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" />
11099
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
111100
<PropertyGroup>
112101
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
113102
</PropertyGroup>
114-
<Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" />
115-
<Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" />
116103
</Target>
117-
<Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" />
118104
</Project>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<title>$title$</title>
7+
<authors>$author$</authors>
8+
<owners>$author$</owners>
9+
<licenseUrl>https://github.com/KY-Programming/generator/blob/master/LICENSE</licenseUrl>
10+
<projectUrl>https://github.com/KY-Programming/generator</projectUrl>
11+
<iconUrl>https://ky-programming.de/images/logos/128.png</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>$description$</description>
14+
<releaseNotes></releaseNotes>
15+
<copyright>Copyright 2018</copyright>
16+
<tags>KY Generator</tags>
17+
</metadata>
18+
</package>

Console/Object.json

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

Console/Program.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using KY.Core;
44
using KY.Generator.AspDotNet;
55
using KY.Generator.Csharp;
6-
using KY.Generator.Json;
76
using KY.Generator.OData;
87
using KY.Generator.OData.Extensions;
98
using KY.Generator.Reflection;
@@ -26,7 +25,6 @@ private static void Main(string[] args)
2625
.PreloadModule<TsqlModule>()
2726
.PreloadModule<ODataModule>()
2827
.PreloadModule<ReflectionModule>()
29-
.PreloadModule<JsonModule>()
3028
.SetOutput(args.Skip(1).FirstOrDefault())
3129
//.OData(x => x.SetGenerator<ODataGenerator>())
3230
//.Tsql(x => x.SetGenerator(new TsqlGenerator())

Console/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("KY.Generator")]
9-
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyDescription("KY.Generator executable containing all features")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyProduct("KY.Generator")]
1212
[assembly: AssemblyTrademark("")]
@@ -30,5 +30,5 @@
3030
// You can specify all the values or you can default the Build and Revision Numbers
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.0.*")]
33-
[assembly: AssemblyVersion("0.7.0.1475")]
33+
[assembly: AssemblyVersion("0.7.1481")]
3434
[assembly: AssemblyFileVersion("0.7.0.0")]

KY.Generator.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KY.Generator.Reflection", "
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KY.Generator.Json", "Json\KY.Generator.Json.csproj", "{7F14808D-CEDC-4A7D-BC53-DA21EEDCDE1E}"
2323
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KY.Generator.Standalone", "Standalone\KY.Generator.Standalone.csproj", "{5E5D3B21-903B-4108-B3AF-3967C5D33219}"
25+
EndProject
2426
Global
2527
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2628
Debug|Any CPU = Debug|Any CPU
@@ -63,6 +65,10 @@ Global
6365
{7F14808D-CEDC-4A7D-BC53-DA21EEDCDE1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
6466
{7F14808D-CEDC-4A7D-BC53-DA21EEDCDE1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
6567
{7F14808D-CEDC-4A7D-BC53-DA21EEDCDE1E}.Release|Any CPU.Build.0 = Release|Any CPU
68+
{5E5D3B21-903B-4108-B3AF-3967C5D33219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69+
{5E5D3B21-903B-4108-B3AF-3967C5D33219}.Debug|Any CPU.Build.0 = Debug|Any CPU
70+
{5E5D3B21-903B-4108-B3AF-3967C5D33219}.Release|Any CPU.ActiveCfg = Release|Any CPU
71+
{5E5D3B21-903B-4108-B3AF-3967C5D33219}.Release|Any CPU.Build.0 = Release|Any CPU
6672
EndGlobalSection
6773
GlobalSection(SolutionProperties) = preSolution
6874
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)