From 67326147cb5875ab202c5b05ec34d3ee5acd73b7 Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@enkelmedia.se>
Date: Thu, 18 May 2023 22:35:05 +0200
Subject: [PATCH] Initial work on RCL

---
 .../Our.Umbraco.TheDashboard.csproj                  | 12 +++++-------
 .../build/Our.Umbraco.TheDashboard.targets           | 12 ------------
 .../Our.Umbraco.TheDashboard/Lang/da-DK.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/en-GB.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/en-US.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/es-ES.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/nb-NO.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/nl-NL.xml          |  0
 .../Our.Umbraco.TheDashboard/Lang/sv-SE.xml          |  0
 .../TheDashboard.controller.js                       |  0
 .../Our.Umbraco.TheDashboard/TheDashboard.css        |  0
 .../Our.Umbraco.TheDashboard/TheDashboard.html       |  0
 .../Our.Umbraco.TheDashboard/package.manifest        |  0
 13 files changed, 5 insertions(+), 19 deletions(-)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/da-DK.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-GB.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-US.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/es-ES.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/nb-NO.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/nl-NL.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/Lang/sv-SE.xml (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.controller.js (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.css (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.html (100%)
 rename Our.Umbraco.TheDashboard/{ => wwwroot}/App_Plugins/Our.Umbraco.TheDashboard/package.manifest (100%)

diff --git a/Our.Umbraco.TheDashboard/Our.Umbraco.TheDashboard.csproj b/Our.Umbraco.TheDashboard/Our.Umbraco.TheDashboard.csproj
index 56fee6b..3e3238a 100644
--- a/Our.Umbraco.TheDashboard/Our.Umbraco.TheDashboard.csproj
+++ b/Our.Umbraco.TheDashboard/Our.Umbraco.TheDashboard.csproj
@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
+	    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+	    <StaticWebAssetBasePath>/</StaticWebAssetBasePath>
         <ContentTargetFolders>.</ContentTargetFolders>
         <PackageId>Our.Umbraco.TheDashboard</PackageId>
         <Title>Our.Umbraco.TheDashboard</Title>
         <Description>Content dashboard for Umbraco 10</Description>
         <Product>The Dashboard for Umbraco</Product>
         <PackageTags>umbraco umbraco-marketplace dashboard activities plugin package</PackageTags>
-        <Version>11.0.1</Version>
+        <Version>11.1.0</Version>
         <Authors>Markus Johansson</Authors>
         <Copyright>Copyright (c) Obviuse AB</Copyright>
         <Company>Obviuse AB / Enkel Media Stockholm AB</Company>
@@ -24,11 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="App_Plugins\Our.Umbraco.TheDashboard\**\*.*">
-            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-        </Content>
-        <None Include="build\**\*.*">
+	    <None Include="build\**\*.*">
             <Pack>True</Pack>
             <PackagePath>buildTransitive</PackagePath>
         </None>
diff --git a/Our.Umbraco.TheDashboard/build/Our.Umbraco.TheDashboard.targets b/Our.Umbraco.TheDashboard/build/Our.Umbraco.TheDashboard.targets
index 16f0432..93e8040 100644
--- a/Our.Umbraco.TheDashboard/build/Our.Umbraco.TheDashboard.targets
+++ b/Our.Umbraco.TheDashboard/build/Our.Umbraco.TheDashboard.targets
@@ -4,18 +4,6 @@
         <OurUmbracoTheDashboardContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\Our.Umbraco.TheDashboard\**\*.*</OurUmbracoTheDashboardContentFilesPath>
     </PropertyGroup>
 
-    <Target Name="CopyOurUmbracoTheDashboardAssets" BeforeTargets="Build">
-        <ItemGroup>
-            <OurUmbracoTheDashboardContentFiles Include="$(OurUmbracoTheDashboardContentFilesPath)" />
-        </ItemGroup>
-        <Message Text="Copying Our.Umbraco.TheDashboard files: $(OurUmbracoTheDashboardContentFilesPath) - #@(OurUmbracoTheDashboardContentFiles->Count()) files"  Importance="high" />
-        <Copy
-            SourceFiles="@(OurUmbracoTheDashboardContentFiles)"
-            DestinationFiles="@(OurUmbracoTheDashboardContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\Our.Umbraco.TheDashboard\%(RecursiveDir)%(Filename)%(Extension)')"
-            SkipUnchangedFiles="true" />
-
-    </Target>
-
     <Target Name="ClearOurUmbracoTheDashboardAssets" BeforeTargets="Clean">
         <ItemGroup>
             <OurUmbracoTheDashboardDir Include="$(MSBuildProjectDirectory)\App_Plugins\Our.Umbraco.TheDashboard\" />
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/da-DK.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/da-DK.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/da-DK.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/da-DK.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-GB.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-GB.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-GB.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-GB.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-US.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-US.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-US.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/en-US.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/es-ES.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/es-ES.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/es-ES.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/es-ES.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/nb-NO.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/nb-NO.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/nb-NO.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/nb-NO.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/nl-NL.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/nl-NL.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/nl-NL.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/nl-NL.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/sv-SE.xml b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/sv-SE.xml
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/Lang/sv-SE.xml
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/Lang/sv-SE.xml
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.controller.js b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.controller.js
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.controller.js
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.controller.js
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.css b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.css
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.css
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.css
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.html b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.html
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.html
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/TheDashboard.html
diff --git a/Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/package.manifest b/Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/package.manifest
similarity index 100%
rename from Our.Umbraco.TheDashboard/App_Plugins/Our.Umbraco.TheDashboard/package.manifest
rename to Our.Umbraco.TheDashboard/wwwroot/App_Plugins/Our.Umbraco.TheDashboard/package.manifest