Merge pull request #5989 from david-poindexter/bulk-install-msbuild

Bulk Install: Resolved various build and watch issues
dnnsoftware · Mar 2, 2024 · 074603e · 074603e
2 parents fe625d4 + c09316e
commit 074603e
Show file tree

Hide file tree

Showing 18 changed files with 134 additions and 166 deletions.
diff --git a/Build/Tasks/SetPackageVersions.cs b/Build/Tasks/SetPackageVersions.cs
@@ -27,6 +27,7 @@ public override void Run(Context context)
             packages.Add(context.GetFiles("./Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json"));
             packages.Add(context.GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/**/_exportables/package.json"));
             packages.Add(context.GetFiles("./DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json"));
+            packages.Add(context.GetFiles("./DNN Platform/Modules/BulkInstall/BulkInstall.Web/package.json"));
             packages.Add(context.GetFiles("./DNN Platform/Skins/Aperture/package.json"));
 
             // Set all package.json in Admin Experience to the current version and to consume the current (local) version of dnn-react-common.

diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components.d.ts b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components.d.ts
@@ -6,56 +6,32 @@
  */
 import { HTMLStencilElement, JSXBase } from "@stencil/core/internal";
 export namespace Components {
-    interface MyComponent {
-        /**
-          * The first name
-         */
-        "first": string;
-        /**
-          * The last name
-         */
-        "last": string;
-        /**
-          * The middle name
-         */
-        "middle": string;
+    interface DnnBulkInstall {
     }
 }
 declare global {
-    interface HTMLMyComponentElement extends Components.MyComponent, HTMLStencilElement {
+    interface HTMLDnnBulkInstallElement extends Components.DnnBulkInstall, HTMLStencilElement {
     }
-    var HTMLMyComponentElement: {
-        prototype: HTMLMyComponentElement;
-        new (): HTMLMyComponentElement;
+    var HTMLDnnBulkInstallElement: {
+        prototype: HTMLDnnBulkInstallElement;
+        new (): HTMLDnnBulkInstallElement;
     };
     interface HTMLElementTagNameMap {
-        "my-component": HTMLMyComponentElement;
+        "dnn-bulk-install": HTMLDnnBulkInstallElement;
     }
 }
 declare namespace LocalJSX {
-    interface MyComponent {
-        /**
-          * The first name
-         */
-        "first"?: string;
-        /**
-          * The last name
-         */
-        "last"?: string;
-        /**
-          * The middle name
-         */
-        "middle"?: string;
+    interface DnnBulkInstall {
     }
     interface IntrinsicElements {
-        "my-component": MyComponent;
+        "dnn-bulk-install": DnnBulkInstall;
     }
 }
 export { LocalJSX as JSX };
 declare module "@stencil/core" {
     export namespace JSX {
         interface IntrinsicElements {
-            "my-component": LocalJSX.MyComponent & JSXBase.HTMLAttributes<HTMLMyComponentElement>;
+            "dnn-bulk-install": LocalJSX.DnnBulkInstall & JSXBase.HTMLAttributes<HTMLDnnBulkInstallElement>;
         }
     }
 }
diff --git a/.../components/my-component/my-component.css → ...ts/dnn-bulk-install/dnn-bulk-install.scss b/.../components/my-component/my-component.css → ...ts/dnn-bulk-install/dnn-bulk-install.scss
diff --git a/.../Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.tsx b/.../Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.tsx
@@ -0,0 +1,20 @@
+import { Component, Host, h } from '@stencil/core';
+
+@Component({
+  tag: 'dnn-bulk-install',
+  styleUrl: 'dnn-bulk-install.scss',
+  shadow: false,
+})
+export class DnnBulkInstall {
+  render() {
+    return (
+      <Host>
+        <div class="aperture-container">
+          <div class="aperture-d-flex aperture-flex-column aperture-flex-lg-row aperture-my-4">
+            Hello, World! I'm a placeholder for the new Bulk Install user interface.
+          </div>
+        </div>
+      </Host>
+    );
+  }
+}
diff --git a/...Web/src/components/my-component/readme.md → ...src/components/dnn-bulk-install/readme.md b/...Web/src/components/my-component/readme.md → ...src/components/dnn-bulk-install/readme.md
diff --git a/...Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.tsx b/...Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.tsx
diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/utils/utils.ts b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/utils/utils.ts
diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/stencil.dnn.config.ts b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/stencil.dnn.config.ts
@@ -11,7 +11,7 @@ export const config : Config = {
   ...originalConfig,
   outputTargets: [
     {
-      // For DNN yarn watch --scope dnn-resource-manager
+      // For DNN yarn watch --scope dnn-bulk-install
       type: 'dist',
       esmLoaderPath: '../loader',
       dir: dnnConfig?.WebsitePath ? outPath : '../Scripts',

diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.dnn b/DNN Platform/Modules/BulkInstall/BulkInstall.dnn
@@ -1,64 +1,51 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Cantarus.PolyDeploy" type="Module" version="00.09.03">
-      <friendlyName>Cantarus PolyDeploy</friendlyName>
-      <description>Cantarus PolyDeploy module</description>
-      <iconFile>Images/polydeploy-logo-icon.png</iconFile>
+    <package name="BulkInstall" type="Module" version="10.00.00">
+      <friendlyName>Bulk Install</friendlyName>
+      <description>This module allows you to bulk install extensions.</description>
+      <iconFile>Images/bulk-install-icon.png</iconFile>
       <owner>
-        <name>Cantarus</name>
-        <organization>Cantarus</organization>
-        <url>http://www.cantarus.com</url>
-        <email>dotnetnuke@cantarus.com</email>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
+        <url>https://dnncommunity.org</url>
+        <email>info@dnncommunity.org</email>
       </owner>
       <license></license>
       <releaseNotes></releaseNotes>
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="CoreVersion">07.00.00</dependency>
+        <dependency type="CoreVersion">10.00.00</dependency>
       </dependencies>
-
       <components>
-
         <component type="ResourceFile">
           <resourceFiles>
-            <basePath>DesktopModules/Cantarus/PolyDeploy</basePath>
+            <basePath>DesktopModules\BulkInstall</basePath>
             <resourceFile>
               <name>Resources.zip</name>
             </resourceFile>
           </resourceFiles>
         </component>
-
         <component type="Module">
           <desktopModule>
-            <moduleName>PolyDeploy</moduleName>
-            <foldername>/Cantarus/PolyDeploy</foldername>
-            <businessControllerClass>Cantarus.Modules.PolyDeploy.Components.FeatureController</businessControllerClass>
+            <moduleName>BulkInstall</moduleName>
+            <foldername>BulkInstall</foldername>
+            <businessControllerClass>Dnn.Modules.BulkInstall.Components.FeatureController</businessControllerClass>
             <supportedFeatures>
               <supportedFeature type="Upgradeable"/>
             </supportedFeatures>
             <moduleDefinitions>
               <moduleDefinition>
-                <friendlyName>PolyDeploy</friendlyName>
+                <friendlyName>BulkInstall</friendlyName>
                 <defaultCacheTime>0</defaultCacheTime>
                 <moduleControls>
                   <moduleControl>
-                    <controlKey />
-                    <controlSrc>DesktopModules/Cantarus/PolyDeploy/Clients/Deploy/Deploy.ascx</controlSrc>
+                    <controlKey/>
+                    <controlSrc>DesktopModules/BulkInstall/View.html</controlSrc>
                     <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle />
+                    <controlTitle/>
                     <controlType>View</controlType>
-                    <iconFile />
-                    <helpUrl />
-                    <viewOrder>0</viewOrder>
-                  </moduleControl>
-                  <moduleControl>
-                    <controlKey>Manage</controlKey>
-                    <controlSrc>DesktopModules/Cantarus/PolyDeploy/Clients/Manage/Manage.ascx</controlSrc>
-                    <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle>PolyDeploy Manage</controlTitle>
-                    <controlType>Edit</controlType>
-                    <iconFile />
-                    <helpUrl />
+                    <iconFile/>
+                    <helpUrl/>
                     <viewOrder>0</viewOrder>
                   </moduleControl>
                 </moduleControls>
@@ -69,17 +56,14 @@
             <processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
             <processorCommand>UpgradeModule</processorCommand>
             <attributes>
-              <BusinessControllerClass>Cantarus.Modules.PolyDeploy.Components.FeatureController</BusinessControllerClass>
-              <UpgradeVersionsList>00.09.00,00.09.01</UpgradeVersionsList>
+              <BusinessControllerClass>Dnn.Modules.BulkInstall.Components.FeatureController</BusinessControllerClass>
+              <UpgradeVersionsList>00.00.01</UpgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
-
         <component type="Script">
           <scripts>
-
-            <basePath>DesktopModules/Cantarus/PolyDeploy</basePath>
-
+            <basePath>DesktopModules/BulkInstall</basePath>
             <!-- v0.1.0 -->
             <script type="Install">
               <path>SqlDataProviders</path>
@@ -160,24 +144,23 @@
             <script type="Uninstall">
               <path>SqlDataProviders</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version />
+              <version/>
             </script>
 
           </scripts>
         </component>
-
         <component type="Assembly">
           <assemblies>
-            <basePath>bin</basePath>
             <assembly>
-              <name>Cantarus.Modules.PolyDeploy.dll</name>
+              <name>Dnn.Modules.BulkInstall.dll</name>
+                <path>bin</path>
             </assembly>
             <assembly>
-              <name>Cantarus.Libraries.Encryption.dll</name>
+              <name>DotNetNuke.BulkInstall.Encryption.dll</name>
+              <path>bin</path>
             </assembly>
           </assemblies>
         </component>
-
         <component type="Config">
           <config>
             <configFile>web.config</configFile>
@@ -199,7 +182,6 @@
             </uninstall>
           </config>
         </component>
-
       </components>
     </package>
   </packages>

diff --git a/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj b/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj
@@ -21,8 +21,8 @@
     <ProjectGuid>{B15D41DD-2D1A-490C-977F-2F14E56447D5}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
-    <RootNamespace>Cantarus.Modules.PolyDeploy</RootNamespace>
-    <AssemblyName>Cantarus.Modules.PolyDeploy</AssemblyName>
+    <RootNamespace>Dnn.Modules.BulkInstall</RootNamespace>
+    <AssemblyName>Dnn.Modules.BulkInstall</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -33,20 +33,20 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <OutputPath>bin\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
-    <WarningLevel>1</WarningLevel>
+    <DocumentationFile>bin\Dnn.Modules.BulkInstall.xml</DocumentationFile>
+    <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <DefineConstants>TRACE;RELEASE</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile>bin\Dnn.Modules.BulkInstall.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Clients|AnyCPU' ">
@@ -163,12 +163,13 @@
     <Compile Include="Components\WebAPI\IPSpecController.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Images\polydeploy-logo-icon.png" />
+    <Content Include="Images\bulk-install-icon.png" />
     <Content Include="packages.config" />
     <Content Include="View.html" />
     <None Include="BulkInstall.dnn">
       <SubType>Designer</SubType>
     </None>
+    <Content Include="Module.build" />
     <None Include="module.css" />
     <None Include="ReleaseNotes.txt" />
     <None Include="License.txt" />
@@ -215,6 +216,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <Import Project="Module.build" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

diff --git a/...lkInstall/Images/polydeploy-logo-icon.png → .../BulkInstall/Images/bulk-install-icon.png b/...lkInstall/Images/polydeploy-logo-icon.png → .../BulkInstall/Images/bulk-install-icon.png
diff --git a/DNN Platform/Modules/BulkInstall/Module.build b/DNN Platform/Modules/BulkInstall/Module.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" 
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <RootDirectory>$(MSBuildProjectDirectory)\..\..\..</RootDirectory>
+        <ReactDirectory>$(MSBuildProjectDirectory)\BulkInstall.Web</ReactDirectory>
+    </PropertyGroup>
+    <Import Project="..\..\..\DNN_Platform.build" />
+    <PropertyGroup>
+        <Extension>zip</Extension>
+        <DNNFileName>BulkInstall</DNNFileName>
+        <PackageName>DNN_BulkInstall</PackageName>
+        <ModuleFolderName>$(WebsitePath)\DesktopModules\BulkInstall</ModuleFolderName>
+        <InstallPath>$(WebsiteInstallPath)\Module</InstallPath>
+    </PropertyGroup>
+    <Import Project="$(BuildScriptsPath)\Package.Targets" />
+    <Import Project="$(BuildScriptsPath)\Module.Build"/>
+    <Target Name="CopyScripts" BeforeTargets="UpdateFiles">
+        <PropertyGroup>
+            <ComponentsDestinationFolder>$(MSBuildProjectDirectory)\Scripts\dnn-bulk-install</ComponentsDestinationFolder>
+        </PropertyGroup>
+        <ItemGroup>
+            <ComponentsSource Include="$(MSBuildProjectDirectory)\BulkInstall.Web\dist\dnn-bulk-install\**\*" />
+        </ItemGroup>
+        <RemoveDir Directories="$(ComponentsDestinationFolder)" />
+        <MakeDir Directories="$(ComponentsDestinationFolder)" Condition="!Exists('$(ComponentsDestinationFolder)')"/>
+        <Copy SourceFiles="@(ComponentsSource)" DestinationFolder="$(ComponentsDestinationFolder)" />
+    </Target>
+    <Target Name="UpdateFiles">
+        <ItemGroup>
+            <Scripts Include="$(MSBuildProjectDirectory)\Scripts\**\*.*" />
+            <Resources Include="$(MSBuildProjectDirectory)\Scripts\**\*.*" />
+            <Resources Remove="web.config" />
+            <Resources Remove="web.Debug.config" />
+            <Resources Remove="web.Release.config" />
+        </ItemGroup>
+    </Target>
+</Project>