diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51ccdb4..71a693e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: submodules: 'recursive' fetch-depth: 0 - name: Pre-test install - uses: actions/setup-dotnet@v1.8.0 + uses: actions/setup-dotnet@v1.8.1 with: - dotnet-version: '5.0.202' + dotnet-version: '5.0.301' - name: Cache packages uses: actions/cache@v2.1.6 with: diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index 4da534c..edca7f1 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -15,13 +15,13 @@ jobs: submodules: 'recursive' fetch-depth: 0 - name: Pre-build Install - uses: actions/setup-dotnet@v1.8.0 + uses: actions/setup-dotnet@v1.8.1 with: - dotnet-version: '5.0.202' + dotnet-version: '5.0.301' - name: Build package run: scripts\pack - name: Save package - uses: actions/upload-artifact@v2.2.3 + uses: actions/upload-artifact@v2.2.4 with: name: Fornax.Seo.nupkg path: ${{ github.workspace }}/release/*.nupkg @@ -40,9 +40,9 @@ jobs: submodules: 'recursive' fetch-depth: 0 - name: Pre-build Install - uses: actions/setup-dotnet@v1.8.0 + uses: actions/setup-dotnet@v1.8.1 with: - dotnet-version: '5.0.202' + dotnet-version: '5.0.301' - name: Cache packages uses: actions/cache@v2.1.6 with: @@ -56,7 +56,7 @@ jobs: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV echo -e $(scripts/changelog) > release_notes.txt - name: Retrieve package - uses: actions/download-artifact@v2.0.9 + uses: actions/download-artifact@v2.0.10 id: fetch with: name: Fornax.Seo.nupkg diff --git a/example/Fornax.Seo.Example/build b/example/Fornax.Seo.Example/build index 14bbee4..8b20b8d 100755 --- a/example/Fornax.Seo.Example/build +++ b/example/Fornax.Seo.Example/build @@ -3,5 +3,5 @@ FORNAX_CMD=build if [ "$1" = "live" ]; then FORNAX_CMD=watch; fi dotnet tool restore --tool-manifest ../../src/Fornax/.config/dotnet-tools.json dotnet build /v:m ../../src/Fornax/src/Fornax/Fornax.fsproj -o ../bin -c Release -dotnet build /v:m /p:nowarn="3218 3390" -o _lib -c Release +dotnet build /v:m /p:nowarn='"3218;3390"' -o _lib -c Release dotnet ../bin/Fornax.dll $FORNAX_CMD diff --git a/example/Fornax.Seo.Example/build.cmd b/example/Fornax.Seo.Example/build.cmd index f235232..9616476 100644 --- a/example/Fornax.Seo.Example/build.cmd +++ b/example/Fornax.Seo.Example/build.cmd @@ -4,6 +4,6 @@ SET "FORNAX_CMD=build" IF "%1"=="live" ( SET "FORNAX_CMD=watch" ) dotnet tool restore --tool-manifest ../../src/Fornax/.config/dotnet-tools.json dotnet build /v:m ../../src/Fornax/src/Fornax/Fornax.fsproj -o ../bin -c Release -dotnet build /v:m /p:nowarn="3218 3390" -o _lib -c Release +dotnet build /v:m /p:nowarn=\"3218;3390\" -o _lib -c Release dotnet ../bin/Fornax.dll %FORNAX_CMD% ENDLOCAL diff --git a/scripts/ci b/scripts/ci index b471e87..0793de7 100755 --- a/scripts/ci +++ b/scripts/ci @@ -1,5 +1,5 @@ #!/usr/bin/env bash -dotnet test /v:m /p:nowarn="3218 3390" test/Fornax.Seo.Tests/Fornax.Seo.Tests.fsproj +dotnet test /v:m /p:nowarn='"3218;3390"' test/Fornax.Seo.Tests/Fornax.Seo.Tests.fsproj cd example/Fornax.Seo.Example ./build $1 cd ../.. diff --git a/scripts/ci.cmd b/scripts/ci.cmd index 7e99036..3be3aa8 100644 --- a/scripts/ci.cmd +++ b/scripts/ci.cmd @@ -1,5 +1,5 @@ @echo off -dotnet test /v:m /p:nowarn="3218 3390" test/Fornax.Seo.Tests/Fornax.Seo.Tests.fsproj +dotnet test /v:m /p:nowarn=\"3218;3390\" test/Fornax.Seo.Tests/Fornax.Seo.Tests.fsproj cd example\Fornax.Seo.Example build %1 cd ..\.. diff --git a/scripts/gendocs b/scripts/gendocs index 1779e9e..313d77f 100755 --- a/scripts/gendocs +++ b/scripts/gendocs @@ -8,7 +8,7 @@ elif [ "$1" = "live" ]; then SITE_ROOT= fi dotnet tool restore -dotnet build /v:m /p:nowarn="3218 3390" src/Fornax.Seo/Fornax.Seo.fsproj -c Release +dotnet build /v:m /p:nowarn='"3218;3390"' src/Fornax.Seo/Fornax.Seo.fsproj -c Release cp ./README.md docs/index.md dotnet fsdocs $FORNAX_CMD --projects $(pwd)/src/Fornax.Seo/Fornax.Seo.fsproj \ diff --git a/scripts/gendocs.cmd b/scripts/gendocs.cmd index beb4cc0..dec216f 100644 --- a/scripts/gendocs.cmd +++ b/scripts/gendocs.cmd @@ -10,7 +10,7 @@ IF "%1"=="live" ( SET SITE_ROOT= ) dotnet tool restore -dotnet build /v:m /p:nowarn="3218 3390" src/Fornax.Seo/Fornax.Seo.fsproj -c Release +dotnet build /v:m /p:nowarn=\"3218;3390\" src/Fornax.Seo/Fornax.Seo.fsproj -c Release copy README.md docs\index.md dotnet fsdocs %FSDOCS_CMD% --projects %CD%/src/Fornax.Seo/Fornax.Seo.fsproj ^ diff --git a/scripts/pack.cmd b/scripts/pack.cmd index 0b50a11..f561037 100644 --- a/scripts/pack.cmd +++ b/scripts/pack.cmd @@ -21,7 +21,7 @@ IF NOT %ERRORLEVEL% == 0 ( ) dotnet restore src/Fornax.Seo/Fornax.Seo.fsproj -dotnet pack /v:m /p:nowarn="3218 3390" src/Fornax.Seo/Fornax.Seo.fsproj -c Release -o release %BUILD_NUMBER% +dotnet pack /v:m /p:nowarn=\"3218;3390\" src/Fornax.Seo/Fornax.Seo.fsproj -c Release -o release %BUILD_NUMBER% :END ENDLOCAL