Skip to content

Commit c4332b9

Browse files
maca88maca88
committed
Added nant build files and fixed appveyor
1 parent 86e67c0 commit c4332b9

File tree

8 files changed

+98
-4
lines changed

8 files changed

+98
-4
lines changed

‎NHibernate.Caches.Common.Tests/NHibernate.Caches.Common.Tests.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,20 @@
99
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
1010
<DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
1111
</PropertyGroup>
12+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
13+
<OutputType>Exe</OutputType>
14+
<GenerateProgramFile>false</GenerateProgramFile>
15+
</PropertyGroup>
1216
<ItemGroup>
1317
<PackageReference Include="NUnit" Version="3.9.0" />
1418
</ItemGroup>
1519
<ItemGroup>
1620
<PackageReference Include="NHibernate" Version="5.1.0" />
1721
<PackageReference Include="NSubstitute" Version="3.1.0" />
1822
</ItemGroup>
23+
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
24+
<PackageReference Include="NUnitLite" Version="3.9.0" />
25+
</ItemGroup>
1926
<ItemGroup>
2027
<ProjectReference Include="..\NHibernate.Caches.Common\NHibernate.Caches.Common.csproj" />
2128
</ItemGroup>

‎NHibernate.Caches.Common.Tests/Program.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#if !NETFX
2+
namespace NHibernate.Caches.Common.Tests
3+
{
4+
public class Program
5+
{
6+
public static int Main(string[] args)
7+
{
8+
return new NUnitLite.AutoRun(typeof(Program).Assembly).Execute(args);
9+
}
10+
}
11+
}
12+
#endif

‎NHibernate.Caches.Common/NHibernate.Caches.Common.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<None Include="..\NHibernate.Caches.snk" Link="NHibernate.snk" />
17+
<None Include="default.build" Link="default.build" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<PackageReference Include="NHibernate" Version="5.1.0" />

‎NHibernate.Caches.Common/default.build‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
<project
3+
name="NHibernate.Caches.Commmon"
4+
default="common.compile-all"
5+
description="Common types of NHibernate.Caches providers."
6+
xmlns="http://nant.sf.net/release/0.85/nant.xsd">
7+
8+
<property name="root.dir" value=".." />
9+
<include buildfile="${root.dir}/buildcommon.xml" />
10+
11+
<target name="prepare-bin-pack-specific" />
12+
13+
<!-- .Net Core projects are released only through NuGet -->
14+
<target name="bin-pack" />
15+
16+
<target name="test" depends="init">
17+
<property name="test.project" value="" />
18+
<property name="test.file" value="NHibernate.Caches.Common.Tests" />
19+
<call target="common.run-tests" />
20+
<call target="common.run-core-tests" />
21+
</target>
22+
23+
<target name="clean">
24+
<property name="clean.project" value="Common" />
25+
<delete dir="${root.dir}/NHibernate.Caches.${clean.project}/bin" failonerror="false" />
26+
<delete dir="${root.dir}/NHibernate.Caches.${clean.project}/obj" failonerror="false" />
27+
<delete dir="${root.dir}/NHibernate.Caches.${clean.project}.Tests/bin" failonerror="false" />
28+
<delete dir="${root.dir}/NHibernate.Caches.${clean.project}.Tests/obj" failonerror="false" />
29+
</target>
30+
</project>

‎Util/NHibernate.Caches.Util.JsonSerializer/NHibernate.Caches.Util.JsonSerializer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
17+
<None Include="..\default.build" Link="default.build" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<ProjectReference Include="..\..\NHibernate.Caches.Common\NHibernate.Caches.Common.csproj" />

‎Util/default.build‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
<project
3+
name="NHibernate.Caches.Util.JsonSerializer"
4+
default="common.compile-all"
5+
description="Json.NET serializer for distributed NHibernate.Caches providers."
6+
xmlns="http://nant.sf.net/release/0.85/nant.xsd">
7+
8+
<property name="root.dir" value=".." />
9+
<include buildfile="${root.dir}/buildcommon.xml" />
10+
11+
<target name="prepare-bin-pack-specific" />
12+
13+
<!-- .Net Core projects are released only through NuGet -->
14+
<target name="bin-pack" />
15+
16+
<target name="test" depends="init">
17+
<property name="test.project" value="Util" />
18+
<property name="test.file" value="NHibernate.Caches.Util.JsonSerializer.Tests" />
19+
<call target="common.run-tests" />
20+
<call target="common.run-core-tests" />
21+
</target>
22+
23+
<target name="clean">
24+
<property name="clean.project" value="Util" />
25+
<delete dir="${root.dir}/${clean.project}/NHibernate.Caches.${clean.project}.JsonSerializer/bin" failonerror="false" />
26+
<delete dir="${root.dir}/${clean.project}/NHibernate.Caches.${clean.project}.JsonSerializer/obj" failonerror="false" />
27+
<delete dir="${root.dir}/${clean.project}/NHibernate.Caches.${clean.project}.JsonSerializer.Tests/bin" failonerror="false" />
28+
<delete dir="${root.dir}/${clean.project}/NHibernate.Caches.${clean.project}.JsonSerializer.Tests/obj" failonerror="false" />
29+
</target>
30+
</project>

