1.0.61 preview 2

.github/workflows/default.yml

@@ -12,33 +12,25 @@ on:
       - "dev"
 
 jobs:
-  mac-build:
-    runs-on: macos-latest
+  build:
+    name: Running tests on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
-    - name: build
-      run: bash build.sh
-
-  linux-build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
+          6.x
+          7.x
+          8.x
+    - name: dotnet info
+      run: dotnet --info
     - name: build
-      run: bash build.sh
+      run: bash build.sh --target=test
 
   windows-build:
     runs-on: windows-latest

Directory.Packages.props

@@ -24,7 +24,8 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="FluentAssertions" Version="6.6.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="xunit" Version="2.6.1" />
+    <PackageVersion Include="xunit" Version="2.6.4" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
     <PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.1.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />

azure-pipelines.yml

@@ -36,4 +36,3 @@ steps:
   displayName: 'Powershell Script'
   env:
     Nuget__ApiKey: $(nugetApiKey)
-    Nuget__SourceUrl: $(nugetSourceUrl)

build.ps1

@@ -1,8 +1,5 @@
-[string]$SCRIPT       = '.\build.cake'
-
-# Install cake.tool
-dotnet tool install --global cake.tool
-
-Write-Host "dotnet cake $SCRIPT $ARGS" -ForegroundColor GREEN
+dotnet tool update -g dotnet-execute --prerelease
 
-dotnet cake $SCRIPT $CAKE_ARGS $ARGS
+Write-Host 'dotnet-exec ./build/build.cs "--args=$ARGS"' -ForegroundColor GREEN
+
+dotnet-exec ./build/build.cs --args $ARGS

build.sh

@@ -1,10 +1,7 @@
 #!/bin/sh
-SCRIPT='./build.cake'
 
-# Install cake.tool
-dotnet tool install --global cake.tool
+dotnet tool update -g dotnet-execute --prerelease
 export PATH="$PATH:$HOME/.dotnet/tools"
 
-echo "dotnet cake $SCRIPT $@"
-
-dotnet cake $SCRIPT "$@"
+echo "dotnet-exec ./build/build.cs --args $@"
+dotnet-exec ./build/build.cs --args "$@"