Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit af6ae36

Browse files
mythzmythz
committed
Update deps + add InsertHtml examples
1 parent 50d37bd commit af6ae36

File tree

12 files changed

+91
-75
lines changed

12 files changed

+91
-75
lines changed

‎src/ServiceStack.Admin.Web/ServiceStack.Admin.Web.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@
116116
<TypeScriptCompile Include="src\Sidebar.tsx" />
117117
</ItemGroup>
118118
<ItemGroup>
119-
<PackageReference Include="ServiceStack" Version="5.9.0" />
120-
<PackageReference Include="ServiceStack.Client" Version="5.9.0" />
121-
<PackageReference Include="ServiceStack.Common" Version="5.9.0" />
122-
<PackageReference Include="ServiceStack.Interfaces" Version="5.9.0" />
123-
<PackageReference Include="ServiceStack.OrmLite" Version="5.9.0" />
124-
<PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.9.0" />
125-
<PackageReference Include="ServiceStack.Redis" Version="5.9.0" />
126-
<PackageReference Include="ServiceStack.Server" Version="5.9.0" />
127-
<PackageReference Include="ServiceStack.Text" Version="5.9.0" />
119+
<PackageReference Include="ServiceStack" Version="5.9.1" />
120+
<PackageReference Include="ServiceStack.Client" Version="5.9.1" />
121+
<PackageReference Include="ServiceStack.Common" Version="5.9.1" />
122+
<PackageReference Include="ServiceStack.Interfaces" Version="5.9.1" />
123+
<PackageReference Include="ServiceStack.OrmLite" Version="5.9.1" />
124+
<PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.9.1" />
125+
<PackageReference Include="ServiceStack.Redis" Version="5.9.1" />
126+
<PackageReference Include="ServiceStack.Server" Version="5.9.1" />
127+
<PackageReference Include="ServiceStack.Text" Version="5.9.1" />
128128
<PackageReference Include="System.Buffers" Version="4.5.1" />
129129
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
130130
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.1" />

‎src/ServiceStack.Admin.Web/Web.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
5151
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
5252
</dependentAssembly>
53+
<dependentAssembly>
54+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
55+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
56+
</dependentAssembly>
5357
</assemblyBinding>
5458
</runtime>
5559
</configuration>

‎tests/Admin.Tasks/Admin.Tasks.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,39 @@
3737
<HintPath>..\..\src\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
3838
</Reference>
3939
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
40-
<HintPath>..\..\src\packages\ServiceStack.5.9.0\lib\net45\ServiceStack.dll</HintPath>
40+
<HintPath>..\..\src\packages\ServiceStack.5.9.1\lib\net45\ServiceStack.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
44-
<HintPath>..\..\src\packages\ServiceStack.Client.5.9.0\lib\net45\ServiceStack.Client.dll</HintPath>
44+
<HintPath>..\..\src\packages\ServiceStack.Client.5.9.1\lib\net45\ServiceStack.Client.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
48-
<HintPath>..\..\src\packages\ServiceStack.Common.5.9.0\lib\net45\ServiceStack.Common.dll</HintPath>
48+
<HintPath>..\..\src\packages\ServiceStack.Common.5.9.1\lib\net45\ServiceStack.Common.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
52-
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.9.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
52+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.9.1\lib\net45\ServiceStack.Interfaces.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
56-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.9.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
56+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.9.1\lib\net45\ServiceStack.OrmLite.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="ServiceStack.OrmLite.Sqlite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
60-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.9.0\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
60+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.9.1\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="ServiceStack.Redis, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
64-
<HintPath>..\..\src\packages\ServiceStack.Redis.5.9.0\lib\net45\ServiceStack.Redis.dll</HintPath>
64+
<HintPath>..\..\src\packages\ServiceStack.Redis.5.9.1\lib\net45\ServiceStack.Redis.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="ServiceStack.Server, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
68-
<HintPath>..\..\src\packages\ServiceStack.Server.5.9.0\lib\net45\ServiceStack.Server.dll</HintPath>
68+
<HintPath>..\..\src\packages\ServiceStack.Server.5.9.1\lib\net45\ServiceStack.Server.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
72-
<HintPath>..\..\src\packages\ServiceStack.Text.5.9.0\lib\net45\ServiceStack.Text.dll</HintPath>
72+
<HintPath>..\..\src\packages\ServiceStack.Text.5.9.1\lib\net45\ServiceStack.Text.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="System" />
@@ -92,8 +92,8 @@
9292
</Reference>
9393
<Reference Include="System.Net" />
9494
<Reference Include="System.Net.Http" />
95-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
96-
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
95+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
96+
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
9999
<Reference Include="System.Runtime.Serialization" />

