Tweaked build scripts

Author: bastianeicher

src/build.sh

@@ -2,4 +2,12 @@
 set -e
 cd `dirname $0`
 
-dotnet msbuild -v:Quiet -t:Restore -t:Build -p:Configuration=Release -p:Version=${1:-1.0-dev}
+# Find dotnet
+if command -v dotnet > /dev/null 2> /dev/null; then
+    dotnet="dotnet"
+else
+    dotnet="../0install.sh run --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml"
+fi
+
+# Build
+$dotnet msbuild -v:Quiet -t:Restore -t:Build -p:Configuration=Release -p:Version=${1:-1.0.0-pre}

src/test.sh

@@ -9,5 +9,5 @@ else
     dotnet="../0install.sh run --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml"
 fi
 
-# Unit tests (without .NET Framework)
-$dotnet test --no-build --logger junit --configuration Release --framework netcoreapp3.1 UnitTests/UnitTests.csproj
+# Unit tests
+$dotnet test --no-build --logger junit --configuration Release UnitTests/UnitTests.csproj

template/MyServiceBroker.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenServiceBroker.Server" Version="0.4.0" />
+    <PackageReference Include="OpenServiceBroker.Server" Version="1.0-dev" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.6.3" />

template/build.ps1

@@ -1,16 +1,22 @@
-Param ([string]$Version = "0.1-dev")
+Param ($Version = "1.0-dev")
 $ErrorActionPreference = "Stop"
 pushd $PSScriptRoot
 
+function Run-DotNet {
+    if (Get-Command dotnet -ErrorAction SilentlyContinue) {
+        dotnet @args
+    } else {
+        ..\0install.ps1 run --batch --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml @args
+    }
+    if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
+}
+
 # Keep template and library version in-sync
-dotnet add MyServiceBroker.csproj package OpenServiceBroker.Server --version $Version
-if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
-dotnet build MyServiceBroker.csproj
-if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
+Run-DotNet add MyServiceBroker.csproj package OpenServiceBroker.Server --version $Version
+Run-DotNet build MyServiceBroker.csproj
 
 # Generate template NuGet package
-dotnet restore .template.csproj
-dotnet msbuild .template.csproj -v:Quiet -t:Pack -p:Configuration=Release -p:Version=$Version
-if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
+Run-DotNet restore .template.csproj
+Run-DotNet msbuild .template.csproj /v:Quiet /t:Pack /p:Configuration=Release /p:Version=$Version
 
 popd

template/build.sh

@@ -1,7 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 cd `dirname $0`
 
+# Find dotnet
+if command -v dotnet > /dev/null 2> /dev/null; then
+    dotnet="dotnet"
+else
+    dotnet="../0install.sh run --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml"
+fi
+
 # Keep template and library version in-sync
 dotnet add MyServiceBroker.csproj package OpenServiceBroker.Server --version ${1:-1.0-dev}
 dotnet build MyServiceBroker.csproj