Skip to content

Commit f16cc9b

Browse files
committed
Tests and examples updated
1 parent 8e61be7 commit f16cc9b

File tree

29 files changed

+79
-56
lines changed

29 files changed

+79
-56
lines changed

Examples/Angular/Annotation/ModelFromAssembly/ModelFromAssembly.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Angular/Annotation/ServiceFromAspNetCore/ServiceFromAspNetCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="KY.Generator" Version="7.1.0" />
18-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
17+
<PackageReference Include="KY.Generator" Version="7.2.0" />
18+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1919
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.7" />
2020
</ItemGroup>
2121

Examples/Angular/Annotation/ServiceFromAspNetCoreSignalRHub/ServiceFromAspNetCoreSignalRHub.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="KY.Generator" Version="7.1.0" />
18-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
17+
<PackageReference Include="KY.Generator" Version="7.2.0" />
18+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1919
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.7" />
2121
</ItemGroup>

Examples/Angular/Fluent/ServiceFromAspNetCore/Generator/Generator.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="KY.Generator.Angular" Version="7.1.0" />
13-
<PackageReference Include="KY.Generator.AspDotNet" Version="7.1.0" />
14-
<PackageReference Include="KY.Generator.Fluent" Version="7.1.0" />
12+
<PackageReference Include="KY.Generator.Angular" Version="7.2.0" />
13+
<PackageReference Include="KY.Generator.AspDotNet" Version="7.2.0" />
14+
<PackageReference Include="KY.Generator.Fluent" Version="7.2.0" />
1515
</ItemGroup>
1616

1717
</Project>

Examples/Angular/Fluent/ServiceFromSignalR/Generator/Generator.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="KY.Generator.Angular" Version="7.1.0" />
9-
<PackageReference Include="KY.Generator.AspDotNet" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Fluent" Version="7.1.0" />
8+
<PackageReference Include="KY.Generator.Angular" Version="7.2.0" />
9+
<PackageReference Include="KY.Generator.AspDotNet" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Fluent" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

Examples/Json/JsonWithReader/JsonWithReader.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator.Angular" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Fluent" Version="7.1.0" />
12-
<PackageReference Include="KY.Generator.Json" Version="7.1.0" />
10+
<PackageReference Include="KY.Generator.Angular" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Fluent" Version="7.2.0" />
12+
<PackageReference Include="KY.Generator.Json" Version="7.2.0" />
1313
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
1414
</ItemGroup>
1515

Examples/Reflection/ReflectionFromAttributes/ReflectionFromAttributes.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Reflection/ReflectionFromConstant/ReflectionFromConstant.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Reflection/ReflectionFromCore/ReflectionFromCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator" Version="7.2.0-preview.0" />
11-
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0-preview.0" />
10+
<PackageReference Include="KY.Generator" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1212
</ItemGroup>
1313

1414
</Project>

Examples/Reflection/ReflectionFromIndex/ReflectionFromIndex.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

Examples/Reflection/ReflectionFromMultipleAssemblies/MainAssembly/MainAssembly.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

Examples/Reflection/ReflectionFromNet5/ReflectionFromNet5.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Reflection/ReflectionFromStandard/ReflectionFromStandard.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Reflection/ReflectionIgnoreAttribute/ReflectionIgnoreAttribute.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Examples/Reflection/ReflectionX86/ReflectionX86.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
10+
<PackageReference Include="KY.Generator" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1212
</ItemGroup>
1313

1414
</Project>

Examples/Sqlite/FromDatabase/FromDatabase.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator.Fluent" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Sqlite" Version="7.1.0" />
10+
<PackageReference Include="KY.Generator.Fluent" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Sqlite" Version="7.2.0" />
1212
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.7" />
1313
</ItemGroup>
1414

Examples/Sqlite/ToDatabase/ToDatabase.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<ItemGroup>
1010
<PackageReference Include="KY.Core.Common" Version="4.20.1" />
11-
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0-preview.0" />
11+
<PackageReference Include="KY.Generator" Version="7.2.0" />
12+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1213
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.7" />
1314
</ItemGroup>
1415

