diff --git a/Build/Tasks/SetPackageVersions.cs b/Build/Tasks/SetPackageVersions.cs index 57511d4dc9d..9fc9f7e58d3 100644 --- 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 index cf9e7734718..826bc129087 100644 --- 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; + "dnn-bulk-install": LocalJSX.DnnBulkInstall & JSXBase.HTMLAttributes; } } } diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.css b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.scss similarity index 100% rename from DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.css rename to DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.scss diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.tsx b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/dnn-bulk-install.tsx new file mode 100644 index 00000000000..d07e867a5e0 --- /dev/null +++ b/DNN Platform/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 ( + +
+
+ Hello, World! I'm a placeholder for the new Bulk Install user interface. +
+
+
+ ); + } +} diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/readme.md b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/readme.md similarity index 100% rename from DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/readme.md rename to DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/dnn-bulk-install/readme.md diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.tsx b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.tsx deleted file mode 100644 index 56d51d96d15..00000000000 --- a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/components/my-component/my-component.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { Component, Prop, h } from '@stencil/core'; -import { format } from '../../utils/utils'; - -@Component({ - tag: 'my-component', - styleUrl: 'my-component.css', - shadow: true, -}) -export class MyComponent { - /** - * The first name - */ - @Prop() first: string; - - /** - * The middle name - */ - @Prop() middle: string; - - /** - * The last name - */ - @Prop() last: string; - - private getText(): string { - return format(this.first, this.middle, this.last); - } - - render() { - return
Hello, World! I'm {this.getText()}
; - } -} diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/utils/utils.ts b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/utils/utils.ts deleted file mode 100644 index 4fb9a8b2855..00000000000 --- a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/src/utils/utils.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function format(first: string, middle: string, last: string): string { - return (first || '') + (middle ? ` ${middle}` : '') + (last ? ` ${last}` : ''); -} diff --git a/DNN Platform/Modules/BulkInstall/BulkInstall.Web/stencil.dnn.config.ts b/DNN Platform/Modules/BulkInstall/BulkInstall.Web/stencil.dnn.config.ts index 693787c6812..d4bdba1a7a1 100644 --- 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 index be8b05d7ac1..634ac81e1ac 100644 --- a/DNN Platform/Modules/BulkInstall/BulkInstall.dnn +++ b/DNN Platform/Modules/BulkInstall/BulkInstall.dnn @@ -1,64 +1,51 @@ - - Cantarus PolyDeploy - Cantarus PolyDeploy module - Images/polydeploy-logo-icon.png + + Bulk Install + This module allows you to bulk install extensions. + Images/bulk-install-icon.png - Cantarus - Cantarus - http://www.cantarus.com - dotnetnuke@cantarus.com + .NET Foundation and Contributors + DNN Community + https://dnncommunity.org + info@dnncommunity.org true - 07.00.00 + 10.00.00 - - - DesktopModules/Cantarus/PolyDeploy + DesktopModules\BulkInstall Resources.zip - - PolyDeploy - /Cantarus/PolyDeploy - Cantarus.Modules.PolyDeploy.Components.FeatureController + BulkInstall + BulkInstall + Dnn.Modules.BulkInstall.Components.FeatureController - PolyDeploy + BulkInstall 0 - - DesktopModules/Cantarus/PolyDeploy/Clients/Deploy/Deploy.ascx + + DesktopModules/BulkInstall/View.html False - + View - - - 0 - - - Manage - DesktopModules/Cantarus/PolyDeploy/Clients/Manage/Manage.ascx - False - PolyDeploy Manage - Edit - - + + 0 @@ -69,17 +56,14 @@ DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke UpgradeModule - Cantarus.Modules.PolyDeploy.Components.FeatureController - 00.09.00,00.09.01 + Dnn.Modules.BulkInstall.Components.FeatureController + 00.00.01 - - - DesktopModules/Cantarus/PolyDeploy - + DesktopModules/BulkInstall - - bin - Cantarus.Modules.PolyDeploy.dll + Dnn.Modules.BulkInstall.dll + bin - Cantarus.Libraries.Encryption.dll + DotNetNuke.BulkInstall.Encryption.dll + bin - web.config @@ -199,7 +182,6 @@ - diff --git a/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj b/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj index 5fd9d397ef3..f7400880d0f 100644 --- a/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj +++ b/DNN Platform/Modules/BulkInstall/Dnn.Modules.BulkInstall.csproj @@ -21,8 +21,8 @@ {B15D41DD-2D1A-490C-977F-2F14E56447D5} {349c5851-65df-11da-9384-00065b846f21};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library - Cantarus.Modules.PolyDeploy - Cantarus.Modules.PolyDeploy + Dnn.Modules.BulkInstall + Dnn.Modules.BulkInstall 3.5 @@ -33,20 +33,20 @@ true full - DEBUG;TRACE + + bin\ - - - 1 + bin\Dnn.Modules.BulkInstall.xml + 4 false + 1591 pdbonly TRACE;RELEASE true bin\ - - + bin\Dnn.Modules.BulkInstall.xml false @@ -163,12 +163,13 @@ - + Designer + @@ -215,6 +216,7 @@ + diff --git a/DNN Platform/Modules/BulkInstall/Images/polydeploy-logo-icon.png b/DNN Platform/Modules/BulkInstall/Images/bulk-install-icon.png similarity index 100% rename from DNN Platform/Modules/BulkInstall/Images/polydeploy-logo-icon.png rename to DNN Platform/Modules/BulkInstall/Images/bulk-install-icon.png diff --git a/DNN Platform/Modules/BulkInstall/Module.build b/DNN Platform/Modules/BulkInstall/Module.build new file mode 100644 index 00000000000..0c7515c14ab --- /dev/null +++ b/DNN Platform/Modules/BulkInstall/Module.build @@ -0,0 +1,38 @@ + + + + $(MSBuildProjectDirectory)\..\..\.. + $(MSBuildProjectDirectory)\BulkInstall.Web + + + + zip + BulkInstall + DNN_BulkInstall + $(WebsitePath)\DesktopModules\BulkInstall + $(WebsiteInstallPath)\Module + + + + + + $(MSBuildProjectDirectory)\Scripts\dnn-bulk-install + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/BulkInstall/Properties/AssemblyInfo.cs b/DNN Platform/Modules/BulkInstall/Properties/AssemblyInfo.cs index 713f733753b..bf95ec9cafe 100644 --- a/DNN Platform/Modules/BulkInstall/Properties/AssemblyInfo.cs +++ b/DNN Platform/Modules/BulkInstall/Properties/AssemblyInfo.cs @@ -1,35 +1,18 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information using System.Reflection; using System.Runtime.InteropServices; -// -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -// -[assembly: AssemblyTitle("Cantarus PolyDeploy")] -[assembly: AssemblyDescription("A DotNetNuke Module from Cantarus Software")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("2012 Cantarus")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: +[assembly: AssemblyTitle("Dnn.Modules.BulkInstall")] -[assembly: AssemblyVersion("00.09.03.*")] -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] -[assembly: AssemblyKeyName("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f660b315-bf4d-4195-a3bb-e6f5d9579ccb")] diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/roles-bundle.js.LICENSE.txt b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/roles-bundle.js.LICENSE.txt index 1510c3fc567..b92adffac0e 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/roles-bundle.js.LICENSE.txt +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/roles-bundle.js.LICENSE.txt @@ -1,7 +1,7 @@ /*! - Copyright (c) 2018 Jed Watson. - Licensed under the MIT License (MIT), see - http://jedwatson.github.io/classnames + Copyright (c) 2017 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames */ /** @license React v16.13.1 diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/bundles/users-bundle.js.LICENSE.txt b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/bundles/users-bundle.js.LICENSE.txt index 1510c3fc567..b92adffac0e 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/bundles/users-bundle.js.LICENSE.txt +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/bundles/users-bundle.js.LICENSE.txt @@ -1,7 +1,7 @@ /*! - Copyright (c) 2018 Jed Watson. - Licensed under the MIT License (MIT), see - http://jedwatson.github.io/classnames + Copyright (c) 2017 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames */ /** @license React v16.13.1 diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users/UsersCommon.js.LICENSE.txt b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users/UsersCommon.js.LICENSE.txt index 1510c3fc567..b92adffac0e 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users/UsersCommon.js.LICENSE.txt +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users/UsersCommon.js.LICENSE.txt @@ -1,7 +1,7 @@ /*! - Copyright (c) 2018 Jed Watson. - Licensed under the MIT License (MIT), see - http://jedwatson.github.io/classnames + Copyright (c) 2017 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames */ /** @license React v16.13.1 diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/export-bundle.js.LICENSE.txt b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/export-bundle.js.LICENSE.txt index b9ae96d4818..af7956ef47f 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/export-bundle.js.LICENSE.txt +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/export-bundle.js.LICENSE.txt @@ -4,18 +4,18 @@ object-assign @license MIT */ -/*! - Copyright (c) 2018 Jed Watson. - Licensed under the MIT License (MIT), see - http://jedwatson.github.io/classnames -*/ - /*! Copyright (c) 2015 Jed Watson. Based on code that is Copyright 2013-2015, Facebook, Inc. All rights reserved. */ +/*! + Copyright (c) 2017 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames +*/ + /*! * @overview es6-promise - a tiny implementation of Promises/A+. * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) diff --git a/package.json b/package.json index 39f15b9a1b9..d4e8398d219 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables", "Dnn.AdminExperience/ClientSide/Vocabularies.Web", "DNN Platform/Modules/ResourceManager/ResourceManager.Web", + "DNN Platform/Modules/BulkInstall/BulkInstall.Web", "DNN Platform/Skins/Aperture" ], "devDependencies": {