Should fix issue with yarn install not firing

dnnsoftware · Sep 30, 2019 · 164594f · 164594f
1 parent d7233b1
commit 164594f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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>
diff --git 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>