More PR feedback

Author: MackinnonBuck

eng/ProjectReferences.props

@@ -5,7 +5,7 @@
 -->
 <Project>
   <ItemGroup>
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.App.Internal.Assets" ProjectPath="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.App.Internal.Assets.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.App.Internal.Assets" ProjectPath="$(RepoRoot)src\Assets\Microsoft.AspNetCore.App.Internal.Assets.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />

src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj

@@ -6,6 +6,7 @@
     <PackageId>Microsoft.AspNetCore.App.Internal.Assets</PackageId>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
@@ -30,8 +31,8 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Debug'">..\..\Components\Web.JS\dist\Debug</_BlazorJSContentRoot>
-    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Release'">..\..\Components\Web.JS\dist\Release</_BlazorJSContentRoot>
+    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Debug'">$(RepoRoot)src\Components\Web.JS\dist\Debug</_BlazorJSContentRoot>
+    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Release'">$(RepoRoot)src\Components\Web.JS\dist\Release</_BlazorJSContentRoot>
   </PropertyGroup>
 
   <ItemGroup>

src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets

@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.endpoints.targets" />
 
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.debug.targets"
-    Condition="'$(Configuration)' == 'Debug'" />
+    Condition="'$(UseDebugBlazorAssets)' == 'true'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.debug.endpoints.targets"
-    Condition="'$(Configuration)' == 'Debug'"/>
+    Condition="'$(UseDebugBlazorAssets)' == 'true'"/>
 </Project>