Merge branch 'develop'

# Conflicts:
#	Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html
#	Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html
#	Source/Our.Umbraco.Nexu.Core/Our.Umbraco.Nexu.Core.csproj
#	Source/Our.Umbraco.Nexu.Parsers.Tests/GridEditorParsers/Community/DocTypeGridEditorParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Community/ContentListParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Community/NestedContentParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Community/RjpMultiUrlPickerParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Community/StackedContentParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers.Tests/PropertyParsers/Core/NestedContentParserTests.cs
#	Source/Our.Umbraco.Nexu.Parsers/GridEditorParsers/Community/DocTypeGridEditorParser.cs
#	Source/Our.Umbraco.Nexu.Parsers/ParserHelper.cs
#	Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/NestedContentParser.cs
#	Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/RjpMultiUrlPickerParser.cs
#	Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/StackedContentParser.cs
#	Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/NestedContentParser.cs
#	appveyor.yml
#	src/Our.Umbraco.Nexu.Common/Properties/AssemblyInfo.cs
#	src/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
#	src/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
#	src/Our.Umbraco.Nexu.Web/App_Plugins/Nexu/lang/sv-SE.xml
#	src/Our.Umbraco.Nexu.Web/Properties/AssemblyInfo.cs

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: dawoe
+patreon: #
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/workflows/main.yml

@@ -0,0 +1,47 @@
+# Umbraco Magical Build Pipeline
+# Worry less about build stuff and code more...
+#
+# 1. Ensure Secret Store has 'UMB_API_KEY' for pushing the ZIP package to our.umbraco.com
+name: Magical Build
+on:
+  push:
+    branches:
+      - develop                          # Push events on master branch.
+jobs:
+  unicorn-dust:                         # Name of Job
+    runs-on: windows-latest             # Make sure we run this on a Windows VM/image
+    env:
+      PKG_VERSION: '2.0.0-beta'              # UPDATE ME
+    steps:
+      - uses: actions/checkout@master   # Go & fetch the REPO & do a git checkout
+      - uses: actions/setup-dotnet@v1   # Downloads & adds dotnet to PATH
+        with:
+          dotnet-version: '2.2.103'     # SDK Version to use
+      - name: Setup Nuget.exe in PATH
+        uses: warrenbuckley/Setup-Nuget@v1
+      - name : Nuget restore
+        working-directory: './src'    
+        run : nuget restore
+      - name: dotnet msbuild               # Build the project
+        working-directory: './src'
+        run: dotnet msbuild  /p:Configuration=Release /restore
+      - name: dotnet vstests               # Runs tests
+        working-directory: './src'
+        run: dotnet vstest Our.Umbraco.Nexu.Web.Tests\bin\Release\Our.Umbraco.Nexu.Web.Tests.dll Our.Umbraco.Nexu.Core.Tests\bin\Release\Our.Umbraco.Nexu.Core.Tests.dll Our.Umbraco.Nexu.Parsers.Tests\bin\Release\Our.Umbraco.Nexu.Parsers.Tests.dll
+      - name: Copy DLL/s into build.tmp.package folder  # All files/folders in build.tmp.package will be added to Umbraco ZIP package
+        run: xcopy src\Our.Umbraco.Nexu.Web\bin\Release\Our.Umbraco.Nexu.*.dll build.tmp.package\bin\
+      - name: Copy App_Plugins into build.tmp.package folder  # All files/folders in build.tmp.package will be added to Umbraco ZIP package
+        run: xcopy /s /e src\Our.Umbraco.Nexu.Web\App_Plugins build.tmp.package\App_Plugins\
+      - name: Create Umbraco ZIP package
+        uses: warrenbuckley/Create-Umbraco-ZIP-Package@releases/v1
+        with:
+          packageXmlPath: 'Packaging/github-package.xml'     # The path to the Umbraco Package.xml that we use to build the package
+          packageFilesPath: 'build.tmp.package'   # The path to the folder containing all the files needed for the package, excluding the package.xml (XCOPY is copying them here for us)
+          packageVersion: ${{ env.PKG_VERSION }}  # A version for the Umbraco package such as 1.3.2
+          packageZipOutPath: output               # Name of folder to put the Umbraco package ZIP in
+      - name: Upload output folder as an artifact ZIP (Nupkg & Umb.zip)
+        uses: actions/upload-artifact@master
+        with:
+          name: package-artifacts   # Name of the ZIP
+          path: output              # Name of folder to ZIP up & upload as artifacts
+

.gitignore

@@ -39,3 +39,5 @@ Packaging/Package/
 Packaging/UmbracoBuild/
 artifacts/
 .vs
+Packaging/NugetCoreBuild/
+Packaging/NugetParserBuild/

Packaging/Package.xml

@@ -28,20 +28,7 @@
   <Languages />
   <DataTypes />
 
-	<Actions>
-		<Action runat="install"  
-			alias="addDashboardSection" 
-			dashboardAlias="Our.Umbraco.Nexu">
-			 <section>
-				<areas>
-				  <area>developer</area>
-				</areas>
-				<tab caption="Nexu">
-				  <control>/App_Plugins/Nexu/views/dashboard.html</control>
-				</tab>
-			 </section>
-		 </Action>
-	</Actions>
+	<Actions/>
 
 	<control />
 

Packaging/build-appveyor.bat

@@ -3,5 +3,4 @@ ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
 ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
 
-Call Tools\Nuget.exe restore ..\Source\Our.Umbraco.Nexu.sln
 CALL "%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" build.xml

Packaging/build.bat

@@ -14,7 +14,7 @@ if "%PACKAGE_VERISON%" == "" (
 )
 
 SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER%
-
+SET BUILDCONFIG=Debug
 build-appveyor.bat
 
 @IF %ERRORLEVEL% NEQ 0 GOTO err