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

Commit 1441b57

Browse files
mythzmythz
committed
Upgrade to v6
1 parent 1bc4ad0 commit 1441b57

File tree

36 files changed

+37
-180
lines changed

36 files changed

+37
-180
lines changed

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ Unofficial Releases maintained by ServiceStack Community:
7171

7272
- [ServiceStack.OrmLite.Oracle](http://nuget.org/packages/ServiceStack.OrmLite.Oracle)
7373
- [ServiceStack.OrmLite.Firebird](http://nuget.org/List/Packages/ServiceStack.OrmLite.Firebird)
74-
- [ServiceStack.OrmLite.VistaDb](http://nuget.org/List/Packages/ServiceStack.OrmLite.VistaDb)
7574

7675
_Latest v4+ on NuGet is a [commercial release](https://servicestack.net/ormlite) with [free quotas](https://servicestack.net/download#free-quotas)._
7776

@@ -115,8 +114,7 @@ to support OrmLite features. The available Dialect Providers for each RDBMS is l
115114
MySqlDialect.Provider // MySql
116115
OracleDialect.Provider // Oracle
117116
FirebirdDialect.Provider // Firebird
118-
VistaDbDialect.Provider // Vista DB
119-
117+
120118
#### SQL Server Versions
121119

122120
There are a number of different SQL Server dialects to take advantage of features available in each version. For any version before SQL Server 2008 please use `SqlServer2008Dialect.Provider`, for any other version please use the best matching version:

‎build/build-core-data.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎build/build-core.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎build/build.proj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
@@ -131,11 +131,6 @@
131131
Targets="Build;Pack"
132132
Properties="Configuration=$(Configuration)" />
133133

134-
<!-- ServiceStack.OrmLite.VistaDB -->
135-
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.OrmLite.VistaDB/ServiceStack.OrmLite.VistaDB.csproj"
136-
Targets="Build;Pack"
137-
Properties="Configuration=$(Configuration)" />
138-
139134
<!-- ServiceStack.OrmLite.T4 -->
140135
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.OrmLite.T4/ServiceStack.OrmLite.T4.csproj"
141136
Targets="Build;Pack"

‎src/Directory.Build.props

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<Authors>ServiceStack</Authors>
66
<Company>ServiceStack, Inc.</Company>
77
<Copyright>&#169; 2008-2022 ServiceStack, Inc</Copyright>
@@ -25,25 +25,17 @@
2525
<Optimize>true</Optimize>
2626
</PropertyGroup>
2727

28-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net472' ">
29-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
29+
<DefineConstants>$(DefineConstants);NETFX;NET45;NET472</DefineConstants>
3030
<SignAssembly>True</SignAssembly>
3131
<DelaySign>False</DelaySign>
3232
<AssemblyOriginatorKeyFile>../servicestack.snk</AssemblyOriginatorKeyFile>
3333
</PropertyGroup>
3434

35-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
36-
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
37-
</PropertyGroup>
38-
3935
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4036
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
4137
</PropertyGroup>
4238

43-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
44-
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
45-
</PropertyGroup>
46-
4739
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
4840
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
4941
</PropertyGroup>

‎src/ServiceStack.OrmLite.Firebird/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Firebird/ServiceStack.OrmLite.Firebird.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite.Firebird</PackageId>
55
<AssemblyName>ServiceStack.OrmLite.Firebird</AssemblyName>
6-
<TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite.Firebird - Fast, code-first, config-free POCO ORM</Title>
88
<PackageDescription>
99
Light, simple and fast convention-based code-first POCO ORM for Firebird.

‎src/ServiceStack.OrmLite.MySql/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite.MySql</PackageId>
55
<AssemblyName>ServiceStack.OrmLite.MySql</AssemblyName>
6-
<TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite.MySql - Fast, code-first, config-free POCO ORM</Title>
88
<PackageDescription>
99
Light, simple and fast convention-based code-first POCO ORM for MySQL.
@@ -19,7 +19,7 @@
1919
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
2323
<Reference Include="System.Net" />
2424
<Reference Include="System.ComponentModel.DataAnnotations" />
2525
</ItemGroup>

‎src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
44
<AssemblyName>ServiceStack.OrmLite.MySqlConnector</AssemblyName>
55
<PackageId>ServiceStack.OrmLite.MySqlConnector</PackageId>
66
<RootNamespace>ServiceStack.OrmLite.MySql</RootNamespace>
@@ -28,7 +28,7 @@
2828
<PackageReference Include="MySqlConnector" Version="1.3.11" />
2929
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
3030
</ItemGroup>
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
3232
<Reference Include="System.Net" />
3333
<Reference Include="System.ComponentModel.DataAnnotations" />
3434
</ItemGroup>

‎src/ServiceStack.OrmLite.Oracle/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
55
<AssemblyName>ServiceStack.OrmLite.Oracle</AssemblyName>
66
<PackageId>ServiceStack.OrmLite.Oracle</PackageId>
77
<Title>OrmLite.Oracle - Fast, code-first, config-free POCO ORM</Title>
@@ -14,7 +14,7 @@
1414
<DefineConstants>$(DefineConstants);ASYNC</DefineConstants>
1515
</PropertyGroup>
1616

17-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
1818
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.12.0" />
1919
</ItemGroup>
2020

‎src/ServiceStack.OrmLite.PostgreSQL/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite.PostgreSQL</PackageId>
55
<AssemblyName>ServiceStack.OrmLite.PostgreSQL</AssemblyName>
6-
<TargetFrameworks>net461;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite.PostgreSQL - Fast, code-first, config-free POCO ORM</Title>
88
<PackageDescription>
99
Light, simple and fast convention-based code-first POCO ORM for PostgreSQL.
@@ -13,7 +13,7 @@
1313
<DefineConstants>$(DefineConstants);ASYNC</DefineConstants>
1414
</PropertyGroup>
1515

16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
1717
<PackageReference Include="Npgsql" Version="4.1.9" />
1818
</ItemGroup>
1919
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

‎src/ServiceStack.OrmLite.SqlServer.Converters/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.SqlServer.Converters/ServiceStack.OrmLite.SqlServer.Converters.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite.SqlServer.Converters</PackageId>
55
<AssemblyName>ServiceStack.OrmLite.SqlServer.Converters</AssemblyName>
6-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite.SqlServer.Converters - Converters for SQL Server Types</Title>
88
<PackageDescription>
99
Add OrmLite Converters for SQL Servers SqlGeography and SqlGeometry Types

‎src/ServiceStack.OrmLite.SqlServer.Data/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.SqlServer/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.SqlServer/ServiceStack.OrmLite.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite.SqlServer</PackageId>
55
<AssemblyName>ServiceStack.OrmLite.SqlServer</AssemblyName>
6-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite.SqlServer - Fast, code-first, config-free POCO ORM</Title>
88
<PackageDescription>
99
Light, simple and fast convention-based code-first POCO ORM for Sql Server.

‎src/ServiceStack.OrmLite.Sqlite.Cil/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Sqlite.Data/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Sqlite.Windows/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Sqlite.Windows/ServiceStack.OrmLite.Sqlite.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net45</TargetFrameworks>
3+
<TargetFramework>net472</TargetFramework>
44
<AssemblyName>ServiceStack.OrmLite.Sqlite.Windows</AssemblyName>
55
<PackageId>ServiceStack.OrmLite.Sqlite.Windows</PackageId>
66
<Title>OrmLite.Sqlite - Fast, code-first, config-free POCO ORM</Title>

‎src/ServiceStack.OrmLite.Sqlite/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
55
<AssemblyName>ServiceStack.OrmLite.Sqlite</AssemblyName>
66
<PackageId>ServiceStack.OrmLite.Sqlite</PackageId>
77
<Title>OrmLite.Sqlite - Fast, code-first, config-free POCO ORM</Title>

‎src/ServiceStack.OrmLite.sln

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "T4", "T4", "{ACB237F8-B931-
6262
T4\OrmLite.SP.tt = T4\OrmLite.SP.tt
6363
EndProjectSection
6464
EndProject
65-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.VistaDB", "ServiceStack.OrmLite.VistaDB\ServiceStack.OrmLite.VistaDB.csproj", "{D18D9D3C-B3B3-433C-9578-68E978587858}"
66-
EndProject
6765
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.Sqlite.Windows", "ServiceStack.OrmLite.Sqlite.Windows\ServiceStack.OrmLite.Sqlite.Windows.csproj", "{A5541444-70EE-4B5E-8A5F-C7D8A0048EBE}"
6866
EndProject
6967
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.Sqlite.Windows.Tests", "..\tests\ServiceStack.OrmLite.Sqlite.Windows.Tests\ServiceStack.OrmLite.Sqlite.Windows.Tests.csproj", "{701ABAE8-9B65-4D88-8CD6-C0FDD9D6BE08}"
7068
EndProject
7169
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.SqliteTests", "..\tests\ServiceStack.OrmLite.SqliteTests\ServiceStack.OrmLite.SqliteTests.csproj", "{956FD518-A6CC-46B1-A93A-1C92779BF942}"
7270
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.VistaDB.Tests", "..\tests\ServiceStack.OrmLite.VistaDB.Tests\ServiceStack.OrmLite.VistaDB.Tests.csproj", "{DBD5FF1A-454C-4763-A604-6EBB0C230357}"
74-
EndProject
7571
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.SqlServer.Converters", "ServiceStack.OrmLite.SqlServer.Converters\ServiceStack.OrmLite.SqlServer.Converters.csproj", "{7E9BB57B-53E3-425E-9882-B6E078C5C9BA}"
7672
EndProject
7773
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.MySqlConnector", "ServiceStack.OrmLite.MySqlConnector\ServiceStack.OrmLite.MySqlConnector.csproj", "{7ECD23BC-AB3A-4528-AE6F-0F182874AA9B}"
@@ -280,21 +276,6 @@ Global
280276
{DE5CA3EB-010D-492A-A0B7-501D7941FA51}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
281277
{DE5CA3EB-010D-492A-A0B7-501D7941FA51}.Release|Mixed Platforms.Build.0 = Release|Any CPU
282278
{DE5CA3EB-010D-492A-A0B7-501D7941FA51}.Release|x86.ActiveCfg = Release|Any CPU
283-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
284-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Debug|Any CPU.Build.0 = Debug|Any CPU
285-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
286-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
287-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Debug|x86.ActiveCfg = Debug|Any CPU
288-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Default|Any CPU.ActiveCfg = Debug|Any CPU
289-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Default|Any CPU.Build.0 = Debug|Any CPU
290-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Default|Mixed Platforms.ActiveCfg = Debug|Any CPU
291-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Default|Mixed Platforms.Build.0 = Debug|Any CPU
292-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Default|x86.ActiveCfg = Debug|Any CPU
293-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Release|Any CPU.ActiveCfg = Release|Any CPU
294-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Release|Any CPU.Build.0 = Release|Any CPU
295-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
296-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Release|Mixed Platforms.Build.0 = Release|Any CPU
297-
{D18D9D3C-B3B3-433C-9578-68E978587858}.Release|x86.ActiveCfg = Release|Any CPU
298279
{A5541444-70EE-4B5E-8A5F-C7D8A0048EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
299280
{A5541444-70EE-4B5E-8A5F-C7D8A0048EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
300281
{A5541444-70EE-4B5E-8A5F-C7D8A0048EBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -340,21 +321,6 @@ Global
340321
{956FD518-A6CC-46B1-A93A-1C92779BF942}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
341322
{956FD518-A6CC-46B1-A93A-1C92779BF942}.Release|Mixed Platforms.Build.0 = Release|Any CPU
342323
{956FD518-A6CC-46B1-A93A-1C92779BF942}.Release|x86.ActiveCfg = Release|Any CPU
343-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
344-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Debug|Any CPU.Build.0 = Debug|Any CPU
345-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
346-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
347-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Debug|x86.ActiveCfg = Debug|Any CPU
348-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Default|Any CPU.ActiveCfg = Debug|Any CPU
349-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Default|Any CPU.Build.0 = Debug|Any CPU
350-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Default|Mixed Platforms.ActiveCfg = Debug|Any CPU
351-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Default|Mixed Platforms.Build.0 = Debug|Any CPU
352-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Default|x86.ActiveCfg = Debug|Any CPU
353-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Release|Any CPU.ActiveCfg = Release|Any CPU
354-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Release|Any CPU.Build.0 = Release|Any CPU
355-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
356-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Release|Mixed Platforms.Build.0 = Release|Any CPU
357-
{DBD5FF1A-454C-4763-A604-6EBB0C230357}.Release|x86.ActiveCfg = Release|Any CPU
358324
{7E9BB57B-53E3-425E-9882-B6E078C5C9BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
359325
{7E9BB57B-53E3-425E-9882-B6E078C5C9BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
360326
{7E9BB57B-53E3-425E-9882-B6E078C5C9BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

‎src/ServiceStack.OrmLite/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
1+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.OrmLite</PackageId>
55
<AssemblyName>ServiceStack.OrmLite</AssemblyName>
6-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>OrmLite - Fast, code-first, config-free POCO ORM</Title>
88
<PackageDescription>
99
Common library for the Light, simple and fast convention-based code-first POCO, OrmLite.
@@ -25,7 +25,7 @@
2525
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
2626
</ItemGroup>
2727

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
2929
<Reference Include="System.Net" />
3030
<Reference Include="System.ComponentModel.DataAnnotations" />
3131
</ItemGroup>

‎tests/Directory.Build.props

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<LangVersion>latest</LangVersion>
66
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
77
</PropertyGroup>
@@ -10,18 +10,6 @@
1010
<DefineConstants>DEBUG</DefineConstants>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
14-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
18-
<DefineConstants>$(DefineConstants);NETFX;NET46</DefineConstants>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
22-
<DefineConstants>$(DefineConstants);NETFX;NET461</DefineConstants>
23-
</PropertyGroup>
24-
2513
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
2614
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
2715
</PropertyGroup>
@@ -30,15 +18,11 @@
3018
<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
3119
</PropertyGroup>
3220

33-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
34-
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
35-
</PropertyGroup>
36-
3721
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
3822
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
3923
</PropertyGroup>
4024

41-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
4226
<DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
4327
</PropertyGroup>
4428

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,4 @@
2929
<ProjectReference Include="..\..\src\ServiceStack.OrmLite.Firebird\ServiceStack.OrmLite.Firebird.csproj" />
3030
</ItemGroup>
3131

32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
33-
<ProjectReference Include="..\..\src\ServiceStack.OrmLite.VistaDB\ServiceStack.OrmLite.VistaDB.csproj" />
34-
</ItemGroup>
35-
3632
</Project>

0 commit comments

Comments
 (0)