From dcad03cf814c93dcc7bae9e16549a37ab66d18f6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sun, 11 Aug 2019 21:59:41 -0700 Subject: [PATCH 1/3] Remove site-extension workarounds One at a time --- src/SiteExtensions/build.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd index af51ba3dd68b..e65aa9845a8e 100644 --- a/src/SiteExtensions/build.cmd +++ b/src/SiteExtensions/build.cmd @@ -10,9 +10,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) ECHO Building LoggingBranch -REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6 -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* +REM Remove /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6 +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% From 3b191aad1cdb215a47a1443f8377e57b2e4ef4ef Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Aug 2019 20:32:14 -0700 Subject: [PATCH 2/3] Debug --- src/SiteExtensions/build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd index e65aa9845a8e..9d0fd644313a 100644 --- a/src/SiteExtensions/build.cmd +++ b/src/SiteExtensions/build.cmd @@ -11,8 +11,8 @@ IF %ERRORLEVEL% NEQ 0 ( ECHO Building LoggingBranch REM Remove /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6 -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% From 71657f1a8037734b05a3f285fc17b84ff3dd22a6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Aug 2019 22:43:29 -0700 Subject: [PATCH 3/3] We need this change --- src/SiteExtensions/build.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd index 9d0fd644313a..a69a02aa7591 100644 --- a/src/SiteExtensions/build.cmd +++ b/src/SiteExtensions/build.cmd @@ -10,9 +10,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) ECHO Building LoggingBranch -REM Remove /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6 -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* -CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* +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 +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* +CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel%