Merge pull request #1 from dnnsoftware/development

sync from base

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+<!-- 
+  Please read contribution guideline first: https://github.com/dnnsoftware/Dnn.Platform/blob/development/CONTRIBUTING.md 
+-->
+## Description 
+
+## Steps to reproduce
+
+## Current result
+
+## Expected result
+
+## Affected version
+
+<!-- Check all that apply and add more if necessary -->
+
+* [x] 9.2
+* [x] 9.1.1
+* [ ] 9.1
+* [ ] 9.0
+
+## Affected browser
+
+<!-- 
+  Check all that apply and add more if necessary.
+  If possible, please also specify exact versions and mention the operating system
+-->
+
+* [ ] Chrome
+* [ ] Firefox
+* [ ] Safari
+* [ ] Internet Explorer
+* [ ] Edge

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!-- 
+  Please read contribution guideline first: https://github.com/dnnsoftware/Dnn.Platform/blob/development/CONTRIBUTING.md 
+-->
+
+<!-- 
+  Please make sure that there is a correcponding issue created and reference it in the PR by writing
+  `Fixes #123` or `Closes #123`. 
+  A PR without an accompanying issue will be accepted and merged on a very rare occasion
+-->
+
+## Summary
+<!-- 
+  Please describe the code changes as you see fit so that the reviewers have an easier task understanding what changed and why.
+  
+  Any new unit tests will be highly appreciated.
+-->

.gitignore

@@ -77,7 +77,7 @@ UpgradeLog*.XML
 ############
 
 # Ignore artifacts from deployed/installed site
-
+[Dd]eploy[Pp]ackage/
 DNN_*.zip
 
 !DNN [Pp]latform/[Cc]omponents
@@ -94,6 +94,8 @@ DNN [Pp]latform/MVC Modules/*/[Bb]in/*
 DNN [Pp]latform/[Pp]roviders/*/*/[Bb]in/*
 DNN [Pp]latform/[Pp]roviders/*/*/*/[Bb]in/*
 DNN [Pp]latform/Syndication/[Bb]in/*
+DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
+DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*
 
 
 [Ww]ebsite/*/[Dd]efault.aspx
@@ -162,6 +164,7 @@ DNN [Pp]latform/Syndication/[Bb]in/*
 [Ww]ebsite/[Dd]esktop[Mm]odules/[Uu]ser[Dd]efined[Tt]able
 [Ww]ebsite/[Dd]esktop[Mm]odules/dnnGlimpse
 [Ww]ebsite/[Dd]esktop[Mm]odules/[Tt]est*
+[Ww]ebsite/[Dd]esktop[Mm]odules/[Cc]onnectors*
 
 [Ww]ebsite/[Ii]nstall/*/*.zip
 [Ww]ebsite/[Ii]nstall/*/*.resources
@@ -195,6 +198,7 @@ DNN [Pp]latform/Syndication/[Bb]in/*
 [Ww]ebsite/[Pp]roviders/*/*/license.txt
 [Ww]ebsite/[Pp]roviders/*/*/release[Nn]otes.txt
 [Ww]ebsite/[Pp]roviders/[Ff]older[Pp]roviders
+[Ww]ebsite/[Pp]roviders/[Cc]lient[Cc]apability[Pp]roviders
 
 [Ww]ebsite/[Rr]esources/[Ll]ibraries
 

.nuget/NuGet.Config

@@ -5,4 +5,8 @@
     <add key="enabled" value="true" />
     <add key="automatic" value="true" />
   </solution>
+  <packageSources>
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+    <add key="MyGet" value="https://www.myget.org/F/dnn-software-public/api/v2" />
+  </packageSources>
 </configuration>

