From 164594f52dc5ed1316faea5961633348ec002fc3 Mon Sep 17 00:00:00 2001
From: Daniel Valadas <info@danielvaladas.com>
Date: Mon, 30 Sep 2019 00:40:13 -0400
Subject: [PATCH] Should fix issue with yarn install not firing

---
 Build/BuildScripts/Module.build                     | 2 ++
 Dnn.AdminExperience/Build/BuildScripts/Module.build | 4 ++--
 Packages/repositories.config                        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Build/BuildScripts/Module.build b/Build/BuildScripts/Module.build
index e489b7ef034..5271b8cab3a 100644
--- a/Build/BuildScripts/Module.build
+++ b/Build/BuildScripts/Module.build
@@ -1,4 +1,6 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.props')" />
+  <Import Project="..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.targets')" />
   <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package">
   </Target>
   <Target Name="GetFiles">
diff --git a/Dnn.AdminExperience/Build/BuildScripts/Module.build b/Dnn.AdminExperience/Build/BuildScripts/Module.build
index 82725ebf3c6..86954fc8b01 100644
--- a/Dnn.AdminExperience/Build/BuildScripts/Module.build
+++ b/Dnn.AdminExperience/Build/BuildScripts/Module.build
@@ -43,7 +43,7 @@
   <Target Name="RunYarnWorkspace">
 	  <Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />
 
-	  <Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0 AND !Exists('$(WorkingDirectory)/node_modules')" />
-    <Yarn Command="lerna run build --parallel" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
+	  <Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
+	<Yarn Command="lerna run build --parallel" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Packages/repositories.config b/Packages/repositories.config
index 487e321f6d7..df66bbfcb36 100644
--- a/Packages/repositories.config
+++ b/Packages/repositories.config
@@ -23,5 +23,6 @@
   <repository path="..\DNN Platform\Tests\DotNetNuke.Tests.Utilities\packages.config" />
   <repository path="..\DNN Platform\Tests\DotNetNuke.Tests.Web.Mvc\packages.config" />
   <repository path="..\DNN Platform\Tests\DotNetNuke.Tests.Web\packages.config" />
+  <repository path="..\Dnn.AdminExperience\Extensions\Content\Dnn.PersonaBar.Extensions\packages.config" />
   <repository path="..\Website\packages.config" />
 </repositories>