Skip to content

Commit 462842d

Browse files
committed
Revert changes
1 parent 4c11a3e commit 462842d

File tree

8 files changed

+116
-3
lines changed

8 files changed

+116
-3
lines changed

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"projects": [ "src" ],
3+
"sdk": {
4+
"version": "2.1.4"
5+
}
6+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
<NoWarn>1591</NoWarn>
6+
<OutputType>Exe</OutputType>
7+
<PlatformTarget>AnyCpu</PlatformTarget>
8+
</PropertyGroup>
9+
10+
<Import Project="..\Shared.msbuild" />
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="EntityFramework" Version="6.2.0" />
18+
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
19+
<PackageReference Include="System.Data.SQLite" Version="1.0.106.0" />
20+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.106.0" />
21+
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.106.0" />
22+
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.106.0" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
26+
<Reference Include="System.ComponentModel.DataAnnotations" />
27+
<Reference Include="System.Configuration" />
28+
<Reference Include="System.ServiceModel" />
29+
<Reference Include="System.Transactions" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<Compile Include="..\CommonAssemblyInfo.cs">
34+
<Link>Properties\CommonAssemblyInfo.cs</Link>
35+
</Compile>
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<None Include="app.config" />
40+
</ItemGroup>
41+
42+
</Project>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
<NoWarn>1591</NoWarn>
6+
<OutputType>Exe</OutputType>
7+
<PlatformTarget>AnyCpu</PlatformTarget>
8+
</PropertyGroup>
9+
10+
<Import Project="..\Shared.msbuild" />
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="EntityFramework" Version="6.2.0" />
18+
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
19+
<PackageReference Include="System.Data.SQLite" Version="1.0.106.0" />
20+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.106.0" />
21+
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.106.0" />
22+
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.106.0" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
26+
<Reference Include="System.ComponentModel.DataAnnotations" />
27+
<Reference Include="System.Configuration" />
28+
<Reference Include="System.ServiceModel" />
29+
<Reference Include="System.Transactions" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<Compile Include="..\CommonAssemblyInfo.cs">
34+
<Link>Properties\CommonAssemblyInfo.cs</Link>
35+
</Compile>
36+
</ItemGroup>
37+
38+
39+
<ItemGroup>
40+
<None Include="app.config" />
41+
</ItemGroup>
42+
43+
</Project>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
4+
<NoWarn>1591</NoWarn>
5+
</PropertyGroup>
6+
7+
<Import Project="..\Shared.msbuild" />
8+
9+
<ItemGroup>
10+
<Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
19+
</ItemGroup>
20+
21+
</Project>

src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@
4242
<ItemGroup>
4343
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
4444
</ItemGroup>
45-
</Project>
45+
</Project>

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
6161
</ItemGroup>
6262

63-
</Project>
63+
</Project>

src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Data.SqlClient;
12
using System.Text;
23

34
namespace FluentNHibernate.Cfg.Db

src/FluentNHibernate/FluentNHibernate.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
</None>
4040
</ItemGroup>
4141

42-
</Project>
42+
</Project>

0 commit comments

Comments
 (0)