Skip to content

Commit 2054d27

Browse files
committed
Quick fix: Clean up SiteExtensions/build.cmd
- quote all rooted paths - check `%ERRORLEVEL%` after every `CALL` - nits: - add a few more `ECHO` commands - wrap long lines
1 parent 6d0fb73 commit 2054d27

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

src/SiteExtensions/build.cmd

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
11
@ECHO OFF
22
SET RepoRoot=%~dp0..\..
33

4-
ECHO Building Microsoft.AspNetCore.Runtime.SiteExtension
5-
CALL %RepoRoot%\build.cmd -arch x64 -projects %~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj /bl:artifacts/log/SiteExtensions-Runtime-x64.binlog %*
6-
CALL %RepoRoot%\build.cmd -arch x86 -projects %~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj /bl:artifacts/log/SiteExtensions-Runtime-x86.binlog %*
4+
ECHO Building x64 Microsoft.AspNetCore.Runtime.SiteExtension
5+
CALL "%RepoRoot%\build.cmd" -arch x64 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^
6+
/bl:artifacts/log/SiteExtensions-Runtime-x86.binlog %*
7+
IF %ERRORLEVEL% NEQ 0 (
8+
EXIT /b %ErrorLevel%
9+
)
710

11+
ECHO Building x86 Microsoft.AspNetCore.Runtime.SiteExtension
12+
CALL "%RepoRoot%\build.cmd" -arch x86 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^
13+
/bl:artifacts/log/SiteExtensions-Runtime-x86.binlog %*
814
IF %ERRORLEVEL% NEQ 0 (
915
EXIT /b %ErrorLevel%
1016
)
1117

12-
ECHO Building LoggingBranch
13-
REM /p:DisableTransitiveFrameworkReferences=true is needed to prevent SDK from picking up transitive references to Microsoft.AspNetCore.App as framework references https://github.com/dotnet/sdk/pull/3221
14-
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
15-
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
18+
ECHO Building x64 LoggingBranch
19+
REM /p:DisableTransitiveFrameworkReferences=true is needed to prevent SDK from picking up transitive references to
20+
REM Microsoft.AspNetCore.App as framework references https://github.com/dotnet/sdk/pull/3221
21+
CALL "%RepoRoot%\build.cmd" -forceCoreMsbuild -arch x64 -projects "%~dp0LoggingBranch\LB.csproj" ^
22+
/p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
23+
IF %ERRORLEVEL% NEQ 0 (
24+
EXIT /b %ErrorLevel%
25+
)
1626

27+
ECHO Building x86 LoggingBranch
28+
CALL "%RepoRoot%\build.cmd" -forceCoreMsbuild -arch x86 -projects "%~dp0LoggingBranch\LB.csproj" ^
29+
/p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
1730
IF %ERRORLEVEL% NEQ 0 (
1831
EXIT /b %ErrorLevel%
1932
)
2033

2134
ECHO Building Microsoft.AspNetCore.AzureAppServices.SiteExtension
22-
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -projects %~dp0LoggingAggregate\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj /bl:artifacts/log/SiteExtensions-LoggingAggregate.binlog %*
23-
35+
CALL "%RepoRoot%\build.cmd" -forceCoreMsbuild -projects ^
36+
"%~dp0LoggingAggregate\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj" ^
37+
/bl:artifacts/log/SiteExtensions-LoggingAggregate.binlog %*
2438
IF %ERRORLEVEL% NEQ 0 (
2539
EXIT /b %ErrorLevel%
2640
)

0 commit comments

Comments
 (0)