From 31afcdd37bef3a4ea3577d86123384affc41fc01 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Tue, 8 Nov 2022 17:21:19 +0100 Subject: [PATCH 1/5] Update private build dependencies --- Directory.Build.props | 4 +- src/Umbraco.Deploy.Contrib/packages.lock.json | 80 ++----------------- .../packages.lock.json | 80 ++----------------- 3 files changed, 18 insertions(+), 146 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index cde4b8d..88f6b8e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,10 +21,10 @@ - + - + diff --git a/src/Umbraco.Deploy.Contrib/packages.lock.json b/src/Umbraco.Deploy.Contrib/packages.lock.json index 26b8bf3..b2e37ed 100644 --- a/src/Umbraco.Deploy.Contrib/packages.lock.json +++ b/src/Umbraco.Deploy.Contrib/packages.lock.json @@ -14,9 +14,9 @@ }, "Nerdbank.GitVersioning": { "type": "Direct", - "requested": "[3.5.113, )", - "resolved": "3.5.113", - "contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg==" + "requested": "[3.5.119, )", + "resolved": "3.5.119", + "contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g==" }, "StyleCop.Analyzers": { "type": "Direct", @@ -49,12 +49,9 @@ }, "Umbraco.GitVersioning.Extensions": { "type": "Direct", - "requested": "[0.1.1, )", - "resolved": "0.1.1", - "contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==", - "dependencies": { - "Microsoft.Build.Tasks.Core": "17.1.0" - } + "requested": "[0.2.0, )", + "resolved": "0.2.0", + "contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ==" }, "CSharpTest.Net.Collections-NetStd2": { "type": "Transitive", @@ -389,53 +386,11 @@ "resolved": "5.0.0", "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" }, - "Microsoft.Build.Framework": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==", - "dependencies": { - "Microsoft.Win32.Registry": "4.3.0", - "System.Security.Permissions": "4.7.0" - } - }, - "Microsoft.Build.Tasks.Core": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==", - "dependencies": { - "Microsoft.Build.Framework": "17.1.0", - "Microsoft.Build.Utilities.Core": "17.1.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.CodeDom": "4.4.0", - "System.Collections.Immutable": "5.0.0", - "System.Reflection.Metadata": "1.6.0", - "System.Resources.Extensions": "4.6.0", - "System.Security.Cryptography.Pkcs": "4.7.0", - "System.Security.Cryptography.Xml": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Threading.Tasks.Dataflow": "6.0.0" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" }, - "Microsoft.Build.Utilities.Core": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==", - "dependencies": { - "Microsoft.Build.Framework": "17.1.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections.Immutable": "5.0.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Text.Encoding.CodePages": "4.0.1" - } - }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", "resolved": "3.3.2", @@ -712,15 +667,6 @@ "resolved": "1.3.5", "contentHash": "ra0tg6E90GUtK5Vaksx9cDKtMu8fsLFAyUhcNMhd4vXXGt2CnpE0EQT3mK/R502DwcAZbjG5V7/FMk2RxtxLFg==" }, - "Microsoft.NET.StringTools": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1114,11 +1060,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.CodeDom": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA==" - }, "System.Collections": { "type": "Transitive", "resolved": "4.3.0", @@ -1645,11 +1586,6 @@ "resolved": "4.4.0", "contentHash": "dkmh/ySlwnXJp/1qYP9uyKkCK1CXR/REFzl7abHcArxBcV91mY2CgrrzSRA5Z/X4MevJWwXsklGRdR3A7K9zbg==" }, - "System.Resources.Extensions": { - "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw==" - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -2036,8 +1972,8 @@ }, "System.Threading.Tasks.Dataflow": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA==" + "resolved": "5.0.0", + "contentHash": "NBp0zSAMZp4muDje6XmbDfmkqw9+qsDCHp+YMEtnVgHEjQZ3Q7MzFTTp3eHqpExn4BwMrS7JkUVOTcVchig4Sw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", diff --git a/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json b/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json index 92e0faa..3513933 100644 --- a/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json +++ b/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json @@ -24,9 +24,9 @@ }, "Nerdbank.GitVersioning": { "type": "Direct", - "requested": "[3.5.113, )", - "resolved": "3.5.113", - "contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg==" + "requested": "[3.5.119, )", + "resolved": "3.5.119", + "contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g==" }, "NUnit3TestAdapter": { "type": "Direct", @@ -70,12 +70,9 @@ }, "Umbraco.GitVersioning.Extensions": { "type": "Direct", - "requested": "[0.1.1, )", - "resolved": "0.1.1", - "contentHash": "HX3t4/YgcqIMlaOQuvr83rGCBSDoPaGBZ6NZ95CFO70WxSuddvbW80bL9ND/sf4P0zeiR8drldqWc5BSYXN56g==", - "dependencies": { - "Microsoft.Build.Tasks.Core": "17.1.0" - } + "requested": "[0.2.0, )", + "resolved": "0.2.0", + "contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ==" }, "AutoFixture": { "type": "Transitive", @@ -462,53 +459,11 @@ "resolved": "5.0.0", "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" }, - "Microsoft.Build.Framework": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "7PPEbjuL/lKQ8ftblxwBZKf5alZCA4GDvBTiO3UAVxtRe52a2jL3mc8TpKNiJZzytGz7fKdR5ClDCs7+Uw4hMg==", - "dependencies": { - "Microsoft.Win32.Registry": "4.3.0", - "System.Security.Permissions": "4.7.0" - } - }, - "Microsoft.Build.Tasks.Core": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "obCL4Tb2wpc684sCTlS4hriNhI+6MBqlVWOQoajo9zYv/aqAN53YdIZ3Lnw5XszoYCCQexy2sT/MNElMgoSN9g==", - "dependencies": { - "Microsoft.Build.Framework": "17.1.0", - "Microsoft.Build.Utilities.Core": "17.1.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.CodeDom": "4.4.0", - "System.Collections.Immutable": "5.0.0", - "System.Reflection.Metadata": "1.6.0", - "System.Resources.Extensions": "4.6.0", - "System.Security.Cryptography.Pkcs": "4.7.0", - "System.Security.Cryptography.Xml": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Threading.Tasks.Dataflow": "6.0.0" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" }, - "Microsoft.Build.Utilities.Core": { - "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "JqhQ4q6L4IyA0Wh3PrDrxHHYMVHyOLIusyC4imAnhcnZiOC4+CwgVRSdo8fLsQmvz0Jab8FFrU1NPZFbDoxRng==", - "dependencies": { - "Microsoft.Build.Framework": "17.1.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections.Immutable": "5.0.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Text.Encoding.CodePages": "4.0.1" - } - }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", "resolved": "3.3.2", @@ -790,15 +745,6 @@ "resolved": "1.3.5", "contentHash": "ra0tg6E90GUtK5Vaksx9cDKtMu8fsLFAyUhcNMhd4vXXGt2CnpE0EQT3mK/R502DwcAZbjG5V7/FMk2RxtxLFg==" }, - "Microsoft.NET.StringTools": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1232,11 +1178,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.CodeDom": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA==" - }, "System.Collections": { "type": "Transitive", "resolved": "4.3.0", @@ -1828,11 +1769,6 @@ "resolved": "4.4.0", "contentHash": "dkmh/ySlwnXJp/1qYP9uyKkCK1CXR/REFzl7abHcArxBcV91mY2CgrrzSRA5Z/X4MevJWwXsklGRdR3A7K9zbg==" }, - "System.Resources.Extensions": { - "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "6aVCk8oTFZNT3Tx1jjiPi6+aipiJ3qMZYttAREKTRJidP50YvNeOn4PXrqzfA5qC23fLReq2JYp+nJwzj62HGw==" - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -2230,8 +2166,8 @@ }, "System.Threading.Tasks.Dataflow": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA==" + "resolved": "5.0.0", + "contentHash": "NBp0zSAMZp4muDje6XmbDfmkqw9+qsDCHp+YMEtnVgHEjQZ3Q7MzFTTp3eHqpExn4BwMrS7JkUVOTcVchig4Sw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", From 2812d0968ccb7ca351b967da79b0c77ac405ebc7 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Thu, 9 Feb 2023 14:46:38 +0100 Subject: [PATCH 2/5] Bumped version to 10.1.1. --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 60f1888..c1a211e 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "10.2.0-alpha", + "version": "10.1.1", "assemblyVersion": { "precision": "build" }, From da5bb7166e778d6f428d15b87fcbe74b389b9fc6 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 9 Feb 2023 15:56:07 +0100 Subject: [PATCH 3/5] Remove Central Package Management --- Directory.Build.props | 8 ++++++ Directory.Packages.props | 18 ------------- NuGet.config | 11 -------- Umbraco.Deploy.Contrib.sln | 1 - .../CompatibilitySuppressions.xml | 7 ------ .../Umbraco.Deploy.Contrib.csproj | 2 +- src/Umbraco.Deploy.Contrib/packages.lock.json | 2 +- .../Umbraco.Deploy.Contrib.Tests.csproj | 6 ++--- .../packages.lock.json | 25 +++++++++---------- 9 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index af7bcd7..046ba3e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,6 +15,14 @@ true + + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props deleted file mode 100644 index e00208b..0000000 --- a/Directory.Packages.props +++ /dev/null @@ -1,18 +0,0 @@ - - - true - - - - - - - - - - - - - - - diff --git a/NuGet.config b/NuGet.config index 33a9e38..28c2290 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,15 +6,4 @@ - - - - - - - - - - - diff --git a/Umbraco.Deploy.Contrib.sln b/Umbraco.Deploy.Contrib.sln index 5dd3a0d..2b15fc3 100644 --- a/Umbraco.Deploy.Contrib.sln +++ b/Umbraco.Deploy.Contrib.sln @@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution azure-pipelines.yml = azure-pipelines.yml CONTRIBUTING.md = CONTRIBUTING.md Directory.Build.props = Directory.Build.props - Directory.Packages.props = Directory.Packages.props global.json = global.json icon.png = icon.png LICENSE.md = LICENSE.md diff --git a/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml b/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml index ceebcff..406c78a 100644 --- a/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml +++ b/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml @@ -91,11 +91,4 @@ lib/net6.0/Umbraco.Deploy.Contrib.dll true - - CP0003 - Umbraco.Deploy.Contrib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - lib/net6.0/Umbraco.Deploy.Contrib.dll - lib/net6.0/Umbraco.Deploy.Contrib.dll - true - \ No newline at end of file diff --git a/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj b/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj index 0f8c1fa..530744f 100644 --- a/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj +++ b/src/Umbraco.Deploy.Contrib/Umbraco.Deploy.Contrib.csproj @@ -5,6 +5,6 @@ - + diff --git a/src/Umbraco.Deploy.Contrib/packages.lock.json b/src/Umbraco.Deploy.Contrib/packages.lock.json index f440483..4526dc8 100644 --- a/src/Umbraco.Deploy.Contrib/packages.lock.json +++ b/src/Umbraco.Deploy.Contrib/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 1, "dependencies": { "net6.0": { "Microsoft.SourceLink.GitHub": { diff --git a/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj b/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj index 3bc5b0e..f6f5338 100644 --- a/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj +++ b/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json b/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json index 62f7b00..0c9fba3 100644 --- a/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json +++ b/tests/Umbraco.Deploy.Contrib.Tests/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 1, "dependencies": { "net6.0": { "Microsoft.NET.Test.Sdk": { @@ -45,7 +45,7 @@ }, "Umbraco.Cms.Tests": { "type": "Direct", - "requested": "[10.1.0, 11.0.0)", + "requested": "[10.1.0, )", "resolved": "10.1.0", "contentHash": "Ov0vvPS+40Jxj1nli/nM6fpjaYcUglcZEhM3/3OYEf1D3Mq1YBb81BqfU2FBcQVNqCM0EJl3veKeQ9RwKPCtRw==", "dependencies": { @@ -2088,6 +2088,16 @@ "Umbraco.Cms.Core": "[10.0.0, 11.0.0)" } }, + "Umbraco.Deploy.Infrastructure": { + "type": "Transitive", + "resolved": "10.1.0", + "contentHash": "xX3//I/oqzhsaQYNrI0tIfxJT6fc17UU3oX2BZh1JFH6Oa3XmG1mWHVjxIlaSgLzbquIVCMdmyinPBCI5uiQJw==", + "dependencies": { + "Umbraco.Cms.Web.BackOffice": "[10.0.0, 11.0.0)", + "Umbraco.Deploy.Core": "10.1.0", + "Umbraco.Licensing": "4.0.0" + } + }, "Umbraco.Licensing": { "type": "Transitive", "resolved": "4.0.0", @@ -2104,17 +2114,6 @@ "dependencies": { "Umbraco.Deploy.Infrastructure": "[10.1.0, 11.0.0)" } - }, - "Umbraco.Deploy.Infrastructure": { - "type": "CentralTransitive", - "requested": "[10.1.0, 11.0.0)", - "resolved": "10.1.0", - "contentHash": "xX3//I/oqzhsaQYNrI0tIfxJT6fc17UU3oX2BZh1JFH6Oa3XmG1mWHVjxIlaSgLzbquIVCMdmyinPBCI5uiQJw==", - "dependencies": { - "Umbraco.Cms.Web.BackOffice": "[10.0.0, 11.0.0)", - "Umbraco.Deploy.Core": "10.1.0", - "Umbraco.Licensing": "4.0.0" - } } } } From 641342135a43a9cae05b5e809a546994fbb9ae80 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 9 Feb 2023 16:46:51 +0100 Subject: [PATCH 4/5] Add additional caching using IContextCache (#59) * Fix missing cached entity key lookup * Use throw expressions in constructors * Remove non-existent Umbraco.BlockEditor alias --- .../DocTypeGridEditorCellValueConnector.cs | 2 +- .../ValueConnectors/BlockEditorValueConnector.cs | 14 ++++---------- .../ValueConnectors/BlockListValueConnector.cs | 5 ++++- .../MultiUrlPickerValueConnector.cs | 10 ++++------ .../ValueConnectors/NestedContentValueConnector.cs | 9 +++------ 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs index 54111c3..3805b0e 100644 --- a/src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs +++ b/src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs @@ -25,7 +25,7 @@ public class DocTypeGridEditorCellValueConnector : GridCellValueConnectorBase2 public DocTypeGridEditorCellValueConnector(ILogger logger, IContentTypeService contentTypeService, Lazy valueConnectors) { - _logger = logger; + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService)); _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors)); } diff --git a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockEditorValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockEditorValueConnector.cs index b5153cb..be824c6 100644 --- a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockEditorValueConnector.cs +++ b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockEditorValueConnector.cs @@ -26,10 +26,7 @@ public abstract class BlockEditorValueConnector : ValueConnectorBase private readonly ILogger _logger; /// - public override IEnumerable PropertyEditorAliases { get; } = new[] - { - "Umbraco.BlockEditor" - }; + public override IEnumerable PropertyEditorAliases { get; } = Enumerable.Empty(); // cannot inject ValueConnectorCollection directly as it would cause a circular (recursive) dependency, // so we have to inject it lazily and use the lazy value when actually needing it @@ -37,12 +34,9 @@ public abstract class BlockEditorValueConnector : ValueConnectorBase public BlockEditorValueConnector(IContentTypeService contentTypeService, Lazy valueConnectors, ILogger logger) { - if (contentTypeService == null) throw new ArgumentNullException(nameof(contentTypeService)); - if (valueConnectors == null) throw new ArgumentNullException(nameof(valueConnectors)); - if (logger == null) throw new ArgumentNullException(nameof(logger)); - _contentTypeService = contentTypeService; - _valueConnectorsLazy = valueConnectors; - _logger = logger; + _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService)); + _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); } public override string ToArtifact(object value, PropertyType propertyType, ICollection dependencies, IContextCache contextCache) diff --git a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockListValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockListValueConnector.cs index 71df976..779b18c 100644 --- a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockListValueConnector.cs +++ b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/BlockListValueConnector.cs @@ -11,7 +11,10 @@ namespace Umbraco.Deploy.Contrib.Connectors.ValueConnectors /// public class BlockListValueConnector : BlockEditorValueConnector { - public override IEnumerable PropertyEditorAliases => new[] { "Umbraco.BlockList" }; + public override IEnumerable PropertyEditorAliases { get; } = new[] + { + "Umbraco.BlockList" + }; public BlockListValueConnector(IContentTypeService contentTypeService, Lazy valueConnectors, ILogger logger) : base(contentTypeService, valueConnectors, logger) diff --git a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/MultiUrlPickerValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/MultiUrlPickerValueConnector.cs index 988575d..1ce366f 100644 --- a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/MultiUrlPickerValueConnector.cs +++ b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/MultiUrlPickerValueConnector.cs @@ -50,11 +50,9 @@ public class MultiUrlPickerValueConnector : ValueConnectorBase /// public MultiUrlPickerValueConnector(IEntityService entityService, IMediaService mediaService, ILogger logger) { - if (entityService == null) throw new ArgumentNullException(nameof(entityService)); - if (mediaService == null) throw new ArgumentNullException(nameof(mediaService)); - _entityService = entityService; - _mediaService = mediaService; - _logger = logger; + _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService)); + _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); } public sealed override string ToArtifact(object value, PropertyType propertyType, ICollection dependencies, IContextCache contextCache) @@ -85,7 +83,7 @@ public sealed override string ToArtifact(object value, PropertyType propertyType : UmbracoObjectTypes.Document; var entityType = isMedia ? Constants.UdiEntityType.Media : Constants.UdiEntityType.Document; - var guidAttempt = _entityService.GetKey(intId, objectTypeId); + var guidAttempt = contextCache.GetEntityKeyById(_entityService, intId, objectTypeId); if (guidAttempt.Success == false) continue; diff --git a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs index 66146f6..ceec0af 100644 --- a/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs +++ b/src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs @@ -41,12 +41,9 @@ public class NestedContentValueConnector : ValueConnectorBase public NestedContentValueConnector(IContentTypeService contentTypeService, Lazy valueConnectors, ILogger logger) { - if (contentTypeService == null) throw new ArgumentNullException(nameof(contentTypeService)); - if (valueConnectors == null) throw new ArgumentNullException(nameof(valueConnectors)); - if (logger == null) throw new ArgumentNullException(nameof(logger)); - _contentTypeService = contentTypeService; - _valueConnectorsLazy = valueConnectors; - _logger = logger; + _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService)); + _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); } public sealed override string ToArtifact(object value, PropertyType propertyType, ICollection dependencies, IContextCache contextCache) From 85044bcf070ffad74f899f617ce06accd4cdda80 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Thu, 9 Feb 2023 16:52:30 +0100 Subject: [PATCH 5/5] Bumped version to 9.1.1. --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index d017963..8a507a6 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "9.2.0-alpha", + "version": "9.1.1", "assemblyVersion": { "precision": "build" },