Tests/AnnotationAsync/AnnotationAsync.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
10+
<PackageReference Include="KY.Generator" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

Tests/AnnotationAsyncAssembly/AnnotationAsyncAssembly.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Tests/AnnotationInNestedClass/AnnotationInNestedClass.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Tests/AnnotationsWithMultipleOutputs/AnnotationsWithMultipleOutputs.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Tests/Fluent/Fluent.Generator/Fluent.Generator.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Angular" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Fluent" Version="7.1.0" />
12-
<PackageReference Include="KY.Generator.Reflection" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Angular" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Fluent" Version="7.2.0" />
12+
<PackageReference Include="KY.Generator.Reflection" Version="7.2.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

Tests/ReflectionLoadFromNugetPackageNet5/ReflectionLoadFromNugetPackageNet5.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
<PackageReference Include="System.Reactive" Version="5.0.0" />
1212
</ItemGroup>
1313

Tests/Sqlite/Sqlite.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="KY.Generator" Version="7.1.0" />
11-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
10+
<PackageReference Include="KY.Generator" Version="7.2.0" />
11+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1212
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.7" />
1313
</ItemGroup>
1414

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* eslint-disable */
2+
// tslint:disable
3+
4+
export class GenericSubType<TOne, TTwo> {
5+
public single: TOne;
6+
public single2: string;
7+
public enumerable: TOne[];
8+
public list: TTwo[];
9+
}
10+
11+
// outputid:605e91d7-ee13-4f1d-9b92-845bb3ace852

Tests/Types/Output/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable */
22
// tslint:disable
33

4+
import { GenericSubType } from "./generic-sub-type";
45
import { SubType } from "./sub-type";
56

67
export class Types {
@@ -76,6 +77,7 @@ export class Types {
7677
public stringSubTypeDictionary: { [key: string]: SubType; };
7778
public intSubTypeDictionary: { [key: number]: SubType; };
7879
public subTypeStringDictionary: { /* unsupported type for key. Expected string or number. Got 'SubType'. */ };
80+
public genericSubType: GenericSubType<string, number>;
7981
public readonlyProperty: string;
8082
public writeonlyProperty: string;
8183
}

Tests/Types/Types.cs

+9
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public class Types
9595
public Dictionary<string, SubType> StringSubTypeDictionary { get; set; }
9696
public Dictionary<int, SubType> IntSubTypeDictionary { get; set; }
9797
public Dictionary<SubType, string> SubTypeStringDictionary { get; set; }
98+
public GenericSubType<string, int> GenericSubType { get; set; }
9899

99100
// Accessors
100101
public string ReadonlyProperty => string.Empty;
@@ -109,4 +110,12 @@ public class SubType
109110
{
110111
public string Property { get; set; }
111112
}
113+
114+
public class GenericSubType<TOne, TTwo>
115+
{
116+
public TOne Single { get; }
117+
public string Single2 { get; }
118+
public IEnumerable<TOne> Enumerable { get; set; }
119+
public List<TTwo> List { get; set; }
120+
}
112121
}

Tests/Types/Types.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="KY.Generator" Version="7.1.0" />
10-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
9+
<PackageReference Include="KY.Generator" Version="7.2.0" />
10+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
1111
</ItemGroup>
1212

1313
</Project>

Tests/WebApiController/WebApiController.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="KY.Core.Common" Version="4.14.0" />
18-
<PackageReference Include="KY.Generator" Version="7.1.0" />
19-
<PackageReference Include="KY.Generator.Annotations" Version="7.1.0" />
18+
<PackageReference Include="KY.Generator" Version="7.2.0" />
19+
<PackageReference Include="KY.Generator.Annotations" Version="7.2.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
2121
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.7" />
2222
</ItemGroup>

0 commit comments

Comments
 (0)