Skip to content

Commit e64d571

Browse files
craigfowlercraigfowler
committed
Merge branch 'feature/48-suspicious-dependencies'
2 parents 8793f86 + a633777 commit e64d571

22 files changed

Lines changed: 159 additions & 249 deletions

File tree

‎.appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '{branch}-{build}'
2-
image: Visual Studio 2017
2+
image: Visual Studio 2019
33

44
init:
55
- cmd: git config --global core.autocrlf true
@@ -18,6 +18,7 @@ build_script:
1818

1919
test_script:
2020
- cmd: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=\"json,opencover\" /p:CoverletOutput=\"TestResults/\" --test-adapter-path:. --logger:\"nunit\"
21+
- cmd: dotnet test -c NetFramework
2122

2223
after_test:
2324
- cmd: dotnet-sonarscanner end /d:"sonar.login=%SONARCLOUD_SECRET_KEY%"

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ solution: CSF.ORM.sln
33

44
jobs:
55
include:
6-
- dotnet: 2.2.207
6+
- dotnet: 3.1.403
77
mono: latest
88

99
script:
1010
- dotnet build
1111
- dotnet test
12+
- dotnet test -c NetFramework

‎.vscode/tasks.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "shell",
8+
"args": [
9+
"build",
10+
"/property:GenerateFullPaths=true",
11+
"/consoleloggerparameters:NoSummary"
12+
],
13+
"group": {
14+
"kind": "build",
15+
"isDefault": true
16+
},
17+
"presentation": {
18+
"reveal": "silent"
19+
},
20+
"problemMatcher": "$msCompile"
21+
},
22+
{
23+
"label": "test",
24+
"command": "dotnet",
25+
"type": "shell",
26+
"args": [
27+
"test",
28+
"/property:GenerateFullPaths=true"
29+
],
30+
"group": {
31+
"kind": "test",
32+
"isDefault": true
33+
},
34+
"problemMatcher": "$msCompile"
35+
}
36+
{
37+
"label": "test with .NET Framework 4.7.2",
38+
"command": "dotnet",
39+
"type": "shell",
40+
"args": [
41+
"test",
42+
"/property:GenerateFullPaths=true",
43+
"-c:NetFramework"
44+
],
45+
"group": "test",
46+
"problemMatcher": "$msCompile"
47+
}
48+
]
49+
}

‎CSF.Entities/CSF.Entities.csproj‎

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

3-
<PropertyGroup Condition="'$(Configuration)' != 'Debug_SingleTarget'">
4-
<TargetFrameworks>netstandard2.0;net45;netcoreapp2.0</TargetFrameworks>
5-
</PropertyGroup>
6-
<PropertyGroup Condition="'$(Configuration)' == 'Debug_SingleTarget'">
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
</PropertyGroup>
93
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
105
<PackageId>CSF.Entities</PackageId>
116
<Authors>craigfowler</Authors>
127
<Title>Entity &amp; identity types</Title>
@@ -30,12 +25,10 @@
3025
<DebugType></DebugType>
3126
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.Entities.xml</DocumentationFile>
3227
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_SingleTarget|AnyCPU' ">
34-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.Entities.xml</DocumentationFile>
35-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
36-
</PropertyGroup>
3728

38-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
29+
<ItemGroup>
30+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
31+
</ItemGroup>
3932

4033
<ItemGroup>
4134
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">

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

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

3-
4-
<PropertyGroup Condition="'$(Configuration)' != 'Debug_SingleTarget'">
5-
<TargetFrameworks>netstandard2.0;net45;netcoreapp2.0</TargetFrameworks>
6-
</PropertyGroup>
7-
<PropertyGroup Condition="'$(Configuration)' == 'Debug_SingleTarget'">
8-
<TargetFramework>netstandard2.0</TargetFramework>
9-
</PropertyGroup>
10-
113
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
125
<PackageId>CSF.ORM.Entities</PackageId>
136
<Authors>craigfowler</Authors>
147
<Title>ORM abstractions: Entity integration</Title>
@@ -25,7 +18,9 @@
2518
<RootNamespace>CSF.ORM</RootNamespace>
2619
</PropertyGroup>
2720

