From f12aafd5bebeee8de9b64a5f7566bea98d5806ec Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 13 Sep 2024 10:42:19 +0200 Subject: [PATCH] Updated to dotnet 9 RC.1 - and other nuget packages (#17053) * Updated nuget packages and dotnet 9 * attempt to make pipelines happy * Another attempt to make pipelines happy --- Directory.Packages.props | 76 +++++++++---------- global.json | 2 +- .../PartialViewViewModelsMapDefinition.cs | 2 +- .../Script/ScriptViewModelsMapDefinition.cs | 2 +- .../StylesheetviewModelsMapDefinition.cs | 2 +- tests/Directory.Packages.props | 16 ++-- .../PublishedContentQueryTests.cs | 4 +- 7 files changed, 51 insertions(+), 53 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5f2a028c77..b00c78d638 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,35 +5,35 @@ - + - + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -48,7 +48,7 @@ - + @@ -59,24 +59,24 @@ - - - - + + + + - - - + + + - - + + - - - + + + - + @@ -85,10 +85,10 @@ - + - + - + \ No newline at end of file diff --git a/global.json b/global.json index a718288b1a..9c2a135743 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-preview.7.24407.12", + "version": "9.0.100-rc.1.24452.12", "rollForward": "latestFeature", "allowPrerelease": true } diff --git a/src/Umbraco.Cms.Api.Management/Mapping/PartialView/PartialViewViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/PartialView/PartialViewViewModelsMapDefinition.cs index 97e241feff..53c1efeb3f 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/PartialView/PartialViewViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/PartialView/PartialViewViewModelsMapDefinition.cs @@ -64,7 +64,7 @@ public class PartialViewViewModelsMapDefinition : IMapDefinition { target.Path = source.Path.SystemPathToVirtualPath(); target.Name = source.Name; - target.Parent = source.ParentPath.IsNullOrEmpty() + target.Parent = string.IsNullOrEmpty(source.ParentPath) ? null : new FileSystemFolderModel { diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Script/ScriptViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Script/ScriptViewModelsMapDefinition.cs index 75096091c3..dae8bcf177 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Script/ScriptViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Script/ScriptViewModelsMapDefinition.cs @@ -59,7 +59,7 @@ public class ScriptViewModelsMapDefinition : IMapDefinition { target.Path = source.Path.SystemPathToVirtualPath(); target.Name = source.Name; - target.Parent = source.ParentPath.IsNullOrEmpty() + target.Parent = string.IsNullOrEmpty(source.ParentPath) ? null : new FileSystemFolderModel { diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Stylesheet/StylesheetviewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Stylesheet/StylesheetviewModelsMapDefinition.cs index 30aa1651ec..65c1fe0be9 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Stylesheet/StylesheetviewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Stylesheet/StylesheetviewModelsMapDefinition.cs @@ -59,7 +59,7 @@ public class StylesheetViewModelsMapDefinition : IMapDefinition { target.Path = source.Path.SystemPathToVirtualPath(); target.Name = source.Name; - target.Parent = source.ParentPath.IsNullOrEmpty() + target.Parent = string.IsNullOrEmpty(source.ParentPath) ? null : new FileSystemFolderModel { diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index c8e77d9603..629acca752 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -5,25 +5,23 @@ - - - + + + - - + + - - - + - + \ No newline at end of file diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs index 08e4c20343..093e446adf 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs @@ -59,8 +59,8 @@ public class PublishedContentQueryTests : ExamineBaseTest new Dictionary { [name] = "Hello world, there are products here", - [UmbracoExamineFieldNames.VariesByCultureFieldName] = culture.IsNullOrEmpty() ? "n" : "y", - [culture.IsNullOrEmpty() ? UmbracoExamineFieldNames.PublishedFieldName : $"{UmbracoExamineFieldNames.PublishedFieldName}_{culture}"] = "y" + [UmbracoExamineFieldNames.VariesByCultureFieldName] = string.IsNullOrEmpty(culture) ? "n" : "y", + [string.IsNullOrEmpty(culture) ? UmbracoExamineFieldNames.PublishedFieldName : $"{UmbracoExamineFieldNames.PublishedFieldName}_{culture}"] = "y" })); } }