Initial work on RCL

enkelmedia · May 18, 2023 · 6732614 · 6732614
1 parent f32a8ca
commit 6732614
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 19 deletions.
diff --git 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
@@ -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/...s/Our.Umbraco.TheDashboard/Lang/da-DK.xml → ...s/Our.Umbraco.TheDashboard/Lang/da-DK.xml b/...s/Our.Umbraco.TheDashboard/Lang/da-DK.xml → ...s/Our.Umbraco.TheDashboard/Lang/da-DK.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/en-GB.xml → ...s/Our.Umbraco.TheDashboard/Lang/en-GB.xml b/...s/Our.Umbraco.TheDashboard/Lang/en-GB.xml → ...s/Our.Umbraco.TheDashboard/Lang/en-GB.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/en-US.xml → ...s/Our.Umbraco.TheDashboard/Lang/en-US.xml b/...s/Our.Umbraco.TheDashboard/Lang/en-US.xml → ...s/Our.Umbraco.TheDashboard/Lang/en-US.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/es-ES.xml → ...s/Our.Umbraco.TheDashboard/Lang/es-ES.xml b/...s/Our.Umbraco.TheDashboard/Lang/es-ES.xml → ...s/Our.Umbraco.TheDashboard/Lang/es-ES.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/nb-NO.xml → ...s/Our.Umbraco.TheDashboard/Lang/nb-NO.xml b/...s/Our.Umbraco.TheDashboard/Lang/nb-NO.xml → ...s/Our.Umbraco.TheDashboard/Lang/nb-NO.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/nl-NL.xml → ...s/Our.Umbraco.TheDashboard/Lang/nl-NL.xml b/...s/Our.Umbraco.TheDashboard/Lang/nl-NL.xml → ...s/Our.Umbraco.TheDashboard/Lang/nl-NL.xml
diff --git a/...s/Our.Umbraco.TheDashboard/Lang/sv-SE.xml → ...s/Our.Umbraco.TheDashboard/Lang/sv-SE.xml b/...s/Our.Umbraco.TheDashboard/Lang/sv-SE.xml → ...s/Our.Umbraco.TheDashboard/Lang/sv-SE.xml
diff --git a/...o.TheDashboard/TheDashboard.controller.js → ...o.TheDashboard/TheDashboard.controller.js b/...o.TheDashboard/TheDashboard.controller.js → ...o.TheDashboard/TheDashboard.controller.js
diff --git a/...Our.Umbraco.TheDashboard/TheDashboard.css → ...Our.Umbraco.TheDashboard/TheDashboard.css b/...Our.Umbraco.TheDashboard/TheDashboard.css → ...Our.Umbraco.TheDashboard/TheDashboard.css
diff --git a/...ur.Umbraco.TheDashboard/TheDashboard.html → ...ur.Umbraco.TheDashboard/TheDashboard.html b/...ur.Umbraco.TheDashboard/TheDashboard.html → ...ur.Umbraco.TheDashboard/TheDashboard.html
diff --git a/...Our.Umbraco.TheDashboard/package.manifest → ...Our.Umbraco.TheDashboard/package.manifest b/...Our.Umbraco.TheDashboard/package.manifest → ...Our.Umbraco.TheDashboard/package.manifest