Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ nuget-packages/
*.userprefs
add.sh
.gitignore
src/packages/
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
language: objective-c

env:
global:
- EnableNuGetPackageRestore=true
matrix:
- MONO_VERSION="3.12.1"

before_install:
- wget "http://download.mono-project.com/archive/${MONO_VERSION}/macos-10-x86/MonoFramework-MDK-${MONO_VERSION}.macos10.xamarin.x86.pkg"
- sudo installer -pkg "MonoFramework-MDK-${MONO_VERSION}.macos10.xamarin.x86.pkg" -target /

before_script:
- pwd
- ls

script:
- ./build.sh

after_success:
- ./runTests.sh
2 changes: 2 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export EnableNuGetPackageRestore=true
xbuild ./src/NServiceKit.OrmLite.sln /p:TargetFramework=net40 /p:Configuration=Release
Binary file added lib/tests/nunit-console-runner.dll
Binary file not shown.
31 changes: 31 additions & 0 deletions lib/tests/nunit-console-x86.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
The .NET 2.0 build of the console runner only
runs under .NET 2.0 or higher. The setting
useLegacyV2RuntimeActivationPolicy only applies
under .NET 4.0 and permits use of mixed mode
assemblies, which would otherwise not load
correctly.
-->
<startup useLegacyV2RuntimeActivationPolicy="true">
<!-- Comment out the next line to force use of .NET 4.0 -->
<supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0.30319" />
</startup>

<runtime>
<!-- Ensure that test exceptions don't crash NUnit -->
<legacyUnhandledExceptionPolicy enabled="1" />

<!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
<loadFromRemoteSources enabled="true" />

<!-- Look for addins in the addins directory for now -->
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="lib;addins"/>
</assemblyBinding>

</runtime>

</configuration>
Binary file added lib/tests/nunit-console.exe
Binary file not shown.
31 changes: 31 additions & 0 deletions lib/tests/nunit-console.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
The .NET 2.0 build of the console runner only
runs under .NET 2.0 or higher. The setting
useLegacyV2RuntimeActivationPolicy only applies
under .NET 4.0 and permits use of mixed mode
assemblies, which would otherwise not load
correctly.
-->
<startup useLegacyV2RuntimeActivationPolicy="true">
<!-- Comment out the next line to force use of .NET 4.0 -->
<supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0.30319" />
</startup>

<runtime>
<!-- Ensure that test exceptions don't crash NUnit -->
<legacyUnhandledExceptionPolicy enabled="1" />

<!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
<loadFromRemoteSources enabled="true" />

<!-- Look for addins in the addins directory for now -->
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="lib;addins"/>
</assemblyBinding>

</runtime>

</configuration>
Binary file added lib/tests/nunit.core.dll
Binary file not shown.
Binary file added lib/tests/nunit.core.interfaces.dll
Binary file not shown.
Binary file added lib/tests/nunit.framework.extensions.dll
Binary file not shown.
Binary file added lib/tests/nunit.util.dll
Binary file not shown.
10 changes: 10 additions & 0 deletions nunit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
runTest(){
mono lib/tests/nunit-console.exe -noxml -nodots -labels -stoponerror $@
if [ $? -ne 0 ]
then
exit 1
fi
}

runTest $1 -exclude=Integration,Performance
exit $?
11 changes: 11 additions & 0 deletions runTests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
./nunit.sh ./tests/NServiceKit.OrmLite.Tests/bin/Release/NServiceKit.OrmLite.Tests.dll /noshadow
./nunit.sh ./tests/NServiceKit.OrmLite.FirebirdTests/bin/Release/NServiceKit.OrmLite.FirebirdTests.dll /noshadow
./nunit.sh ./tests/NServiceKit.OrmLite.Sqlite32Tests/bin/Release/NServiceKit.OrmLite.Sqlite32Tests.dll /noshadow
./nunit.sh ./tests/NServiceKit.OrmLite.Sqlite64Tests/bin/Release/NServiceKit.OrmLite.Sqlite64Tests.dll /noshadow
./nunit.sh ./tests/NServiceKit.OrmLite.TestsPerf/bin/Release/NServiceKit.OrmLite.TestsPerf.exe /noshadow






Binary file added src/.nuget/Microsoft.Build.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="MySql.Data">
<HintPath>..\..\lib\mysql.data.dll</HintPath>
<HintPath>..\..\lib\MySql.Data.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@
<Name>NServiceKit.OrmLite</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
6 changes: 3 additions & 3 deletions src/dapper-dot-net/EntityFramework/Model.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/dapper-dot-net/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using System.Text;
using System.Diagnostics;
using System.Data.SqlClient;
using System.Data.Metadata.Edm;
using System.Data.Entity.Core.Metadata.Edm;
using System.Reflection;
using System.Data.EntityClient;
using System.Data.Entity.Core.EntityClient;
using System.Data.Linq;
using NServiceKit.DataAnnotations;

Expand Down
10 changes: 9 additions & 1 deletion src/dapper-dot-net/SqlMapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
Expand All @@ -46,6 +45,13 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<ItemGroup>
<Compile Include="EntityFramework\Model.Designer.cs">
Expand Down Expand Up @@ -86,6 +92,8 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
Expand Down
4 changes: 4 additions & 0 deletions src/dapper-dot-net/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.3" targetFramework="net40" />
</packages>
13 changes: 13 additions & 0 deletions wercker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
box: floydpink/mono@0.0.6
build:
steps:
# A comment
- script:
name: Build!
code: |-
./build.sh
after-steps:
- script:
name: Test!
code: |-
./runTests.sh