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

Commit 1441b57

Browse files
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>
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.
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>

0 commit comments

Comments
 (0)