Merge pull request #3167 from valadas/fix-merge-build

Fixes errors with previous build scripts following PB merge
dnnsoftware · Oct 19, 2019 · 0d20aac · 0d20aac
2 parents 6eef816 + 8ee3c08
commit 0d20aac
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 63 deletions.
diff --git a/DNN_Platform.sln b/DNN_Platform.sln
@@ -499,6 +499,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.PersonaBar.Security.Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.PersonaBar.Users.Tests", "Dnn.AdminExperience\Tests\Dnn.PersonaBar.Users.Tests\Dnn.PersonaBar.Users.Tests.csproj", "{15506C01-A730-46B9-8571-99C20226AAE6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{10D11155-ED05-40CB-9644-AD861A6D7096}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScripts", "{622791DE-3AE7-4D54-9E66-2FED9686AA9E}"
+	ProjectSection(SolutionItems) = preProject
+		Dnn.AdminExperience\Build\BuildScripts\CreateSourcePackage.build = Dnn.AdminExperience\Build\BuildScripts\CreateSourcePackage.build
+		Dnn.AdminExperience\Build\BuildScripts\DotNetNuke.build = Dnn.AdminExperience\Build\BuildScripts\DotNetNuke.build
+		Dnn.AdminExperience\Build\BuildScripts\DotNetNuke.MSBuild.Tasks.dll = Dnn.AdminExperience\Build\BuildScripts\DotNetNuke.MSBuild.Tasks.dll
+		Dnn.AdminExperience\Build\BuildScripts\Evoq_Package.build = Dnn.AdminExperience\Build\BuildScripts\Evoq_Package.build
+		Dnn.AdminExperience\Build\BuildScripts\ICSharpCode.SharpZipLib.dll = Dnn.AdminExperience\Build\BuildScripts\ICSharpCode.SharpZipLib.dll
+		Dnn.AdminExperience\Build\BuildScripts\Microsoft.Build.Utilities.dll = Dnn.AdminExperience\Build\BuildScripts\Microsoft.Build.Utilities.dll
+		Dnn.AdminExperience\Build\BuildScripts\Microsoft.Build.Utilities.v3.5.dll = Dnn.AdminExperience\Build\BuildScripts\Microsoft.Build.Utilities.v3.5.dll
+		Dnn.AdminExperience\Build\BuildScripts\Module.build = Dnn.AdminExperience\Build\BuildScripts\Module.build
+		Dnn.AdminExperience\Build\BuildScripts\ModulePackage.targets = Dnn.AdminExperience\Build\BuildScripts\ModulePackage.targets
+		Dnn.AdminExperience\Build\BuildScripts\MSBuild.Community.Tasks.dll = Dnn.AdminExperience\Build\BuildScripts\MSBuild.Community.Tasks.dll
+		Dnn.AdminExperience\Build\BuildScripts\MSBuild.Community.Tasks.Targets = Dnn.AdminExperience\Build\BuildScripts\MSBuild.Community.Tasks.Targets
+		Dnn.AdminExperience\Build\BuildScripts\Package.targets = Dnn.AdminExperience\Build\BuildScripts\Package.targets
+		Dnn.AdminExperience\Build\BuildScripts\SharpZipLib.dll = Dnn.AdminExperience\Build\BuildScripts\SharpZipLib.dll
+		Dnn.AdminExperience\Build\BuildScripts\Variables.build = Dnn.AdminExperience\Build\BuildScripts\Variables.build
+		Dnn.AdminExperience\Build\BuildScripts\Yahoo.Yui.Compressor.dll = Dnn.AdminExperience\Build\BuildScripts\Yahoo.Yui.Compressor.dll
+		Dnn.AdminExperience\Build\BuildScripts\Yahoo.Yui.Compressor.MsBuild.dll = Dnn.AdminExperience\Build\BuildScripts\Yahoo.Yui.Compressor.MsBuild.dll
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Symbols", "Symbols", "{8D99B9CD-004B-4237-8CFE-77CD327B4370}"
+	ProjectSection(SolutionItems) = preProject
+		Dnn.AdminExperience\Build\Symbols\license.txt = Dnn.AdminExperience\Build\Symbols\license.txt
+		Dnn.AdminExperience\Build\Symbols\releaseNotes.txt = Dnn.AdminExperience\Build\Symbols\releaseNotes.txt
+		Dnn.AdminExperience\Build\Symbols\Symbols.dnn = Dnn.AdminExperience\Build\Symbols\Symbols.dnn
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Cloud_Debug|Any CPU = Cloud_Debug|Any CPU
@@ -1968,6 +1997,9 @@ Global
 		{05515510-9979-4424-8D0A-647F32A25FE7} = {8EB4193C-A708-4DA0-9F2A-F5B7599F6F8F}
 		{A64708EF-4972-48A3-B7B9-6B65E47EFE27} = {8EB4193C-A708-4DA0-9F2A-F5B7599F6F8F}
 		{15506C01-A730-46B9-8571-99C20226AAE6} = {8EB4193C-A708-4DA0-9F2A-F5B7599F6F8F}
+		{10D11155-ED05-40CB-9644-AD861A6D7096} = {392B91E8-C85D-4475-A169-1D4E33B06A4A}
+		{622791DE-3AE7-4D54-9E66-2FED9686AA9E} = {10D11155-ED05-40CB-9644-AD861A6D7096}
+		{8D99B9CD-004B-4237-8CFE-77CD327B4370} = {10D11155-ED05-40CB-9644-AD861A6D7096}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46B6A641-57EB-4B19-B199-23E6FC2AB40B}

diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj
@@ -19,7 +19,6 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -110,9 +109,9 @@
     <None Include="editBar\css\SourceCodePro-Regular.ttf.woff" />
     <None Include="editBar\css\SourceCodePro-Semibold.ttf" />
     <None Include="editBar\css\SourceCodePro-Semibold.ttf.woff" />
-    <None Include="Module.build">
+    <Content Include="Module.build">
       <SubType>Designer</SubType>
-    </None>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="01.05.00.txt" />

diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build
@@ -1,18 +1,25 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\..\Dnn_Platform.build" />
-    <Import Project="$(BuildScriptsPath)\Package.Targets" />
-    <Import Project="$(BuildScriptsPath)\Module.Build"/>
+
+  <PropertyGroup>
+    <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\..\Dnn.AdminExperience\Build\BuildScripts</BuildScriptsPath>
+    <WebsitePath>$(MSBuildProjectDirectory)\..\..\..\Website</WebsitePath>
+    <WebsiteBinPath>$(WebsitePath)\bin</WebsiteBinPath>
+    <WebsiteBinProvidersPath>$(WebsitePath)\bin\Providers</WebsiteBinProvidersPath>
+    <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
+  </PropertyGroup>
+
+  <Import Project="$(BuildScriptsPath)\Package.Targets" />
+  <Import Project="$(BuildScriptsPath)\Module.Build"/>
 
-    <PropertyGroup>
-        <Extension>zip</Extension>
-        <DNNFileName>Dnn.EditBar.UI</DNNFileName>
-        <PackageName>Dnn.EditBar.UI</PackageName>
-        <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.EditBar</ModuleFolderName>
-        <ResourceZipWorkingDirectory>$(MSBuildProjectDirectory)\Package\Resources\editBar</ResourceZipWorkingDirectory>
-    </PropertyGroup>
-
+  <PropertyGroup>
+    <Extension>zip</Extension>
+    <DNNFileName>Dnn.EditBar.UI</DNNFileName>
+    <PackageName>Dnn.EditBar.UI</PackageName>
+    <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.EditBar</ModuleFolderName>
+    <ResourceZipWorkingDirectory>$(MSBuildProjectDirectory)\Package\Resources\editBar</ResourceZipWorkingDirectory>
+  </PropertyGroup>
 
-    <Target Name="GetFiles">
+  <Target Name="GetFiles">
     <ItemGroup>
       <EditBar-views Include=".\editBar\*.html" />
       <EditBar-images Include=".\editBar\images\**\*" />
@@ -23,21 +30,21 @@
       <Resources Include="@(EditBar-views);@(EditBar-images);@(EditBar-css);@(EditBar-scripts);@(EditBar-resources);@(EditBar-moduleResources)" />
     </ItemGroup>
   </Target>
