Commit 6c78a5bb authored by Nick Craver's avatar Nick Craver

Bash build: fix test runner on OS X

Note: no tests pass because there’s no integrated security option (or
widely available SQL server) on OS X at the moment. But the build and
test runners are up and going.
parent 84a8522a
...@@ -27,11 +27,10 @@ ...@@ -27,11 +27,10 @@
"../Dapper.Tests/XunitSkippable.cs", "../Dapper.Tests/XunitSkippable.cs",
"../Dapper/TypeExtensions.cs" "../Dapper/TypeExtensions.cs"
], ],
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"emitEntryPoint": true, "emitEntryPoint": true,
"debugType": "full" "debugType": "portable"
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
...@@ -101,6 +100,7 @@ ...@@ -101,6 +100,7 @@
} }
}, },
"runtimes": { "runtimes": {
"win7-x64": { } "win7-x64": { },
"osx.10.11-x64": {}
} }
} }
\ No newline at end of file
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"emitEntryPoint": true, "emitEntryPoint": true,
"debugType": "full" "debugType": "portable"
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
} }
}, },
"runtimes": { "runtimes": {
"win7-x64": { } "win7-x64": { },
"osx.10.11-x64": {}
} }
} }
\ No newline at end of file
...@@ -34,8 +34,6 @@ sed -i '' "s/99.99.99-rc2/1.0.0-$BuildSemanticVersion/g" */*/project.json ...@@ -34,8 +34,6 @@ sed -i '' "s/99.99.99-rc2/1.0.0-$BuildSemanticVersion/g" */*/project.json
# Restore packages and build product # Restore packages and build product
dotnet restore -v Minimal # Restore all packages dotnet restore -v Minimal # Restore all packages
dotnet pack "Dapper" --configuration Release --output "artifacts/packages"
dotnet pack "Dapper.Contrib" --configuration Release --output "artifacts/packages"
# Build all # Build all
# Note the exclude: https://github.com/dotnet/cli/issues/1342 # Note the exclude: https://github.com/dotnet/cli/issues/1342
...@@ -43,7 +41,7 @@ for d in Dapper*/; do ...@@ -43,7 +41,7 @@ for d in Dapper*/; do
if [ "$d" != "*.EntityFramework.StrongName" ]; then if [ "$d" != "*.EntityFramework.StrongName" ]; then
echo "Building $d" echo "Building $d"
pushd "$d" pushd "$d"
dotnet build dotnet build -f netstandard1.3
popd popd
fi fi
done done
...@@ -52,7 +50,7 @@ done ...@@ -52,7 +50,7 @@ done
for d in *.Tests*/; do for d in *.Tests*/; do
echo "Testing $d" echo "Testing $d"
pushd "$d" pushd "$d"
dotnet test dotnet test -f netcoreapp1.0
popd popd
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment