Skip to content
43 changes: 21 additions & 22 deletions dotnet/private/dotnet_format.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,8 @@ DOTNET_DIR="$WORKSPACE_ROOT/dotnet"

cd "$DOTNET_DIR"

echo "Running dotnet format $@ on all projects..."
find "$DOTNET_DIR/src" "$DOTNET_DIR/test" -name "*.csproj" 2>/dev/null | while read -r proj; do
echo " Formatting $proj..."
"$DOTNET" format "$@" "$proj" || exit 1
done || exit 1
echo "Running dotnet format $@ on Selenium.slnx..."
"$DOTNET" format "$@" Selenium.slnx || exit 1

echo "Done."
""".format(
Expand All @@ -76,30 +73,32 @@ def _create_windows_script(ctx, dotnet):
dotnet_runfiles_path = _to_runfiles_path(dotnet.short_path).replace("/", "\\")

script_content = """@echo off
setlocal
setlocal enabledelayedexpansion

set RUNFILES_DIR=%~dp0%~n0.runfiles
set DOTNET=%RUNFILES_DIR%\\{dotnet_path}
rem Resolve runfiles (Windows: <name>.bat.runfiles, Unix: <name>.runfiles)
set "RF_DIR=%~dp0%~nx0.runfiles"
if not exist "!RF_DIR!" set "RF_DIR=%~dp0%~n0.runfiles"

if defined BUILD_WORKSPACE_DIRECTORY (
set WORKSPACE_ROOT=%BUILD_WORKSPACE_DIRECTORY%
) else (
set WORKSPACE_ROOT=%RUNFILES_DIR%\\_main
set "DOTNET=!RF_DIR!\\{dotnet_path}"
if not exist "!DOTNET!" (
echo ERROR: dotnet not found at !DOTNET! 1>&2
exit /b 1
)
set DOTNET_DIR=%WORKSPACE_ROOT%\\dotnet

cd /d "%DOTNET_DIR%"
rem Set DOTNET_ROOT so MSBuild SDK resolver can find the SDK
for %%I in ("!DOTNET!") do set "DOTNET_ROOT=%%~dpI"
set "PATH=!DOTNET_ROOT!;!PATH!"

echo Running dotnet format %* on all projects...
for /r "%DOTNET_DIR%\\src" %%p in (*.csproj) do (
echo Formatting %%p...
"%DOTNET%" format %* "%%p" || exit /b 1
)
for /r "%DOTNET_DIR%\\test" %%p in (*.csproj) do (
echo Formatting %%p...
"%DOTNET%" format %* "%%p" || exit /b 1
set "DOTNET_DIR=%BUILD_WORKSPACE_DIRECTORY%\\dotnet"
cd /d "!DOTNET_DIR!" || (
echo ERROR: Could not cd to !DOTNET_DIR! 1>&2
exit /b 1
)

echo Running dotnet format %* on Selenium.slnx...
"!DOTNET!" format %* Selenium.slnx
if errorlevel 1 exit /b 1

echo Done.
""".format(
dotnet_path = dotnet_runfiles_path,
Expand Down
Loading