‎tests/Admin.Tasks/packages.config

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<packages>
33
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
44
<package id="NUnit" version="3.9.0" targetFramework="net45" />
5-
<package id="ServiceStack" version="5.9.0" targetFramework="net45" />
6-
<package id="ServiceStack.Client" version="5.9.0" targetFramework="net45" />
7-
<package id="ServiceStack.Common" version="5.9.0" targetFramework="net45" />
8-
<package id="ServiceStack.Interfaces" version="5.9.0" targetFramework="net45" />
9-
<package id="ServiceStack.OrmLite" version="5.9.0" targetFramework="net45" />
10-
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.0" targetFramework="net45" />
11-
<package id="ServiceStack.Redis" version="5.9.0" targetFramework="net45" />
12-
<package id="ServiceStack.Server" version="5.9.0" targetFramework="net45" />
13-
<package id="ServiceStack.Text" version="5.9.0" targetFramework="net45" />
5+
<package id="ServiceStack" version="5.9.1" targetFramework="net45" />
6+
<package id="ServiceStack.Client" version="5.9.1" targetFramework="net45" />
7+
<package id="ServiceStack.Common" version="5.9.1" targetFramework="net45" />
8+
<package id="ServiceStack.Interfaces" version="5.9.1" targetFramework="net45" />
9+
<package id="ServiceStack.OrmLite" version="5.9.1" targetFramework="net45" />
10+
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.1" targetFramework="net45" />
11+
<package id="ServiceStack.Redis" version="5.9.1" targetFramework="net45" />
12+
<package id="ServiceStack.Server" version="5.9.1" targetFramework="net45" />
13+
<package id="ServiceStack.Text" version="5.9.1" targetFramework="net45" />
1414
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
1515
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net45" />
1616
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net45" />
1717
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
18-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net45" />
18+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1919
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
2020
</packages>

‎tests/TestSelfHost/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
1010
<bindingRedirect oldVersion="0.0.0.0-1.0.107.0" newVersion="1.0.107.0" />
1111
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
15+
</dependentAssembly>
1216
</assemblyBinding>
1317
</runtime>
1418
</configuration>

‎tests/TestSelfHost/Program.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ public override void Configure(Container container)
4040
MaxLimit = 100
4141
});
4242

43-
Plugins.Add(new AdminFeature());
43+
Plugins.Add(new AdminFeature {
44+
InsertHtml = $"<script>document.title='My App'</script>"
45+
});
4446
}
4547
}
4648