28-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
23+
</ItemGroup>
2924

3025
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3126
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.Entities.xml</DocumentationFile>
@@ -35,10 +30,6 @@
3530
<DebugType></DebugType>
3631
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.Entities.xml</DocumentationFile>
3732
</PropertyGroup>
38-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_SingleTarget|AnyCPU' ">
39-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.Entities.xml</DocumentationFile>
40-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
41-
</PropertyGroup>
4233
<ItemGroup>
4334
<ProjectReference Include="..\CSF.Entities\CSF.Entities.csproj" />
4435
<ProjectReference Include="..\CSF.ORM\CSF.ORM.csproj" />

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup Condition="'$(Configuration)' != 'Debug_SingleTarget'">
4-
<TargetFrameworks>netstandard2.0;net45;net461;netcoreapp2.0</TargetFrameworks>
5-
</PropertyGroup>
6-
<PropertyGroup Condition="'$(Configuration)' == 'Debug_SingleTarget'">
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
</PropertyGroup>
9-
102
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45;net461</TargetFrameworks>
114
<IsPackable>false</IsPackable>
125
<ReleaseVersion>3.0.0</ReleaseVersion>
136
<Version>$(ReleaseVersion)</Version>
@@ -24,25 +17,16 @@
2417
<DebugType></DebugType>
2518
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate.Common.xml</DocumentationFile>
2619
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_SingleTarget|AnyCPU' ">
28-
<DebugSymbols>true</DebugSymbols>
29-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate.Common.xml</DocumentationFile>
30-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
31-
</PropertyGroup>
3220

33-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
23+
</ItemGroup>
3424

3525
<ItemGroup>
3626
<Reference Include="System.Runtime" Condition="$(TargetFramework.StartsWith('net4'))" />
3727
<Reference Include="System.Configuration" Condition="$(TargetFramework.StartsWith('net4'))" />
3828
</ItemGroup>
3929
<ItemGroup>
40-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
41-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" Condition="$(TargetFramework) == 'netstandard2.0'" />
42-
<PackageReference Include="System.Security.Permissions" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
43-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'">
44-
<NoWarn>NU1701</NoWarn>
45-
</PackageReference>
4630
<PackageReference Include="NHibernate" Version="4.0.0.4000">
4731
<NoWarn>NU1701</NoWarn>
4832
</PackageReference>

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup Condition="'$(Configuration)' != 'Debug_SingleTarget'">
4-
<TargetFrameworks>netstandard2.0;net45;netcoreapp2.0</TargetFrameworks>
5-
</PropertyGroup>
6-
<PropertyGroup Condition="'$(Configuration)' == 'Debug_SingleTarget'">
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
</PropertyGroup>
9-
102
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
114
<PackageId>CSF.ORM.NHibernate4</PackageId>
125
<Authors>craigfowler</Authors>
136
<Title>ORM abstractions: Implementation for NHibernate 4</Title>
@@ -34,12 +27,10 @@
3427
<DebugType></DebugType>
3528
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate4.xml</DocumentationFile>
3629
</PropertyGroup>
37-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_SingleTarget|AnyCPU' ">
38-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate4.xml</DocumentationFile>
39-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
40-
</PropertyGroup>
4130

42-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
33+
</ItemGroup>
4334

4435
<ItemGroup>
4536
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">
@@ -61,12 +52,6 @@
6152
<Reference Include="System.Configuration" Condition="$(TargetFramework.StartsWith('net4'))" />
6253
</ItemGroup>
6354
<ItemGroup>
64-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
65-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" Condition="$(TargetFramework) == 'netstandard2.0'" />
66-
<PackageReference Include="System.Security.Permissions" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
67-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'">
68-
<NoWarn>NU1701</NoWarn>
69-
</PackageReference>
7055
<PackageReference Include="NHibernate" Version="4.0.0.4000">
7156
<NoWarn>NU1701</NoWarn>
7257
</PackageReference>

