Skip to content

Commit d1770bf

Browse files
committed
Merge branch 'release/2.0.1' into production
2 parents 570b54f + 2faa725 commit d1770bf

File tree

18 files changed

+110
-16
lines changed

18 files changed

+110
-16
lines changed

CSF.Entities/CSF.Entities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Authors>craigfowler</Authors>
1212
<Title>Entity &amp; identity types</Title>
1313
<Description>Interfaces &amp; base types to describe ORM-mapped entities and their identities.</Description>
14-
<ReleaseVersion>2.0.0</ReleaseVersion>
14+
<ReleaseVersion>2.0.1</ReleaseVersion>
1515
<Version>$(ReleaseVersion)</Version>
1616
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1717
<PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.ORM.Entities/CSF.ORM.Entities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Authors>craigfowler</Authors>
1414
<Title>ORM abstractions: Entity integration</Title>
1515
<Description>An integration between CSF.ORM and CSF.Entities, providing convenience functionality for projects which use both.</Description>
16-
<ReleaseVersion>2.0.0</ReleaseVersion>
16+
<ReleaseVersion>2.0.1</ReleaseVersion>
1717
<Version>$(ReleaseVersion)</Version>
1818
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1919
<PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<PropertyGroup>
1111
<IsPackable>false</IsPackable>
12-
<ReleaseVersion>2.0.0</ReleaseVersion>
12+
<ReleaseVersion>2.0.1</ReleaseVersion>
1313
<Version>$(ReleaseVersion)</Version>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>

CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Authors>craigfowler</Authors>
1313
<Title>ORM abstractions: Implementation for NHibernate 4</Title>
1414
<Description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</Description>
15-
<ReleaseVersion>2.0.0</ReleaseVersion>
15+
<ReleaseVersion>2.0.1</ReleaseVersion>
1616
<Version>$(ReleaseVersion)</Version>
1717
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -22,6 +22,8 @@
2222
<SignAssembly>true</SignAssembly>
2323
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
2424
<RootNamespace>CSF.ORM.NHibernate</RootNamespace>
25+
<NuspecFile>CSF.ORM.NHibernate4.nuspec</NuspecFile>
26+
<NuspecProperties>Version=$(ReleaseVersion)</NuspecProperties>
2527
</PropertyGroup>
2628

2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata>
4+
<id>CSF.ORM.NHibernate4</id>
5+
<version>2.0.0</version>
6+
<title>ORM abstractions: Implementation for NHibernate 4</title>
7+
<authors>craigfowler</authors>
8+
<owners>craigfowler</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="expression">MIT</license>
11+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
12+
<projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
13+
<description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</description>
14+
<copyright>Copyright 2020 - CSF Software Limited</copyright>
15+
<repository url="https://github.com/csf-dev/CSF.ORM" />
16+
<dependencies>
17+
<group targetFramework=".NETFramework4.5">
18+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
19+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
20+
<dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
21+
</group>
22+
<group targetFramework=".NETCoreApp2.0">
23+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
24+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
25+
<dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
26+
</group>
27+
<group targetFramework=".NETStandard2.0">
28+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
29+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
30+
<dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
31+
<dependency id="System.Configuration.ConfigurationManager" version="4.4.0" />
32+
<dependency id="System.Data.SQLite.Core" version="1.0.112" />
33+
<dependency id="System.Security.Permissions" version="4.4.0" />
34+
<dependency id="System.ServiceModel.Primitives" version="4.4.0" />
35+
</group>
36+
</dependencies>
37+
<frameworkAssemblies>
38+
<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.5" />
39+
</frameworkAssemblies>
40+
</metadata>
41+
<files>
42+
<file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />
43+
<file src="bin/Release/**/CSF.ORM.NHibernate*.xml" target="lib" />
44+
</files>
45+
</package>

CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Authors>craigfowler</Authors>
1313
<Title>ORM abstractions: Implementation for NHibernate 5</Title>
1414
<Description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</Description>
15-
<ReleaseVersion>2.0.0</ReleaseVersion>
15+
<ReleaseVersion>2.0.1</ReleaseVersion>
1616
<Version>$(ReleaseVersion)</Version>
1717
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -22,6 +22,8 @@
2222
<SignAssembly>true</SignAssembly>
2323
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
2424
<RootNamespace>CSF.ORM.NHibernate</RootNamespace>
25+
<NuspecFile>CSF.ORM.NHibernate5.nuspec</NuspecFile>
26+
<NuspecProperties>Version=$(ReleaseVersion)</NuspecProperties>
2527
</PropertyGroup>
2628

2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata>
4+
<id>CSF.ORM.NHibernate5</id>
5+
<version>0.0.0</version>
6+
<title>ORM abstractions: Implementation for NHibernate 5</title>
7+
<authors>craigfowler</authors>
8+
<owners>craigfowler</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="expression">MIT</license>
11+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
12+
<projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
13+
<description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</description>
14+
<copyright>Copyright 2020 - CSF Software Limited</copyright>
15+
<repository url="https://github.com/csf-dev/CSF.ORM" />
16+
<dependencies>
17+
<group targetFramework=".NETFramework4.6.1">
18+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
19+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
20+
<dependency id="NHibernate" version="[5.0.0,6.0.0)" />
21+
</group>
22+
<group targetFramework=".NETCoreApp2.0">
23+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
24+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
25+
<dependency id="NHibernate" version="[5.0.0,6.0.0)" />
26+
</group>
27+
<group targetFramework=".NETStandard2.0">
28+
<dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
29+
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
30+
<dependency id="NHibernate" version="[5.0.0,6.0.0)" />
31+
<dependency id="System.Configuration.ConfigurationManager" version="4.4.0" />
32+
<dependency id="System.Data.SQLite.Core" version="1.0.112" />
33+
<dependency id="System.Security.Permissions" version="4.4.0" />
34+
<dependency id="System.ServiceModel.Primitives" version="4.4.0" />
35+
</group>
36+
</dependencies>
37+
<frameworkAssemblies>
38+
<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.6.1" />
39+
</frameworkAssemblies>
40+
</metadata>
41+
<files>
42+
<file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />
43+
<file src="bin/Release/**/CSF.ORM.NHibernate*.xml" target="lib" />
44+
</files>
45+
</package>

CSF.ORM.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,6 @@ Global
174174
$0.NameConventionPolicy = $4
175175
$4.Rules = $5
176176
$5.NamingRule = $25
177-
version = 2.0.0
177+
version = 2.0.1
178178
EndGlobalSection
179179
EndGlobal

CSF.ORM/CSF.ORM.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Authors>craigfowler</Authors>
1313
<Title>ORM abstractions</Title>
1414
<Description>Types which relate to the usage of an ORM, so that a business logic project does not need to depend upon the ORM directly.</Description>
15-
<ReleaseVersion>2.0.0</ReleaseVersion>
15+
<ReleaseVersion>2.0.1</ReleaseVersion>
1616
<Version>$(ReleaseVersion)</Version>
1717
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>

PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageId>CSF.PersistenceTester</PackageId>
1919
<Title>ORM persistence tester</Title>
2020
<Description>A utility for testing object/entity persistence when using an ORM.</Description>
21-
<ReleaseVersion>2.0.0</ReleaseVersion>
21+
<ReleaseVersion>2.0.1</ReleaseVersion>
2222
<Version>$(ReleaseVersion)</Version>
2323
<PackageVersion>$(ReleaseVersion)</PackageVersion>
2424
<SonarQubeTestProject>false</SonarQubeTestProject>

0 commit comments

Comments
 (0)