‎appveyor.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,18 @@ test_script:
100100
- ps: >-
101101
Invoke-Command -ScriptBlock {
102102
$TestsFailed = $FALSE
103+
$target = If ($env:TESTS -eq 'net') {$env:NETTARGETFX} Else {$env:CORETARGETFX}
104+
$projects = @{}
105+
$projects.Add('Common', "NHibernate.Caches.Common.Tests\bin\$env:CONFIGURATION\$target\NHibernate.Caches.Common.Tests.dll")
106+
$projects.Add('Util.JsonSerializer', "Util\NHibernate.Caches.Util.JsonSerializer.Tests\bin\$env:CONFIGURATION\$target\NHibernate.Caches.Util.JsonSerializer.Tests.dll")
107+
103108
#netFx tests
104109
If ($env:TESTS -eq 'net') {
105-
@('EnyimMemcached', 'Prevalence', 'RtMemoryCache', 'SysCache', 'SysCache2', 'CoreMemoryCache', 'CoreDistributedCache', 'Common', 'Util.JsonSerializer') | ForEach-Object {
106-
nunit3-console (Join-Path $env:APPVEYOR_BUILD_FOLDER "$_\NHibernate.Caches.$_.Tests\bin\$env:CONFIGURATION\$env:NETTARGETFX\NHibernate.Caches.$_.Tests.dll") "--result=$_-NetTestResult.xml;format=AppVeyor"
110+
@('EnyimMemcached', 'Prevalence', 'RtMemoryCache', 'SysCache', 'SysCache2', 'CoreMemoryCache', 'CoreDistributedCache') | ForEach-Object {
111+
$projects.Add($_, "$_\NHibernate.Caches.$_.Tests\bin\$env:CONFIGURATION\$target\NHibernate.Caches.$_.Tests.dll")
112+
}
113+
ForEach ($project in $projects.GetEnumerator()) {
114+
nunit3-console (Join-Path $env:APPVEYOR_BUILD_FOLDER $project.Value) "--result=$($project.Name)-NetTestResult.xml;format=AppVeyor"
107115
If ($LASTEXITCODE -ne 0) {
108116
$TestsFailed = $TRUE
109117
}
@@ -112,8 +120,11 @@ test_script:
112120
113121
#core tests
114122
If ($env:TESTS -eq 'core') {
115-
@('CoreMemoryCache', 'CoreDistributedCache', 'RtMemoryCache', 'Common', 'Util.JsonSerializer') | ForEach-Object {
116-
dotnet (Join-Path $env:APPVEYOR_BUILD_FOLDER "$_\NHibernate.Caches.$_.Tests\bin\$env:CONFIGURATION\$env:CORETARGETFX\NHibernate.Caches.$_.Tests.dll") --labels=before --nocolor "--result=$_-CoreTestResult.xml"
123+
@('CoreMemoryCache', 'CoreDistributedCache', 'RtMemoryCache') | ForEach-Object {
124+
$projects.Add($_, "$_\NHibernate.Caches.$_.Tests\bin\$env:CONFIGURATION\$target\NHibernate.Caches.$_.Tests.dll")
125+
}
126+
ForEach ($project in $projects.GetEnumerator()) {
127+
dotnet (Join-Path $env:APPVEYOR_BUILD_FOLDER $project.Value) --labels=before --nocolor "--result=$($project.Name)-CoreTestResult.xml"
117128
If ($LASTEXITCODE -ne 0) {
118129
$TestsFailed = $TRUE
119130
}

‎default.build‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<include buildfile="${root.dir}/buildcommon.xml" />
88

99
<fileset id="buildfiles.all" basedir=".">
10+
<include name="NHibernate.Caches.Common/default.build" />
11+
<include name="Util/default.build" />
1012
<include name="SysCache/default.build" />
1113
<include name="SysCache2/default.build" />
1214
<include name="SharedCache/default.build" />

0 commit comments

Comments
 (0)