-    
-    <Target Name="CopyBin">
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.dll" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.pdb" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.xml" DestinationFolder="$(WebsitePath)/bin" />
-    </Target>
-    <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <Copy SourceFiles="@(EditBar-views)" DestinationFolder="$(ModuleFolderName)" />
-        <Copy SourceFiles="@(EditBar-resources)" DestinationFolder="$(ModuleFolderName)\App_LocalResources" />
-        <Copy SourceFiles="@(EditBar-images)" DestinationFolder="$(ModuleFolderName)\Images" />
-        <Copy SourceFiles="@(EditBar-scripts)" DestinationFolder="$(ModuleFolderName)\Scripts" />
-        <Copy SourceFiles="@(EditBar-css)" DestinationFolder="$(ModuleFolderName)\Css" />
-        <Copy SourceFiles="@(EditBar-moduleResources)" DestinationFolder="$(ModuleFolderName)\Resources" />
+
+  <Target Name="CopyBin">
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.dll" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.pdb" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.EditBar.Library.xml" DestinationFolder="$(WebsitePath)/bin" />
+  </Target>
+  <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Copy SourceFiles="@(EditBar-views)" DestinationFolder="$(ModuleFolderName)" />
+    <Copy SourceFiles="@(EditBar-resources)" DestinationFolder="$(ModuleFolderName)\App_LocalResources" />
+    <Copy SourceFiles="@(EditBar-images)" DestinationFolder="$(ModuleFolderName)\Images" />
+    <Copy SourceFiles="@(EditBar-scripts)" DestinationFolder="$(ModuleFolderName)\Scripts" />
+    <Copy SourceFiles="@(EditBar-css)" DestinationFolder="$(ModuleFolderName)\Css" />
+    <Copy SourceFiles="@(EditBar-moduleResources)" DestinationFolder="$(ModuleFolderName)\Resources" />
   </Target>
 </Project>
diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build
@@ -1,18 +1,22 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-	<BuildScriptsPath>$(SolutionDir)\Build\BuildScripts</BuildScriptsPath>
-    <WebsitePath>$(SolutionDir)\Website</WebsitePath>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+	<BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\..\Build\BuildScripts</BuildScriptsPath>
+</PropertyGroup>
+
+  <Import Project="$(BuildScriptsPath)\Package.targets" />
+  <Import Project="$(BuildScriptsPath)\Module.build"/>
+
+<PropertyGroup>
+    <WebsitePath>$(MSBuildProjectDirectory)\..\..\..\..\Website</WebsitePath>
     <WebsiteBinPath>$(WebsitePath)\bin</WebsiteBinPath>
     <WebsiteBinProvidersPath>$(WebsitePath)\bin\Providers</WebsiteBinProvidersPath>
-    <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
-    <Extension>zip</Extension>
-    <DNNFileName>Dnn.PersonaBar.Extensions</DNNFileName>
-    <PackageName>Dnn.PersonaBar.Extensions</PackageName>
-    <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar\Modules\</ModuleFolderName>
-	<YarnWorkingDirectory>..\..\..\package.json</YarnWorkingDirectory>
-  </PropertyGroup>
-
-  <Import Project="$(BuildScriptsPath)\Package.Targets" />
-  <Import Project="$(BuildScriptsPath)\Module.Build"/>
+    <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
+    <Extension>zip</Extension>
+    <DNNFileName>Dnn.PersonaBar.Extensions</DNNFileName>
+    <PackageName>Dnn.PersonaBar.Extensions</PackageName>
+    <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar\Modules\</ModuleFolderName>
+	<YarnWorkingDirectory>..\..\..\package.json</YarnWorkingDirectory>
+  </PropertyGroup>
+
 </Project>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build
@@ -1,20 +1,24 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\..\Dnn_Platform.build" />
-    <PropertyGroup>
-        <Extension>zip</Extension>
-        <DNNFileName>Dnn.PersonaBar.UI</DNNFileName>
-        <PackageName>Dnn.PersonaBar.UI</PackageName>
-        <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar</ModuleFolderName>
-    </PropertyGroup>
-    <Import Project="$(BuildScriptsPath)\Package.Targets" />
-    <Import Project="$(BuildScriptsPath)\Module.Build"/>
+  <PropertyGroup>
+    <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\Build\BuildScripts</BuildScriptsPath>
+    <WebsitePath>$(MSBuildProjectDirectory)\..\..\..\Website</WebsitePath>
+    <WebsiteBinPath>$(WebsitePath)\bin</WebsiteBinPath>
+    <WebsiteBinProvidersPath>$(WebsitePath)\bin\Providers</WebsiteBinProvidersPath>
+    <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
+    <Extension>zip</Extension>
+    <DNNFileName>Dnn.PersonaBar.UI</DNNFileName>
+    <PackageName>Dnn.PersonaBar.UI</PackageName>
+    <ModuleFolderName>$(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar</ModuleFolderName>
+  </PropertyGroup>
+  <Import Project="$(BuildScriptsPath)\Package.targets" />
+  <Import Project="$(BuildScriptsPath)\Module.build"/>
 
-    <Target Name="CopyBin">
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.dll" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.pdb" DestinationFolder="$(WebsitePath)/bin" />
-        <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.xml" DestinationFolder="$(WebsitePath)/bin" />
-    </Target>
+  <Target Name="CopyBin">
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.dll" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.pdb" DestinationFolder="$(WebsitePath)/bin" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.PersonaBar.Library.xml" DestinationFolder="$(WebsitePath)/bin" />
+  </Target>
 </Project>