Build/BuildScripts/AT.MSBuild.Tasks.Targets

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<PropertyGroup>
+		<ATMSBuildTasksPath Condition="'$(ATMSBuildTasksPath)' == ''">$(MSBuildExtensionsPath)\AT.MSBuild.Tasks</ATMSBuildTasksPath>
+		<ATMSBuildTasksLib>$(ATMSBuildTasksPath)\AT.MSBuild.Tasks.dll</ATMSBuildTasksLib>
+	</PropertyGroup>
+
+	<UsingTask AssemblyFile="$(ATMSBuildTasksLib)" TaskName="AT.MSBuild.Tasks.IncrementBuildNumber" />
+	<UsingTask AssemblyFile="$(ATMSBuildTasksLib)" TaskName="AT.MSBuild.Tasks.ShellCommand" />
+	<UsingTask AssemblyFile="$(ATMSBuildTasksLib)" TaskName="AT.MSBuild.Tasks.CreateVSTemplate" />
+	<UsingTask AssemblyFile="$(ATMSBuildTasksLib)" TaskName="AT.MSBuild.Tasks.GetAbsolutePath" />
+
+</Project>

Build/BuildScripts/CombineSymbols.ps1

@@ -0,0 +1,71 @@
+Param(
+    [parameter(Mandatory=$true)][string]$checkoutDir,
+    [parameter(Mandatory=$false)][string]$symbolsDir = "Dnn.Symbols",
+    [parameter(Mandatory=$false)][string]$symbolsName
+	)
+
+$baseFolder   = ([System.IO.FileInfo]"$checkoutDir\$symbolsDir").FullName
+$binFolder    = ([System.IO.FileInfo]"$baseFolder\bin").FullName
+$resourcePath = ([System.IO.FileInfo]"$baseFolder\Resources.zip").FullName
+
+Write-Host "This script will Combine symbols under $baseFolder"
+
+Push-Location
+Set-Location $baseFolder
+
+try
+{
+    if (Test-Path "$binFolder")
+    {
+        Write-Host "Deleting $binFolder"
+        Remove-Item "$binFolder" -Recurse
+    }
+
+    if (Test-Path "$resourcePath")
+    {
+        Write-Host "Deleting $resourcePath"
+        Remove-Item "$resourcePath"
+    }
+
+    $artifactsPath = ([System.IO.FileInfo]"$checkoutDir\Artifacts\").FullName
+    if (!(Test-Path $artifactsPath -PathType Container))
+    {
+        Write-Host "Creating $artifactsPath"
+        md $artifactsPath
+    }
+
+    # extract all resources files to bin folder
+    Get-ChildItem "Resources.zip" -Recurse | Foreach-Object {
+        Write-Host "Extrachting $($_.FullName)"
+        Expand-Archive -Force -LiteralPath "$($_.FullName)" -DestinationPath "$baseFolder"
+    }
+
+    if (Test-Path "$binFolder")
+    {
+        # compress all files in bin folder
+        Write-Host "Compressing content of $binFolder"
+        Compress-Archive -Force -Path "$binFolder" -CompressionLevel Optimal -DestinationPath "$resourcePath"
+
+        $symbolsZip = (Get-ChildItem "*Symbols.zip").FullName
+        Write-Host "Adding $resourcePath to $symbolsZip"
+        Compress-Archive -LiteralPath "$resourcePath" -Update -CompressionLevel Optimal -DestinationPath "$symbolsZip"
+
+        if ($symbolsName)
+        {
+            Write-Host "Renaming $symbolsZip to $symbolsName"
+            Rename-Item "$symbolsZip" "$symbolsName"
+            $symbolsZip = $symbolsName
+        }
+
+        Write-Host "Copying $symbolsZip to $artifactsPath"
+        Copy-Item "$symbolsZip" "$artifactsPath"
+    }
+    else
+    {
+       Write-Host "BIN folder doesn't exist: $binFolder"
+    }
+}
+finally
+{
+    Pop-Location
+}

Build/BuildScripts/CopyPackagingFiles.build

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="CreateInstall" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Variables.build" />
+  <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+  <!--Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks" /-->
+  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.WebDirectoryCreate" />
+
+  <Target Name="Copy">
+    <RemoveDir Directories ="$(checkoutDirectory)\Website\Providers\FolderProviders" />
+  </Target>
+</Project>