Merge branch 'next'

PerplexDigital · May 8, 2020 · cfced68 · cfced68
2 parents 9f6a653 + 8e90fcc
commit cfced68
Show file tree

Hide file tree

Showing 91 changed files with 2,903 additions and 2,564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,4 +54,7 @@ src/DemoWebsite/App_Data/Models
 src/DemoWebsite/App_Data/Umbraco.sdf
 src/DemoWebsite/[Uu]mbraco/
 *.css
-build/*.nupkg
+
+# NuGet / Our Umbraco packages
+pkg/**/*.nupkg
+pkg/**/*.zip
diff --git a/README.md b/README.md
diff --git a/build/build.bat b/build/build.bat
diff --git a/build/nuget-pack.bat b/build/nuget-pack.bat
diff --git a/build/nuget.exe b/build/nuget.exe
diff --git a/build/vswhere.exe b/build/vswhere.exe
diff --git a/pkg/nuget/nuget.exe b/pkg/nuget/nuget.exe
diff --git a/pkg/nuget/pack.bat b/pkg/nuget/pack.bat
@@ -0,0 +1,3 @@
+@echo off
+nuget pack ..\..\src\Perplex.ContentBlocks\Perplex.ContentBlocks.csproj -Build -Properties Configuration=Release
+pause
diff --git a/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.RenderProperty/package.manifest b/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.RenderProperty/package.manifest
diff --git a/...te/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.directive.js b/...te/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.directive.js
diff --git a/...emoWebsite/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.html b/...emoWebsite/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.html
diff --git a/...site/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.service.js b/...site/App_Plugins/Perplex.Shared/Perplex.RenderProperty/perplex.render-property.service.js
diff --git a/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/package.manifest b/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/package.manifest
diff --git a/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/tab-focus-once.directive.js b/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/tab-focus-once.directive.js
diff --git a/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/tab-focus.directive.js b/src/DemoWebsite/App_Plugins/Perplex.Shared/Perplex.TabFocus/tab-focus.directive.js