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

Commit 3944cb4

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/Admin
2 parents 121d3fc + 6606d6b commit 3944cb4

File tree

7 files changed

+78
-75
lines changed

7 files changed

+78
-75
lines changed

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

+9-9
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.3" />
120-
<PackageReference Include="ServiceStack.Client" Version="5.9.3" />
121-
<PackageReference Include="ServiceStack.Common" Version="5.9.3" />
122-
<PackageReference Include="ServiceStack.Interfaces" Version="5.9.3" />
123-
<PackageReference Include="ServiceStack.OrmLite" Version="5.9.3" />
124-
<PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.9.3" />
125-
<PackageReference Include="ServiceStack.Redis" Version="5.9.3" />
126-
<PackageReference Include="ServiceStack.Server" Version="5.9.3" />
127-
<PackageReference Include="ServiceStack.Text" Version="5.9.3" />
119+
<PackageReference Include="ServiceStack" Version="5.10.0" />
120+
<PackageReference Include="ServiceStack.Client" Version="5.10.0" />
121+
<PackageReference Include="ServiceStack.Common" Version="5.10.0" />
122+
<PackageReference Include="ServiceStack.Interfaces" Version="5.10.0" />
123+
<PackageReference Include="ServiceStack.OrmLite" Version="5.10.0" />
124+
<PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.10.0" />
125+
<PackageReference Include="ServiceStack.Redis" Version="5.10.0" />
126+
<PackageReference Include="ServiceStack.Server" Version="5.10.0" />
127+
<PackageReference Include="ServiceStack.Text" Version="5.10.0" />
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" />

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

+12-12
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.3\lib\net45\ServiceStack.dll</HintPath>
40+
<HintPath>..\..\src\packages\ServiceStack.5.10.0\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.3\lib\net45\ServiceStack.Client.dll</HintPath>
44+
<HintPath>..\..\src\packages\ServiceStack.Client.5.10.0\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.3\lib\net45\ServiceStack.Common.dll</HintPath>
48+
<HintPath>..\..\src\packages\ServiceStack.Common.5.10.0\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.3\lib\net45\ServiceStack.Interfaces.dll</HintPath>
52+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.10.0\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.3\lib\net45\ServiceStack.OrmLite.dll</HintPath>
56+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.10.0\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.3\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
60+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.10.0\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.3\lib\net45\ServiceStack.Redis.dll</HintPath>
64+
<HintPath>..\..\src\packages\ServiceStack.Redis.5.10.0\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.3\lib\net45\ServiceStack.Server.dll</HintPath>
68+
<HintPath>..\..\src\packages\ServiceStack.Server.5.10.0\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.3\lib\net45\ServiceStack.Text.dll</HintPath>
72+
<HintPath>..\..\src\packages\ServiceStack.Text.5.10.0\lib\net45\ServiceStack.Text.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="System" />
@@ -83,7 +83,7 @@
8383
<Reference Include="Microsoft.CSharp" />
8484
<Reference Include="System.Data" />
8585
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139">
86-
<HintPath>..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\lib\net45\System.Data.SQLite.dll</HintPath>
86+
<HintPath>..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net45\System.Data.SQLite.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
@@ -126,12 +126,12 @@
126126
</ProjectReference>
127127
</ItemGroup>
128128
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129-
<Import Project="..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets')" />
129+
<Import Project="..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
130130
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131131
<PropertyGroup>
132132
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
133133
</PropertyGroup>
134-
<Error Condition="!Exists('..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets'))" />
134+
<Error Condition="!Exists('..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
135135
</Target>
136136
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137137
Other similar extension points exist, see Microsoft.Common.targets.

‎tests/Admin.Tasks/packages.config

+11-10
Original file line numberDiff line numberDiff line change
@@ -2,18 +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.3" targetFramework="net45" />
6-
<package id="ServiceStack.Client" version="5.9.3" targetFramework="net45" />
7-
<package id="ServiceStack.Common" version="5.9.3" targetFramework="net45" />
8-
<package id="ServiceStack.Interfaces" version="5.9.3" targetFramework="net45" />
9-
<package id="ServiceStack.OrmLite" version="5.9.3" targetFramework="net45" />
10-
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.3" targetFramework="net45" />
11-
<package id="ServiceStack.Redis" version="5.9.3" targetFramework="net45" />
12-
<package id="ServiceStack.Server" version="5.9.3" targetFramework="net45" />
13-
<package id="ServiceStack.Text" version="5.9.3" targetFramework="net45" />
5+
<package id="ServiceStack" version="5.10.0" targetFramework="net45" />
6+
<package id="ServiceStack.Client" version="5.10.0" targetFramework="net45" />
7+
<package id="ServiceStack.Common" version="5.10.0" targetFramework="net45" />
8+
<package id="ServiceStack.Interfaces" version="5.10.0" targetFramework="net45" />
9+
<package id="ServiceStack.OrmLite" version="5.10.0" targetFramework="net45" />
10+
<package id="ServiceStack.OrmLite.Sqlite" version="5.10.0" targetFramework="net45" />
11+
<package id="ServiceStack.Redis" version="5.10.0" targetFramework="net45" />
12+
<package id="ServiceStack.Server" version="5.10.0" targetFramework="net45" />
13+
<package id="ServiceStack.Text" version="5.10.0" targetFramework="net45" />
14+
<package id="System.Data.SQLite.Core" version="1.0.113.6" targetFramework="net45" />
15+
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net45" />
1416
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
1517
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net45" />
16-
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net45" />
1718
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
1819
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1920
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net45" />

