Merge branch 'V2/2.2.1' into stage

DigitalMomentum · Jan 24, 2024 · c1cfa11 · c1cfa11
2 parents e12a911 + e3d33f3
commit c1cfa11
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 18 deletions.
diff --git a/MetaMomentum.Core/Composing/MetaMomentumComposer.cs b/MetaMomentum.Core/Composing/MetaMomentumComposer.cs
@@ -11,7 +11,7 @@ namespace MetaMomentum.Core.Composing {
 #if NET5_0_OR_GREATER
 	internal class MetaMomentumComposer : IComposer
 #else
-	[RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+	[RuntimeLevel(MinLevel = RuntimeLevel.Install)]
 	public class MetaMomentumComposer : IUserComposer
 #endif
 	{

diff --git a/MetaMomentum.Core/MetaMomentum.Core.csproj b/MetaMomentum.Core/MetaMomentum.Core.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0;net5.0;net472</TargetFrameworks>
-	  <Version>2.2.0</Version>
+	  <Version>2.2.1</Version>
 	  <Description>Core MetaMomentum DLL for reference in class projects</Description>
 	  <Company>Digital Momentum</Company>
-	  <Product>MetaMomentum for Umbraco 8, 9 &amp; 10</Product>
+	  <Product>MetaMomentum for Umbraco 8 to 13</Product>
 	  <Authors>David Sheiles</Authors>
 	  <Copyright>Copyright ©  2022</Copyright>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj b/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
@@ -4,10 +4,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="App_Plugins\MetaMomentum\editorView.html" />
-    <Content Include="App_Plugins\MetaMomentum\metamomentum.css" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Umbraco.Cms" Version="10.3.2" />
@@ -25,15 +21,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Folder Include="App_Plugins\" />
     <Folder Include="wwwroot" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="App_Plugins\MetaMomentum\editorView.controller.js" />
-    <None Include="App_Plugins\MetaMomentum\package.manifest" />
-    <None Include="App_Plugins\MetaMomentum\stripHtml.filter.js" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MetaMomentum\MetaMomentum.csproj" />
   </ItemGroup>

diff --git a/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path b/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path
@@ -1 +1 @@
-C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.n4md8bdo.dll
+C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.lfsezqvu.dll
diff --git a/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf b/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf
diff --git a/MetaMomentum.UmbracoV8/Media/created-packages/Meta_Momentum_2.2.0.zip b/MetaMomentum.UmbracoV8/Media/created-packages/Meta_Momentum_2.2.0.zip
diff --git a/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj b/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj
@@ -23,6 +23,9 @@
     <ItemGroup>
       <ProjectReference Include="..\MetaMomentum\MetaMomentum.csproj" />
     </ItemGroup>
+    <ItemGroup>
+      <Folder Include="App_Plugins\" />
+    </ItemGroup>
 
     <!--Set this to true ModelsBuilder mode is not PureLive -->
     <PropertyGroup>

diff --git a/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf b/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf
diff --git a/MetaMomentum/MetaMomentum.csproj b/MetaMomentum/MetaMomentum.csproj
@@ -10,12 +10,12 @@
 		<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
 		<DebugType>none</DebugType>
 
-		<Version>2.2.0</Version>
-		<Description>Creates a Meta DataType for Umbraco 8, 9 and 10 to manage Search Engine results, Open Graph and Twitter Cards</Description>
+		<Version>2.2.1</Version>
+		<Description>Creates a Meta DataType for Umbraco 8 to 13 to manage Search Engine results, Open Graph and Twitter Cards</Description>
 		<Company>Digital Momentum</Company>
-		<Product>MetaMomentum for Umbraco 8, 9 &amp; 10</Product>
+		<Product>MetaMomentum for Umbraco 8 to 13</Product>
 		<Authors>David Sheiles</Authors>
-		<Copyright>Copyright ©  2022</Copyright>
+		<Copyright>Copyright ©  2024</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/DigitalMomentum/MetaMomentum</PackageProjectUrl>
 		<PackageIcon>MetaMomentum-logo.png</PackageIcon>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.n4md8bdo.dll
		C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.lfsezqvu.dll