Skip to content

Commit be2a241

Browse files
mythzmythz
committed
Upgrade CheckWeb deps + add ExportAttribute handler
1 parent d9802c3 commit be2a241

6 files changed

Lines changed: 30 additions & 12 deletions

File tree

‎tests/Check.ServiceInterface/Check.ServiceInterface.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
35-
<HintPath>..\..\src\packages\ServiceStack.Common.5.7.0\lib\net45\ServiceStack.Common.dll</HintPath>
35+
<HintPath>..\..\src\packages\ServiceStack.Common.5.7.1\lib\net45\ServiceStack.Common.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
39-
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.7.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
39+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.7.1\lib\net45\ServiceStack.Interfaces.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
43-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.7.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
43+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.7.1\lib\net45\ServiceStack.OrmLite.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="ServiceStack.Redis, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
47-
<HintPath>..\..\src\packages\ServiceStack.Redis.5.7.0\lib\net45\ServiceStack.Redis.dll</HintPath>
47+
<HintPath>..\..\src\packages\ServiceStack.Redis.5.7.1\lib\net45\ServiceStack.Redis.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
51-
<HintPath>..\..\src\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll</HintPath>
51+
<HintPath>..\..\src\packages\ServiceStack.Text.5.7.1\lib\net45\ServiceStack.Text.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="System" />

‎tests/Check.ServiceInterface/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack.Common" version="5.7.0" targetFramework="net46" />
4-
<package id="ServiceStack.Interfaces" version="5.7.0" targetFramework="net46" />
5-
<package id="ServiceStack.OrmLite" version="5.7.0" targetFramework="net46" />
6-
<package id="ServiceStack.Redis" version="5.7.0" targetFramework="net46" />
7-
<package id="ServiceStack.Text" version="5.7.0" targetFramework="net46" />
3+
<package id="ServiceStack.Common" version="5.7.1" targetFramework="net46" />
4+
<package id="ServiceStack.Interfaces" version="5.7.1" targetFramework="net46" />
5+
<package id="ServiceStack.OrmLite" version="5.7.1" targetFramework="net46" />
6+
<package id="ServiceStack.Redis" version="5.7.1" targetFramework="net46" />
7+
<package id="ServiceStack.Text" version="5.7.1" targetFramework="net46" />
88
<package id="System.Buffers" version="4.5.0" targetFramework="net46" />
99
<package id="System.Memory" version="4.5.3" targetFramework="net46" />
1010
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />

‎tests/Check.ServiceModel/NativeTypeIssues.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public class TestAttributeExport : IReturn<TestAttributeExport>
2828
{
2929
[Display(AutoGenerateField = true, AutoGenerateFilter = true, ShortName = "UnitMeasKey")]
3030
public int UnitMeasKey { get; set; }
31+
32+
[Display(AutoGenerateField = false)]
33+
public int AutoGenerateFieldOff { get; set; }
3134
}
3235

3336
public class RecursiveNode : IReturn<RecursiveNode>

‎tests/CheckMvc/CheckMvc.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
68-
<HintPath>..\..\src\packages\ServiceStack.Text.5.7.0\lib\net45\ServiceStack.Text.dll</HintPath>
68+
<HintPath>..\..\src\packages\ServiceStack.Text.5.7.1\lib\net45\ServiceStack.Text.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="System" />

‎tests/CheckMvc/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1313
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
1414
<package id="NUnit" version="3.12.0" targetFramework="net46" />
15-
<package id="ServiceStack.Text" version="5.7.0" targetFramework="net46" />
15+
<package id="ServiceStack.Text" version="5.7.1" targetFramework="net46" />
1616
<package id="System.Buffers" version="4.5.0" targetFramework="net46" />
1717
<package id="System.Memory" version="4.5.3" targetFramework="net46" />
1818
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />

‎tests/CheckWeb/Global.asax.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.ComponentModel.DataAnnotations;
34
using System.IO;
45
using System.IO.Compression;
56
using System.Linq;
@@ -24,6 +25,7 @@
2425
using ServiceStack.IO;
2526
using ServiceStack.MiniProfiler;
2627
using ServiceStack.MiniProfiler.Data;
28+
using ServiceStack.NativeTypes;
2729
using ServiceStack.NativeTypes.CSharp;
2830
using ServiceStack.ProtoBuf;
2931
using ServiceStack.Razor;
@@ -122,6 +124,19 @@ public override void Configure(Container container)
122124

123125
Plugins.Add(new DynamicallyRegisteredPlugin());
124126

127+
var feature = GetPlugin<NativeTypesFeature>();
128+
feature.ExportAttribute<DisplayAttribute>(x => {
129+
var attr = (DisplayAttribute) x;
130+
var metadata = feature.GetGenerator().ToMetadataAttribute(x);
131+
if (!attr.AutoGenerateField)
132+
metadata.Args.Add(new MetadataPropertyType {
133+
Name = nameof(DisplayAttribute.AutoGenerateField),
134+
Type = nameof(Boolean),
135+
Value = "false",
136+
});
137+
return metadata;
138+
});
139+
125140
// container.Register<IDbConnectionFactory>(
126141
// new OrmLiteConnectionFactory(":memory:", SqliteDialect.Provider));
127142
// //container.Register<IDbConnectionFactory>(

0 commit comments

Comments
 (0)