‎tests/TestSelfHost/TestSelfHost.csproj

+12-12
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.3\lib\net45\ServiceStack.dll</HintPath>
39+
<HintPath>..\..\src\packages\ServiceStack.5.10.0\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.3\lib\net45\ServiceStack.Client.dll</HintPath>
43+
<HintPath>..\..\src\packages\ServiceStack.Client.5.10.0\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.3\lib\net45\ServiceStack.Common.dll</HintPath>
47+
<HintPath>..\..\src\packages\ServiceStack.Common.5.10.0\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.3\lib\net45\ServiceStack.Interfaces.dll</HintPath>
51+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.10.0\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.3\lib\net45\ServiceStack.OrmLite.dll</HintPath>
55+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.10.0\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.3\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
59+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.10.0\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.3\lib\net45\ServiceStack.Redis.dll</HintPath>
63+
<HintPath>..\..\src\packages\ServiceStack.Redis.5.10.0\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.3\lib\net45\ServiceStack.Server.dll</HintPath>
67+
<HintPath>..\..\src\packages\ServiceStack.Server.5.10.0\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.3\lib\net45\ServiceStack.Text.dll</HintPath>
71+
<HintPath>..\..\src\packages\ServiceStack.Text.5.10.0\lib\net45\ServiceStack.Text.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="System" />
@@ -80,7 +80,7 @@
8080
<Reference Include="System.Configuration" />
8181
<Reference Include="System.Core" />
8282
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139">
83-
<HintPath>..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\lib\net45\System.Data.SQLite.dll</HintPath>
83+
<HintPath>..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net45\System.Data.SQLite.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
@@ -126,12 +126,12 @@
126126
</ProjectReference>
127127
</ItemGroup>
128128
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129-
<Import Project="..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets')" />
129+
<Import Project="..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
130130
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131131
<PropertyGroup>
132132
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
133133
</PropertyGroup>
134-
<Error Condition="!Exists('..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\System.Data.SQLite.Core.1.0.113.1\build\net45\System.Data.SQLite.Core.targets'))" />
134+
<Error Condition="!Exists('..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net45\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
135135
</Target>
136136
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137137
Other similar extension points exist, see Microsoft.Common.targets.

‎tests/TestSelfHost/packages.config

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +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.3" targetFramework="net45" />
5-
<package id="ServiceStack.Client" version="5.9.3" targetFramework="net45" />
6-
<package id="ServiceStack.Common" version="5.9.3" targetFramework="net45" />
7-
<package id="ServiceStack.Interfaces" version="5.9.3" targetFramework="net45" />
8-
<package id="ServiceStack.OrmLite" version="5.9.3" targetFramework="net45" />
9-
<package id="ServiceStack.OrmLite.Sqlite" version="5.9.3" targetFramework="net45" />
10-
<package id="ServiceStack.Redis" version="5.9.3" targetFramework="net45" />
11-
<package id="ServiceStack.Server" version="5.9.3" targetFramework="net45" />
12-
<package id="ServiceStack.Text" version="5.9.3" targetFramework="net45" />
4+
<package id="ServiceStack" version="5.10.0" targetFramework="net45" />
5+
<package id="ServiceStack.Client" version="5.10.0" targetFramework="net45" />
6+
<package id="ServiceStack.Common" version="5.10.0" targetFramework="net45" />
7+
<package id="ServiceStack.Interfaces" version="5.10.0" targetFramework="net45" />
8+
<package id="ServiceStack.OrmLite" version="5.10.0" targetFramework="net45" />
9+
<package id="ServiceStack.OrmLite.Sqlite" version="5.10.0" targetFramework="net45" />
10+
<package id="ServiceStack.Redis" version="5.10.0" targetFramework="net45" />
11+
<package id="ServiceStack.Server" version="5.10.0" targetFramework="net45" />
12+
<package id="ServiceStack.Text" version="5.10.0" targetFramework="net45" />
13+
<package id="System.Data.SQLite.Core" version="1.0.113.6" targetFramework="net45" />
14+
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net45" />
1315
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
1416
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net45" />
15-
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net45" />
1617
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
1718
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1819
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net45" />

0 commit comments

Comments
 (0)