Skip to content

Commit

Permalink
Escape quoted list of supressed MSBuild warnings
Browse files Browse the repository at this point in the history
.NET SDK 5.0.300 ships with MSBuild 16.10, which optimizes away the
implicit expansion of quoted property lists [*]:

    FSC : warning FS0203: Invalid warning number '3218 3390'

Fortunately this old (non-portable) workaround still works:

    dotnet/sdk#8792 (comment)

----
[*] dotnet/msbuild#6128
  • Loading branch information
rdipardo committed Jul 5, 2021
1 parent 1d3b854 commit 624c45c
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-test install
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
dotnet-version: '5.0.202'
dotnet-version: '5.0.301'
- name: Cache packages
uses: actions/[email protected]
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-build Install
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
dotnet-version: '5.0.202'
dotnet-version: '5.0.301'
- name: Build package
run: scripts\pack
- name: Save package
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
name: Fornax.Seo.nupkg
path: ${{ github.workspace }}/release/*.nupkg
Expand All @@ -40,9 +40,9 @@ jobs:
submodules: 'recursive'
fetch-depth: 0
- name: Pre-build Install
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
dotnet-version: '5.0.202'
dotnet-version: '5.0.301'
- name: Cache packages
uses: actions/[email protected]
with:
Expand All @@ -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/[email protected].9
uses: actions/[email protected].10
id: fetch
with:
name: Fornax.Seo.nupkg
Expand Down
2 changes: 1 addition & 1 deletion example/Fornax.Seo.Example/build
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion example/Fornax.Seo.Example/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/ci
Original file line number Diff line number Diff line change
@@ -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 ../..
2 changes: 1 addition & 1 deletion scripts/ci.cmd
Original file line number Diff line number Diff line change
@@ -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 ..\..
2 changes: 1 addition & 1 deletion scripts/gendocs
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/gendocs.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^
Expand Down
2 changes: 1 addition & 1 deletion scripts/pack.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 624c45c

Please sign in to comment.