‎CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.nuspec‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,18 @@
1111
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
1212
<projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
1313
<description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</description>
14-
<copyright>Copyright 2020 - CSF Software Limited</copyright>
14+
<copyright>Copyright 2021 - CSF Software Limited</copyright>
1515
<repository url="https://github.com/csf-dev/CSF.ORM" />
1616
<dependencies>
1717
<group targetFramework=".NETFramework4.5">
1818
<dependency id="CSF.ORM" version="[3.0.0,4.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="[3.0.0,4.0.0)" />
24-
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
2519
<dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
2620
</group>
2721
<group targetFramework=".NETStandard2.0">
2822
<dependency id="CSF.ORM" version="[3.0.0,4.0.0)" />
29-
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
3023
<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" />
3524
</group>
3625
</dependencies>
37-
<frameworkAssemblies>
38-
<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.5" />
39-
</frameworkAssemblies>
4026
</metadata>
4127
<files>
4228
<file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup Condition="'$(Configuration)' != 'Debug_SingleTarget'">
4-
<TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
5-
</PropertyGroup>
6-
<PropertyGroup Condition="'$(Configuration)' == 'Debug_SingleTarget'">
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
</PropertyGroup>
9-
102
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
114
<PackageId>CSF.ORM.NHibernate5</PackageId>
125
<Authors>craigfowler</Authors>
136
<Title>ORM abstractions: Implementation for NHibernate 5</Title>
@@ -34,12 +27,10 @@
3427
<DebugType></DebugType>
3528
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate5.xml</DocumentationFile>
3629
</PropertyGroup>
37-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_SingleTarget|AnyCPU' ">
38-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.NHibernate5.xml</DocumentationFile>
39-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
40-
</PropertyGroup>
4130

42-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
33+
</ItemGroup>
4334

4435
<ItemGroup>
4536
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">
@@ -61,12 +52,6 @@
6152
<Reference Include="System.Configuration" Condition="$(TargetFramework.StartsWith('net4'))" />
6253
</ItemGroup>
6354
<ItemGroup>
64-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
65-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" Condition="$(TargetFramework) == 'netstandard2.0'" />
66-
<PackageReference Include="System.Security.Permissions" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
67-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" Condition="$(TargetFramework) == 'netstandard2.0'">
68-
<NoWarn>NU1701</NoWarn>
69-
</PackageReference>
7055
<PackageReference Include="NHibernate" Version="5.0.0">
7156
<NoWarn>NU1701</NoWarn>
7257
</PackageReference>

‎CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.nuspec‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,18 @@
1111
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
1212
<projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
1313
<description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</description>
14-
<copyright>Copyright 2020 - CSF Software Limited</copyright>
14+
<copyright>Copyright 2021 - CSF Software Limited</copyright>
1515
<repository url="https://github.com/csf-dev/CSF.ORM" />
1616
<dependencies>
1717
<group targetFramework=".NETFramework4.6.1">
1818
<dependency id="CSF.ORM" version="[3.0.0,4.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="[3.0.0,4.0.0)" />
24-
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
2519
<dependency id="NHibernate" version="[5.0.0,6.0.0)" />
2620
</group>
2721
<group targetFramework=".NETStandard2.0">
2822
<dependency id="CSF.ORM" version="[3.0.0,4.0.0)" />
29-
<dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
3023
<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" />
3524
</group>
3625
</dependencies>
37-
<frameworkAssemblies>
38-
<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.6.1" />
39-
</frameworkAssemblies>
4026
</metadata>
4127
<files>
4228
<file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />

0 commit comments

Comments
 (0)