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

Commit cf8b312

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite
2 parents dbf9777 + a7b71a5 commit cf8b312

File tree

5 files changed

+33
-46
lines changed

5 files changed

+33
-46
lines changed

‎src/ServiceStack.OrmLite.MySql.Tests/ServiceStack.OrmLite.MySql.Tests.csproj

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<AssemblyName>ServiceStack.OrmLite.MySql.Tests</AssemblyName>
88
<OutputType>Library</OutputType>
99
<PackageId>ServiceStack.OrmLite.MySql.Tests</PackageId>
10-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
12-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81+xamarinmac</PackageTargetFallback>
1310
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1411
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1512
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -51,17 +48,16 @@
5148
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
5249
</ItemGroup>
5350

54-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
51+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
5552
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
5653
</PropertyGroup>
5754

58-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
59-
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
60-
<PackageReference Include="System.Runtime" Version="4.1.0" />
61-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.1.1" />
62-
<PackageReference Include="System.Reflection" Version="4.1.0" />
63-
<PackageReference Include="System.Reflection.Primitives" Version="4.0.1" />
64-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
55+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
56+
<PackageReference Include="System.Runtime" Version="4.3.0" />
57+
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
58+
<PackageReference Include="System.Reflection" Version="4.3.0" />
59+
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
60+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
6561

6662
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
6763
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />

‎src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
55
<!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
66
<DebugType>portable</DebugType>
77
<AssemblyName>ServiceStack.OrmLite.PostgreSQL.Tests</AssemblyName>
88
<OutputType>Library</OutputType>
99
<PackageId>ServiceStack.OrmLite.PostgreSQL.Tests</PackageId>
10-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
12-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81+xamarinmac</PackageTargetFallback>
1310
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1411
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1512
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -56,7 +53,7 @@
5653
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
5754
</ItemGroup>
5855

59-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
56+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
6057
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
6158
</PropertyGroup>
6259

@@ -73,20 +70,19 @@
7370
<PackageReference Include="NUnitLite" Version="3.6.1" />
7471
</ItemGroup>
7572

76-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
77-
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
73+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
7874
<PackageReference Include="System.Runtime" Version="4.*" />
7975
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.*" />
8076
<PackageReference Include="System.Reflection" Version="4.*" />
8177
<PackageReference Include="System.Reflection.Primitives" Version="4.*" />
8278
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.*" />
8379
<PackageReference Include="System.Threading.Thread" Version="4.*" />
8480

85-
<PackageReference Include="ServiceStack.Interfaces.Core" Version="1.0.*" />
86-
<PackageReference Include="ServiceStack.Text.Core" Version="1.0.*" />
87-
<PackageReference Include="ServiceStack.Common.Core" Version="1.0.*" />
88-
<PackageReference Include="ServiceStack.Client.Core" Version="1.0.*" />
89-
<PackageReference Include="ServiceStack.Core" Version="1.0.*" />
81+
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
82+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
83+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
84+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.Client.dll" />
85+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.dll" />
9086
</ItemGroup>
9187

9288
</Project>

‎src/ServiceStack.OrmLite.SqlServerTests/ServiceStack.OrmLite.SqlServerTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<TargetFramework>net45</TargetFramework>
55
<AssemblyName>ServiceStack.OrmLite.SqlServerTests</AssemblyName>
66
<PackageId>ServiceStack.OrmLite.SqlServerTests</PackageId>
7-
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
87
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
98
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
109
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

‎tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
55
<!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
66
<DebugType>portable</DebugType>
77
<AssemblyName>ServiceStack.OrmLite.SqliteTests</AssemblyName>
88
<OutputType>Library</OutputType>
99
<PackageId>ServiceStack.OrmLite.SqliteTests</PackageId>
10-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
12-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81+xamarinmac</PackageTargetFallback>
1310
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1411
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1512
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -51,7 +48,7 @@
5148
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
5249
</ItemGroup>
5350

54-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
51+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
5552
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
5653
</PropertyGroup>
5754

@@ -68,18 +65,19 @@
6865
<PackageReference Include="NUnitLite" Version="3.6.1" />
6966
</ItemGroup>
7067

71-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
68+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
69+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.1" />
7270
<PackageReference Include="System.Runtime" Version="4.*" />
7371
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.*" />
7472
<PackageReference Include="System.Reflection" Version="4.*" />
7573
<PackageReference Include="System.Reflection.Primitives" Version="4.*" />
7674
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.*" />
7775

78-
<PackageReference Include="ServiceStack.Interfaces.Core" Version="1.0.*" />
79-
<PackageReference Include="ServiceStack.Text.Core" Version="1.0.*" />
80-
<PackageReference Include="ServiceStack.Common.Core" Version="1.0.*" />
81-
<PackageReference Include="ServiceStack.Client.Core" Version="1.0.*" />
82-
<PackageReference Include="ServiceStack.Core" Version="1.0.*" />
76+
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
77+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
78+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
79+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.Client.dll" />
80+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.dll" />
8381
</ItemGroup>
8482

8583
</Project>

‎tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
55
<!--<TargetFrameworks>net45</TargetFrameworks>-->
66
<DebugType>portable</DebugType>
77
<AssemblyName>ServiceStack.OrmLite.Tests</AssemblyName>
88
<OutputType>Library</OutputType>
99
<PackageId>ServiceStack.OrmLite.Tests</PackageId>
10-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
1210
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1311
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1412
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -58,7 +56,7 @@
5856
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
5957
</ItemGroup>
6058

61-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
59+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
6260
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
6361
</PropertyGroup>
6462

@@ -75,21 +73,21 @@
7573
<PackageReference Include="NUnitLite" Version="3.6.1" />
7674
</ItemGroup>
7775

78-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
76+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
7977
<PackageReference Include="Microsoft.Data.Sqlite" Version="1.1.1" />
78+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.1" />
8079
<PackageReference Include="System.Runtime" Version="4.*" />
8180
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.*" />
8281
<PackageReference Include="System.Reflection" Version="4.*" />
8382
<PackageReference Include="System.Reflection.Primitives" Version="4.*" />
8483
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.*" />
8584
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.*" />
8685

87-
<!-- <Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" /> -->
88-
<PackageReference Include="ServiceStack.Interfaces.Core" Version="1.0.*" />
89-
<PackageReference Include="ServiceStack.Text.Core" Version="1.0.*" />
90-
<PackageReference Include="ServiceStack.Common.Core" Version="1.0.*" />
91-
<PackageReference Include="ServiceStack.Client.Core" Version="1.0.*" />
92-
<PackageReference Include="ServiceStack.Core" Version="1.0.*" />
86+
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
87+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
88+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
89+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.Client.dll" />
90+
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.dll" />
9391
</ItemGroup>
9492

9593
</Project>

0 commit comments

Comments
 (0)