From 66ecdab542054fc96f102963332e317007d4c437 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 6 Jan 2020 08:39:56 -0800
Subject: [PATCH] Ensure $(Configuration) is evaluated prior to using it
 (#18113)

Fixes https://github.com/aspnet/AspNetCore/issues/12779
---
 src/Components/Blazor/Build/src/targets/All.props   | 6 ------
 src/Components/Blazor/Build/src/targets/All.targets | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Components/Blazor/Build/src/targets/All.props b/src/Components/Blazor/Build/src/targets/All.props
index 690a29fbab..d1d242f4d9 100644
--- a/src/Components/Blazor/Build/src/targets/All.props
+++ b/src/Components/Blazor/Build/src/targets/All.props
@@ -4,12 +4,6 @@
   <PropertyGroup>
     <DefaultWebContentItemExcludes>$(DefaultWebContentItemExcludes);wwwroot\**</DefaultWebContentItemExcludes>
 
-    <!-- By default, enable auto rebuilds for debug builds. Note that the server will not enable it in production environments regardless. -->
-    <BlazorRebuildOnFileChange Condition="'$(Configuration)' == 'Debug' AND '$(BlazorRebuildOnFileChange)' == ''">true</BlazorRebuildOnFileChange>
-
-    <!-- By default, enable debugging for debug builds. -->
-    <BlazorEnableDebugging Condition="'$(Configuration)' == 'Debug' AND '$(BlazorEnableDebugging)' == ''">true</BlazorEnableDebugging>
-      
     <!-- When using IISExpress with a standalone app, there's no point restarting IISExpress after build. It slows things unnecessarily and breaks in-flight HTTP requests. -->
     <NoRestartServerOnBuild>true</NoRestartServerOnBuild>
   </PropertyGroup>
diff --git a/src/Components/Blazor/Build/src/targets/All.targets b/src/Components/Blazor/Build/src/targets/All.targets
index 6aa60e8227..6c69e85a40 100644
--- a/src/Components/Blazor/Build/src/targets/All.targets
+++ b/src/Components/Blazor/Build/src/targets/All.targets
@@ -13,6 +13,9 @@
 
     <!-- The Blazor build code can only find your referenced assemblies if they are in the output directory -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+
+    <!-- By default, enable debugging for debug builds. -->
+    <BlazorEnableDebugging Condition="'$(Configuration)' == 'Debug' AND '$(BlazorEnableDebugging)' == ''">true</BlazorEnableDebugging>
   </PropertyGroup>
 
   <Import Project="Blazor.MonoRuntime.targets" />