Upgraded .NET7 dependency to Umbraco v11.0.0-rc6

Reverted the previous breaking-change. umbraco/Umbraco-CMS#13489 (comment)
leekelleher · Nov 29, 2022 · a66a1f1 · a66a1f1
1 parent 6a5bfa7
commit a66a1f1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 29 deletions.
diff --git a/build/manifest-nuget-core.nuspec b/build/manifest-nuget-core.nuspec
@@ -28,8 +28,8 @@
         <dependency id="Umbraco.Cms.Web.BackOffice" version="[10.0.0, 13.0.0)" />
       </group>
       <group targetFramework="net7.0">
-        <dependency id="Umbraco.Cms.Web.Website" version="[11.0.0, 13.0.0)" />
-        <dependency id="Umbraco.Cms.Web.BackOffice" version="[11.0.0, 13.0.0)" />
+        <dependency id="Umbraco.Cms.Web.Website" version="[11.0.0-rc6, 13.0.0)" />
+        <dependency id="Umbraco.Cms.Web.BackOffice" version="[11.0.0-rc6, 13.0.0)" />
       </group>
     </dependencies>
   </metadata>

diff --git a/src/Umbraco.Cms.11.x/Umbraco.Cms.11.x.csproj b/src/Umbraco.Cms.11.x/Umbraco.Cms.11.x.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="11.0.0-rc5" />
+        <PackageReference Include="Umbraco.Cms" Version="11.0.0-rc6" />
         <PackageReference Include="uSync" Version="11.0.0-rc3" />
         <ProjectReference Include="..\Umbraco.Community.Contentment\Umbraco.Community.Contentment.csproj" />
     </ItemGroup>

diff --git a/...mbraco.Community.Contentment/DataEditors/EditorNotes/EditorNotesConfigurationConnector.cs b/...mbraco.Community.Contentment/DataEditors/EditorNotes/EditorNotesConfigurationConnector.cs
@@ -44,11 +44,7 @@ public EditorNotesConfigurationConnector(
             _macroParser = macroParser;
         }
 
-#if NET7_0
-        public object FromArtifact(IDataType dataType, string configuration, IContextCache contextCache)
-#else
         public object FromArtifact(IDataType dataType, string configuration)
-#endif
         {
             var dataTypeConfigurationEditor = dataType.Editor.GetConfigurationEditor();
 
@@ -70,11 +66,7 @@ public object FromArtifact(IDataType dataType, string configuration)
             return db;
         }
 
-#if NET7_0
-        public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)
-#else
         public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies)
-#endif
         {
             if (dataType.Configuration is Dictionary<string, object> config &&
                 config.TryGetValueAs(EditorNotesConfigurationEditor.Message, out string notes) == true &&

diff --git a/src/Umbraco.Community.Contentment/DataEditors/Notes/NotesConfigurationConnector.cs b/src/Umbraco.Community.Contentment/DataEditors/Notes/NotesConfigurationConnector.cs
@@ -44,11 +44,7 @@ public NotesConfigurationConnector(
             _macroParser = macroParser;
         }
 
-#if NET7_0
-        public object FromArtifact(IDataType dataType, string configuration, IContextCache contextCache)
-#else
         public object FromArtifact(IDataType dataType, string configuration)
-#endif
         {
             var dataTypeConfigurationEditor = dataType.Editor.GetConfigurationEditor();
 
@@ -70,11 +66,7 @@ public object FromArtifact(IDataType dataType, string configuration)
             return db;
         }
 
-#if NET7_0
-        public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)
-#else
         public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies)
-#endif
         {
             if (dataType.Configuration is Dictionary<string, object> config &&
                 config.TryGetValueAs(NotesConfigurationField.Notes, out string notes) == true &&

diff --git a/...mbraco.Community.Contentment/DataEditors/RenderMacro/RenderMacroConfigurationConnector.cs b/...mbraco.Community.Contentment/DataEditors/RenderMacro/RenderMacroConfigurationConnector.cs
@@ -33,22 +33,14 @@ public RenderMacroConfigurationConnector(IConfigurationEditorJsonSerializer conf
             _configurationEditorJsonSerializer = configurationEditorJsonSerializer;
         }
 
-#if NET7_0
-        public object FromArtifact(IDataType dataType, string configuration, IContextCache contextCache)
-#else
         public object FromArtifact(IDataType dataType, string configuration)
-#endif
         {
             var dataTypeConfigurationEditor = dataType.Editor.GetConfigurationEditor();
 
             return dataTypeConfigurationEditor.FromDatabase(configuration, _configurationEditorJsonSerializer);
         }
 
-#if NET7_0
-        public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)
-#else
         public string ToArtifact(IDataType dataType, ICollection<ArtifactDependency> dependencies)
-#endif
         {
             if (dataType.Configuration is Dictionary<string, object> config &&
                 config.TryGetValueAs(RenderMacroConfigurationEditor.Macro, out JArray array) == true &&

diff --git a/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj b/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Umbraco.Cms.Web.Website" Version="11.0.0-rc5" />
-    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="11.0.0-rc5" />
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="11.0.0-rc6" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="11.0.0-rc6" />
   </ItemGroup>
 
   <Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">