From c7d63649005c4c2863b34794994eef57595e7bb7 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 4 Dec 2018 00:38:28 +0000
Subject: [PATCH] Enable src/Components to build (#4367)

Fix aspnet/AspNetCore-Internal#1443
---
 build/artifacts.props                            | 16 ++++++++--------
 build/buildorder.props                           |  2 +-
 build/submodules.props                           |  2 +-
 .../content/Directory.Build.props                |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index dab708f823..02cb757b6e 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -30,14 +30,14 @@
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" />
 
-    <!-- <PackageArtifact Include="Microsoft.AspNetCore.Blazor.Cli" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Blazor.Templates" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components.Analyzers" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components.Browser" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components.Build" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components.Razor.Extensions" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Components.Server" Category="noship" /> -->
+    <PackageArtifact Include="Microsoft.AspNetCore.Blazor.Cli" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Blazor.Templates" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components.Analyzers" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components.Browser" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components.Build" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components.Razor.Extensions" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Components.Server" Category="ship" />
 
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 9f5da11c61..22106b474e 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -29,7 +29,7 @@
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
-    <!-- <RepositoryBuildOrder Include="Components" Order="17 RootPath="$(RepositoryRoot)src\Components\" /> -->
+    <RepositoryBuildOrder Include="Components" Order="17" RootPath="$(RepositoryRoot)src\Components\" />
     <RepositoryBuildOrder Include="Templating" Order="18" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 070b259dd6..cf131fe697 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -40,7 +40,7 @@
     <Repository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
     <Repository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <Repository Include="BasicMiddleware" />
-    <!-- <Repository Include="Components" RootPath="$(RepositoryRoot)src\Components\" /> -->
+    <Repository Include="Components" RootPath="$(RepositoryRoot)src\Components\" />
     <Repository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
     <Repository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
     <Repository Include="Identity" />
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props
index 817f88a477..0b2b1789a4 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props
@@ -1,4 +1,5 @@
 <!-- Intentionally does not import parent Directory.Build.props file to isolate templates projects from the rest of the repo -->
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\build\dependencies.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\build\sources.props" />
 </Project>