‎tests/TestSelfHost/TestSelfHost.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,39 @@
3636
<ItemGroup>
3737
<Reference Include="mscorlib" />
3838
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
39-
<HintPath>..\..\src\packages\ServiceStack.5.9.0\lib\net45\ServiceStack.dll</HintPath>
39+
<HintPath>..\..\src\packages\ServiceStack.5.9.1\lib\net45\ServiceStack.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
43-
<HintPath>..\..\src\packages\ServiceStack.Client.5.9.0\lib\net45\ServiceStack.Client.dll</HintPath>
43+
<HintPath>..\..\src\packages\ServiceStack.Client.5.9.1\lib\net45\ServiceStack.Client.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
47-
<HintPath>..\..\src\packages\ServiceStack.Common.5.9.0\lib\net45\ServiceStack.Common.dll</HintPath>
47+
<HintPath>..\..\src\packages\ServiceStack.Common.5.9.1\lib\net45\ServiceStack.Common.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
51-
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.9.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
51+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.9.1\lib\net45\ServiceStack.Interfaces.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
55-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.9.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
55+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.9.1\lib\net45\ServiceStack.OrmLite.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="ServiceStack.OrmLite.Sqlite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
59-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.9.0\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
59+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.9.1\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="ServiceStack.Redis, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
63-
<HintPath>..\..\src\packages\ServiceStack.Redis.5.9.0\lib\net45\ServiceStack.Redis.dll</HintPath>
63+
<HintPath>..\..\src\packages\ServiceStack.Redis.5.9.1\lib\net45\ServiceStack.Redis.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="ServiceStack.Server, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
67-
<HintPath>..\..\src\packages\ServiceStack.Server.5.9.0\lib\net45\ServiceStack.Server.dll</HintPath>
67+
<HintPath>..\..\src\packages\ServiceStack.Server.5.9.1\lib\net45\ServiceStack.Server.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
71-
<HintPath>..\..\src\packages\ServiceStack.Text.5.9.0\lib\net45\ServiceStack.Text.dll</HintPath>
71+
<HintPath>..\..\src\packages\ServiceStack.Text.5.9.1\lib\net45\ServiceStack.Text.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="System" />
@@ -88,8 +88,8 @@
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="System.Net" />
91-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
92-
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
91+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
92+
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
9595
<Reference Include="System.ServiceModel" />

‎tests/TestSelfHost/packages.config

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
4-
<package id="ServiceStack" version="5.9.0" targetFramework="net45" />
5-
<package id="ServiceStack.Client" version="5.9.0" targetFramework="net45" />
6-
<package id="ServiceStack.Common" version="5.9.0" targetFramework="net45" />
7-
<package id="ServiceStack.Interfaces" version="5.9.0" targetFramework="net45" />
8-
<package id="ServiceStack.OrmLite" version="5.9.0" targetFramework="net45" />
9-
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.0" targetFramework="net45" />
10-
<package id="ServiceStack.Redis" version="5.9.0" targetFramework="net45" />
11-
<package id="ServiceStack.Server" version="5.9.0" targetFramework="net45" />
12-
<package id="ServiceStack.Text" version="5.9.0" targetFramework="net45" />
4+
<package id="ServiceStack" version="5.9.1" targetFramework="net45" />
5+
<package id="ServiceStack.Client" version="5.9.1" targetFramework="net45" />
6+
<package id="ServiceStack.Common" version="5.9.1" targetFramework="net45" />
7+
<package id="ServiceStack.Interfaces" version="5.9.1" targetFramework="net45" />
8+
<package id="ServiceStack.OrmLite" version="5.9.1" targetFramework="net45" />
9+
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.1" targetFramework="net45" />
10+
<package id="ServiceStack.Redis" version="5.9.1" targetFramework="net45" />
11+
<package id="ServiceStack.Server" version="5.9.1" targetFramework="net45" />
12+
<package id="ServiceStack.Text" version="5.9.1" targetFramework="net45" />
1313
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
1414
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net45" />
1515
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net45" />
1616
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
17-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net45" />
17+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1818
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
1919
</packages>

‎tests/TestVirtualWebHost/Global.asax.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ public override void Configure(Container container)
2727
MaxLimit = 100
2828
});
2929

30-
Plugins.Add(new AdminFeature());
30+
Plugins.Add(new AdminFeature {
31+
InsertHtml = $"<script>document.title='My App'</script>"
32+
});
3133

3234
SetConfig(new HostConfig {
3335
HandlerFactoryPath = "api",
34-
WebHostUrl = "http://localhost/TestVirtual.WebHost/api",
36+
// WebHostUrl = "http://localhost/TestVirtual.WebHost/api",
3537
});
3638
}
3739
}

0 commit comments

Comments
 (0)