Skip to content

Commit cd6a603

Browse files
jcdcdevjcdcdev
authored
Merge pull request #101 from jcdcdev/dev/v14
14.1.8
2 parents 1238984 + 3b6eb23 commit cd6a603

File tree

15 files changed

+1671
-1215
lines changed

15 files changed

+1671
-1215
lines changed

‎src/TestSite.14/TestSite.14.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="14.3.3"/>
10+
<PackageReference Include="Umbraco.Cms" Version="14.3.4"/>
1111
<PackageReference Include="uSync" Version="14.0.0-rc4"/>
1212
</ItemGroup>
1313

‎src/TestSite.14/packages.lock.json‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
},
1818
"Umbraco.Cms": {
1919
"type": "Direct",
20-
"requested": "[14.3.1, )",
21-
"resolved": "14.3.1",
22-
"contentHash": "x7pA0VhHuqlyrukpK4wzBscc+NWnJnQRZzaFZgXY7fhVs8qLI+VpNKaOFwXX9+irq7MsZouhA1yi8h/jTwbzdg==",
20+
"requested": "[14.3.4, )",
21+
"resolved": "14.3.4",
22+
"contentHash": "9k9udy1OTjSV2Aeh9IlfgAHDvAEVWAxbW50HYjEHqlCyYEIz/YXQoqqC/Mq+0A8FAu9/bGUuwvpbuHrc1qRU3w==",
2323
"dependencies": {
24-
"Umbraco.Cms.Imaging.ImageSharp": "[14.3.1, 15.0.0)",
25-
"Umbraco.Cms.Persistence.EFCore.SqlServer": "[14.3.1, 15.0.0)",
26-
"Umbraco.Cms.Persistence.EFCore.Sqlite": "[14.3.1, 15.0.0)",
27-
"Umbraco.Cms.Persistence.SqlServer": "[14.3.1, 15.0.0)",
28-
"Umbraco.Cms.Persistence.Sqlite": "[14.3.1, 15.0.0)",
29-
"Umbraco.Cms.Targets": "[14.3.1, 15.0.0)"
24+
"Umbraco.Cms.Imaging.ImageSharp": "[14.3.4, 15.0.0)",
25+
"Umbraco.Cms.Persistence.EFCore.SqlServer": "[14.3.4, 15.0.0)",
26+
"Umbraco.Cms.Persistence.EFCore.Sqlite": "[14.3.4, 15.0.0)",
27+
"Umbraco.Cms.Persistence.SqlServer": "[14.3.4, 15.0.0)",
28+
"Umbraco.Cms.Persistence.Sqlite": "[14.3.4, 15.0.0)",
29+
"Umbraco.Cms.Targets": "[14.3.4, 15.0.0)"
3030
}
3131
},
3232
"uSync": {
@@ -1748,8 +1748,8 @@
17481748
},
17491749
"SixLabors.ImageSharp": {
17501750
"type": "Transitive",
1751-
"resolved": "3.1.5",
1752-
"contentHash": "lNtlq7dSI/QEbYey+A0xn48z5w4XHSffF8222cC4F4YwTXfEImuiBavQcWjr49LThT/pRmtWJRcqA/PlL+eJ6g=="
1751+
"resolved": "3.1.7",
1752+
"contentHash": "9fIOOAsyLFid6qKypM2Iy0Z3Q9yoanV8VoYAHtI2sYGMNKzhvRTjgFDHonIiVe+ANtxIxM6SuqUzj0r91nItpA=="
17531753
},
17541754
"SixLabors.ImageSharp.Web": {
17551755
"type": "Transitive",
@@ -2812,43 +2812,43 @@
28122812
},
28132813
"Umbraco.Cms.Api.Common": {
28142814
"type": "Transitive",
2815-
"resolved": "14.3.1",
2816-
"contentHash": "aNhFzS34ger9cbGJXorq50J4QUnyZwGbKv9/xDEHlT8nzrZFrVDdbJXkTfXzLk/cW/veYeXc0audIkIX8HHxpA==",
2815+
"resolved": "14.3.4",
2816+
"contentHash": "qhkM+m86K/uqAuRr/Y4gbHYM+G5X2Qum2mUbK9V3K/jeFvgYrM/ZfuvtIOvkhmdc7dGMCgHfJH7Ko/nQ+hFspw==",
28172817
"dependencies": {
28182818
"Asp.Versioning.Mvc": "8.1.0",
28192819
"Asp.Versioning.Mvc.ApiExplorer": "8.1.0",
28202820
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
28212821
"OpenIddict.Abstractions": "5.7.0",
28222822
"OpenIddict.AspNetCore": "5.7.0",
28232823
"Swashbuckle.AspNetCore": "6.7.3",
2824-
"Umbraco.Cms.Core": "[14.3.1, 15.0.0)",
2825-
"Umbraco.Cms.Web.Common": "[14.3.1, 15.0.0)"
2824+
"Umbraco.Cms.Core": "[14.3.4, 15.0.0)",
2825+
"Umbraco.Cms.Web.Common": "[14.3.4, 15.0.0)"
28262826
}
28272827
},
28282828
"Umbraco.Cms.Api.Delivery": {
28292829
"type": "Transitive",
2830-
"resolved": "14.3.1",
2831-
"contentHash": "7q3b2tw7QNQrcdNaq5btiQYaSi62FUaOMZlAd3NzSdATtjZ9yrkbZm7UZ7awIokkC7pfJaP0aeb5feMjgQ3AbA==",
2830+
"resolved": "14.3.4",
2831+
"contentHash": "o0POz1hLXHocte/o+M/yGN/ILYiM72ctLfdjRQVlUgNyaMpOtFYNof2cbLSB2mjYiP/oSmzUPSriyfTtVbkGHg==",
28322832
"dependencies": {
2833-
"Umbraco.Cms.Api.Common": "[14.3.1, 15.0.0)",
2834-
"Umbraco.Cms.Web.Common": "[14.3.1, 15.0.0)"
2833+
"Umbraco.Cms.Api.Common": "[14.3.4, 15.0.0)",
2834+
"Umbraco.Cms.Web.Common": "[14.3.4, 15.0.0)"
28352835
}
28362836
},
28372837
"Umbraco.Cms.Api.Management": {
28382838
"type": "Transitive",
2839-
"resolved": "14.3.1",
2840-
"contentHash": "RWva4a2wclFVIW+59IwN2r1MGD8uyEAU6n3kGxh7Mu6CXd9bMGowVcMssANITaLPV1dDLJ78d+KfIWt1JGgluw==",
2839+
"resolved": "14.3.4",
2840+
"contentHash": "6q2jWQn7PF1W9W5nQlxtsqXVIQnBrAF12RCPtrbFpSvUJp4iRFWpbhjdDsLMbcPnK3kR8qw7RTEAvRQ7DI0Hzw==",
28412841
"dependencies": {
28422842
"JsonPatch.Net": "3.1.1",
28432843
"Swashbuckle.AspNetCore": "6.7.3",
2844-
"Umbraco.Cms.Api.Common": "[14.3.1, 15.0.0)",
2845-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2844+
"Umbraco.Cms.Api.Common": "[14.3.4, 15.0.0)",
2845+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
28462846
}
28472847
},
28482848
"Umbraco.Cms.Core": {
28492849
"type": "Transitive",
2850-
"resolved": "14.3.1",
2851-
"contentHash": "zzMW6kXrz5CszU9QE246xvf2VusjBKOvng9mwgUY/tnlwerCay9o0O5XACDN3ySAxFyXIzRAcxgPDsjyh2zBIQ==",
2850+
"resolved": "14.3.4",
2851+
"contentHash": "6Vx7VTnh+gQtc7GqBn8lombgAC6IV5jCWF24VeMgFH8FCfJOe0sQZ37soHFyE+R0rX8VrSnHixjsE02P3HEnmw==",
28522852
"dependencies": {
28532853
"Microsoft.Extensions.Caching.Abstractions": "8.0.0",
28542854
"Microsoft.Extensions.Caching.Memory": "8.0.1",
@@ -2865,28 +2865,28 @@
28652865
},
28662866
"Umbraco.Cms.Examine.Lucene": {
28672867
"type": "Transitive",
2868-
"resolved": "14.3.1",
2869-
"contentHash": "3AkmcgbI3ziuI9NeN5UdTavAbvIWkQJjKP8U+7dxKdzkgU7uIo8oAp27SMulh4WS3cddT8LzMGSSKUzkRMPm/A==",
2868+
"resolved": "14.3.4",
2869+
"contentHash": "6vingMLM7m/YuT84kvITjiNuXuPjnrMuVnFseFIrfKXfOpq6mDXkoFentIxTmTLk7V4LX1XzhR9M107SLVZTVQ==",
28702870
"dependencies": {
28712871
"Examine": "3.3.0",
28722872
"System.Security.Cryptography.Xml": "8.0.1",
2873-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2873+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
28742874
}
28752875
},
28762876
"Umbraco.Cms.Imaging.ImageSharp": {
28772877
"type": "Transitive",
2878-
"resolved": "14.3.1",
2879-
"contentHash": "Jj+eih5rO1Jv8sBMfeQE1s6xFeyY1W5AtiRH3bTcQnvd+CP6cLHZtpOvrK7HEAndhL3oWwh9CAOzBDurIJLpFQ==",
2878+
"resolved": "14.3.4",
2879+
"contentHash": "O5SqFFtF95mEsZ4rWBo7D7OA840WvFfqoAdFwit5r4BfY48LuFAc0Xr7khrncAmQ9ZvyaNLlzRhuM+kAxc4u2w==",
28802880
"dependencies": {
2881-
"SixLabors.ImageSharp": "3.1.5",
2881+
"SixLabors.ImageSharp": "3.1.7",
28822882
"SixLabors.ImageSharp.Web": "3.1.3",
2883-
"Umbraco.Cms.Web.Common": "[14.3.1, 15.0.0)"
2883+
"Umbraco.Cms.Web.Common": "[14.3.4, 15.0.0)"
28842884
}
28852885
},
28862886
"Umbraco.Cms.Infrastructure": {
28872887
"type": "Transitive",
2888-
"resolved": "14.3.1",
2889-
"contentHash": "wIbVP+K1HtWhh2zDJwg91J65KGUyQYIihA9WoGp886h8xSPp6qamaVw1TUvABTcChjg3W3L8yjSIjyReu6/1NQ==",
2888+
"resolved": "14.3.4",
2889+
"contentHash": "utOG4TgE3tEQeuDAqhNlLtu0My+c5VNPcNtjxOTD5APZOM8YZM0NvpL/pNf7iYQ08lM9eqxq967tKHD4idC6Kw==",
28902890
"dependencies": {
28912891
"Examine.Core": "3.3.0",
28922892
"HtmlAgilityPack": "1.11.65",
@@ -2912,97 +2912,97 @@
29122912
"Serilog.Sinks.Async": "1.5.0",
29132913
"Serilog.Sinks.File": "5.0.0",
29142914
"Serilog.Sinks.Map": "1.0.2",
2915-
"Umbraco.Cms.Core": "[14.3.1, 15.0.0)",
2915+
"Umbraco.Cms.Core": "[14.3.4, 15.0.0)",
29162916
"ncrontab": "3.3.3"
29172917
}
29182918
},
29192919
"Umbraco.Cms.Persistence.EFCore": {
29202920
"type": "Transitive",
2921-
"resolved": "14.3.1",
2922-
"contentHash": "yFrlDx4oK0EaypDcBXr4JHZq8jmqhaENW8ZpFtPb9d5PM8eOPfhCbE5D/a6wyvSXgif+wqkX8mI95NciNmCXTA==",
2921+
"resolved": "14.3.4",
2922+
"contentHash": "kLbr+RflxmtyykWVOSuDirkaKdL/JzVCnSKh256jSdZ+RExVEuuC10KbtjiR/Ty7ON3SI9JrTCqU6lwkCiBTXA==",
29232923
"dependencies": {
29242924
"Azure.Identity": "1.12.0",
29252925
"Microsoft.EntityFrameworkCore.SqlServer": "8.0.8",
29262926
"Microsoft.EntityFrameworkCore.Sqlite": "8.0.8",
29272927
"OpenIddict.EntityFrameworkCore": "5.7.0",
2928-
"Umbraco.Cms.Core": "[14.3.1, 15.0.0)",
2929-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2928+
"Umbraco.Cms.Core": "[14.3.4, 15.0.0)",
2929+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
29302930
}
29312931
},
29322932
"Umbraco.Cms.Persistence.EFCore.Sqlite": {
29332933
"type": "Transitive",
2934-
"resolved": "14.3.1",
2935-
"contentHash": "Scepx5pXitt66ZfTTfnMKmgtVmhKnT5XJdcLYlv+GfJrPggBoWqRgY3vai/yS5/YL+WOodeu4LP8/tAEAmZdbw==",
2934+
"resolved": "14.3.4",
2935+
"contentHash": "LLhnBx+IzMw/KcbjuA5hQxUN4l+RyzaB/UxI28fWMXxlitESPY3b4TRa8p9eMuIgveAcFc0hgywEdrBkQgUzeg==",
29362936
"dependencies": {
29372937
"Microsoft.EntityFrameworkCore.Sqlite": "8.0.8",
2938-
"Umbraco.Cms.Persistence.EFCore": "[14.3.1, 15.0.0)"
2938+
"Umbraco.Cms.Persistence.EFCore": "[14.3.4, 15.0.0)"
29392939
}
29402940
},
29412941
"Umbraco.Cms.Persistence.EFCore.SqlServer": {
29422942
"type": "Transitive",
2943-
"resolved": "14.3.1",
2944-
"contentHash": "c1WnoyLG7FjqnoLEgBYNd9XezWLGnjrcH6ql/+boR+TPnJaN1XwsDT9E+eBj/edGgNP6Xu2wQgFi5SrCEF07Sw==",
2943+
"resolved": "14.3.4",
2944+
"contentHash": "Upe+kmZrVb+kkOqfa/FxHE3HBAnOGZ/MYRpOxMHIron9zIBtQAoy+aQ6BLaHbsTEPunU2XcyCdn8GM4fuiTPgA==",
29452945
"dependencies": {
29462946
"Azure.Identity": "1.12.0",
29472947
"Microsoft.EntityFrameworkCore.SqlServer": "8.0.8",
29482948
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
2949-
"Umbraco.Cms.Persistence.EFCore": "[14.3.1, 15.0.0)"
2949+
"Umbraco.Cms.Persistence.EFCore": "[14.3.4, 15.0.0)"
29502950
}
29512951
},
29522952
"Umbraco.Cms.Persistence.Sqlite": {
29532953
"type": "Transitive",
2954-
"resolved": "14.3.1",
2955-
"contentHash": "jAa/2H+G3S3gEgn1AtAH9ouML77PadteR95ehTJS0Dymh7qKbA9TwYuogxet6ZED0Hs9wZCCArVBq6GXcQfbgQ==",
2954+
"resolved": "14.3.4",
2955+
"contentHash": "5h9aZ4iEHMUXkQWaRQOim/ue+UijSTfDZuv+KGHuJcpw0XKdxipYrwZDktrZuoP1Dk176GvcuJHHrDbf5UpHzg==",
29562956
"dependencies": {
29572957
"Microsoft.Data.Sqlite": "8.0.8",
2958-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2958+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
29592959
}
29602960
},
29612961
"Umbraco.Cms.Persistence.SqlServer": {
29622962
"type": "Transitive",
2963-
"resolved": "14.3.1",
2964-
"contentHash": "xfe7zK/+UiKojfPi9p7EjGLcZFkT6vERHzwvlX0Mw8XFsMb4iu4FEZ4CUYBYinya0QqeQmscl0E7zEA/8nrlLQ==",
2963+
"resolved": "14.3.4",
2964+
"contentHash": "+JoQrXBZyKp6h/lL3+EnXAb/Qxvgnetrb/v+nFKJUPC+cWXG44AlP/+/q24qGoIkTGZtJRQ1cwRqUyrOS5cYyw==",
29652965
"dependencies": {
29662966
"Azure.Identity": "1.12.0",
29672967
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
29682968
"NPoco.SqlServer": "5.7.1",
2969-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2969+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
29702970
}
29712971
},
29722972
"Umbraco.Cms.PublishedCache.NuCache": {
29732973
"type": "Transitive",
2974-
"resolved": "14.3.1",
2975-
"contentHash": "GxE120OSHYyDFO/eA29ed2f9e9PV0WBp77YC+o3yQDVF3JvfgFBUh/qPGyirDJCr3v466XeYJnfMcRpYl/+8+A==",
2974+
"resolved": "14.3.4",
2975+
"contentHash": "1/LYgTx3aViiBrZU/mK4lVvkxtOFc+AK8iIDcnorPzWApGeVhG+kzYf8+9Uel5KPVEIyYWERpnCpsJzokb/NDw==",
29762976
"dependencies": {
29772977
"K4os.Compression.LZ4": "1.3.8",
29782978
"MessagePack": "2.5.187",
29792979
"Umbraco.CSharpTest.Net.Collections": "15.0.0",
2980-
"Umbraco.Cms.Infrastructure": "[14.3.1, 15.0.0)"
2980+
"Umbraco.Cms.Infrastructure": "[14.3.4, 15.0.0)"
29812981
}
29822982
},
29832983
"Umbraco.Cms.StaticAssets": {
29842984
"type": "Transitive",
2985-
"resolved": "14.3.1",
2986-
"contentHash": "zIIFVcIB9veE0AG6jyB1enX3xLoIrnQfJcYNZhfgVpBKgcn/13Qae2Io1JPf/6un/xy2E9wAR5VZTUm0bJlUNg==",
2985+
"resolved": "14.3.4",
2986+
"contentHash": "fbqMmLxBXpDFkHB81mydLQq5hlIL1xnZzddEPceYPoFc155kY/d0MXm12+xydUvSpXPhFJ3+Wi36F+pWVv3rAg==",
29872987
"dependencies": {
2988-
"Umbraco.Cms.Api.Management": "[14.3.1, 15.0.0)",
2989-
"Umbraco.Cms.Web.Website": "[14.3.1, 15.0.0)"
2988+
"Umbraco.Cms.Api.Management": "[14.3.4, 15.0.0)",
2989+
"Umbraco.Cms.Web.Website": "[14.3.4, 15.0.0)"
29902990
}
29912991
},
29922992
"Umbraco.Cms.Targets": {
29932993
"type": "Transitive",
2994-
"resolved": "14.3.1",
2995-
"contentHash": "/2ihnfao0HKMQGt9cpl9mrj/e2RrDSdIMBqCnUB57y9tZ2sXHeDiNnzmACDNmuzcy1Uv4fxiGaUmrRFKfLhNOQ==",
2994+
"resolved": "14.3.4",
2995+
"contentHash": "nD2obEIrRhTxvAByEXrTlR/eJjP+bRuMuMRCtRJe6q3QUYDhPTj6XA52g2d3Bm0u5bmbSzin9SlB+wXU6SHjFA==",
29962996
"dependencies": {
2997-
"Umbraco.Cms.Api.Delivery": "[14.3.1, 15.0.0)",
2998-
"Umbraco.Cms.Api.Management": "[14.3.1, 15.0.0)",
2999-
"Umbraco.Cms.StaticAssets": "[14.3.1, 15.0.0)"
2997+
"Umbraco.Cms.Api.Delivery": "[14.3.4, 15.0.0)",
2998+
"Umbraco.Cms.Api.Management": "[14.3.4, 15.0.0)",
2999+
"Umbraco.Cms.StaticAssets": "[14.3.4, 15.0.0)"
30003000
}
30013001
},
30023002
"Umbraco.Cms.Web.Common": {
30033003
"type": "Transitive",
3004-
"resolved": "14.3.1",
3005-
"contentHash": "/gg+5xp7OOYGOrLhiHh5pFnBR7clfwqJLpSHNN9znCp7r6znufkOcEwEGFF9Sg1vcP+sr4slAJ68cU1+A9jCaw==",
3004+
"resolved": "14.3.4",
3005+
"contentHash": "13Kx/LxuviYsCmVWsw6Q04PRWY0jiawjbZbAv0Vzmg7KGgsmmqs3t4eHoNezH8AK+F+YYtLp8xY243yN91YVsg==",
30063006
"dependencies": {
30073007
"Asp.Versioning.Mvc": "8.1.0",
30083008
"Asp.Versioning.Mvc.ApiExplorer": "8.1.0",
@@ -3013,16 +3013,16 @@
30133013
"Serilog.AspNetCore": "8.0.2",
30143014
"System.Net.Http": "4.3.4",
30153015
"System.Text.RegularExpressions": "4.3.1",
3016-
"Umbraco.Cms.Examine.Lucene": "[14.3.1, 15.0.0)",
3017-
"Umbraco.Cms.PublishedCache.NuCache": "[14.3.1, 15.0.0)"
3016+
"Umbraco.Cms.Examine.Lucene": "[14.3.4, 15.0.0)",
3017+
"Umbraco.Cms.PublishedCache.NuCache": "[14.3.4, 15.0.0)"
30183018
}
30193019
},
30203020
"Umbraco.Cms.Web.Website": {
30213021
"type": "Transitive",
3022-
"resolved": "14.3.1",
3023-
"contentHash": "UZWxFuU8iRqW+RRaODGejkmvTdYeCYq1w6+Po9FVgSNoupSnTJF5/YzhVMNcHCoePZTre+P4feF8MzsZNwZaqQ==",
3022+
"resolved": "14.3.4",
3023+
"contentHash": "8KMbF/9tA3AHidkPM8GdRm4E5DYAsBqJBb2m/q5Mho1NLDn0ewMJn37dnKnbt6pTTrTBqzzzGLDdq1atVQ5Vnw==",
30243024
"dependencies": {
3025-
"Umbraco.Cms.Web.Common": "[14.3.1, 15.0.0)"
3025+
"Umbraco.Cms.Web.Common": "[14.3.4, 15.0.0)"
30263026
}
30273027
},
30283028
"Umbraco.CSharpTest.Net.Collections": {

‎src/Umbraco.Community.BackOfficeOrganiser.Client/openapi-ts.config.ts‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
import { defineConfig } from '@hey-api/openapi-ts';
1+
import { defineConfig, defaultPlugins } from '@hey-api/openapi-ts';
22

33
export default defineConfig({
4-
input:
5-
'http://localhost:54813/umbraco/swagger/default/swagger.json',
4+
input: 'http://localhost:54813/umbraco/swagger/default/swagger.json',
5+
plugins: [
6+
...defaultPlugins,
7+
'legacy/fetch',
8+
'@hey-api/schemas',
9+
{
10+
dates: true,
11+
name: '@hey-api/transformers',
12+
},
13+
{
14+
enums: 'javascript',
15+
name: '@hey-api/typescript',
16+
},
17+
{
18+
name: '@hey-api/sdk',
19+
transformer: true,
20+
},
21+
],
622
output: {
723
format: 'prettier',
824
path: './src/api',
9-
},
10-
types: {
11-
enums: 'typescript',
12-
},
25+
}
1326
});

0 commit comments

Comments
 (0)