From 5d5d2d126c48c437baf207f036e38057db579418 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 25 Oct 2022 16:52:00 +0100 Subject: [PATCH] Initial upgrade to v11.0.0-rc1 --- .github/workflows/dotnet.yml | 6 +-- .gitignore | 1 + .../Umbraco.Docs.Samples.Web.csproj | 4 +- .../Views/Partials/blockgrid/areas.cshtml | 19 +++++++++ .../Views/Partials/blockgrid/default.cshtml | 11 +++++ .../Views/Partials/blockgrid/items.cshtml | 39 ++++++++++++++++++ .../umbraco/Data/Umbraco.sqlite.db-shm | Bin 32768 -> 32768 bytes .../umbraco/Data/Umbraco.sqlite.db-wal | Bin 4264232 -> 4264232 bytes global.json | 4 +- 9 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml create mode 100644 Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml create mode 100644 Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 104dc44..751fe85 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,9 +2,9 @@ name: .NET on: push: - branches: [ "develop" ] + branches: [ "develop-v11" ] pull_request: - branches: [ "develop" ] + branches: [ "develop-v11" ] jobs: build: @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/.gitignore b/.gitignore index 4e8929e..e0d3392 100644 --- a/.gitignore +++ b/.gitignore @@ -467,6 +467,7 @@ $RECYCLE.BIN/ # JSON Schema file for appsettings # This is auto generated from the build appsettings-schema.json +appsettings-schema.Umbraco.Cms.json **/App_Plugins/* !**/App_Plugins/MyCustomDashboard diff --git a/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj b/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj index 98748f7..b9882c8 100644 --- a/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj +++ b/Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj @@ -1,12 +1,12 @@ - net6.0 + net7.0 enable - + diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml new file mode 100644 index 0000000..94eef55 --- /dev/null +++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml @@ -0,0 +1,19 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Areas.Any() != true) { return; } +} + +
+ @foreach (var area in Model.Areas) + { +
+ @await Html.GetBlockGridItemsHtmlAsync(area) +
+ } +
diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml new file mode 100644 index 0000000..e25839e --- /dev/null +++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/default.cshtml @@ -0,0 +1,11 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Any() != true) { return; } +} + +
+ @await Html.GetBlockGridItemsHtmlAsync(Model) +
diff --git a/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml new file mode 100644 index 0000000..2831c14 --- /dev/null +++ b/Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml @@ -0,0 +1,39 @@ +@using Umbraco.Cms.Core.Models.Blocks +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage> +@{ + if (Model?.Any() != true) { return; } +} + +
+ @foreach (var item in Model) + { + bool attrForceLeft = item.ForceLeft; + bool attrForceRight = item.ForceRight; +
+ @{ + var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; + try + { + @await Html.PartialAsync(partialViewName, item) + } + catch (InvalidOperationException) + { +

+ Could not render component of type: @(item.Content.ContentType.Alias) +
+ This likely happened because the partial view @partialViewName could not be found. +

+ } + } +
+ } +
diff --git a/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm b/Umbraco.Docs.Samples.Web/umbraco/Data/Umbraco.sqlite.db-shm index 1f67ff442479e0029d70273c8b6684d65dcaa56d..38abbe9b2bb1cd360ce4b6002a39f0f5b5979530 100644 GIT binary patch delta 380 zcmZo@U}|V!s+V}A%K!r0K+MR%ATW)Yfq@^$@G3p>@z6^7m&Ui&#zokL{mt&q+sM+C zbC*>0V8ej~$lU)(04mPJP`a`4Ht*yfUV+JHcx1r1fJZ>c6ew>7#O**l3y7H*Cs*-E zZI0pdHe_O+y!m3pMW)UFobni%CooR|@_HF3|8W&yEn}`?Zk(*>Bf445&5e<9Dp1Cp zaq|+7I%fWI=4$3T<|gJ=<__j==7~T>vzetC`hm3i=5Ic3oXma9(}2obnKmDZaAM}H zWUggyU~XY<2a2&XO%{t2V(bK}&1LKX3e+-97D*Ih>;en)0tG%YO)lUw+q@@5hMB*D mxrVu(xtX~Q=wU^M@0$;%{A5~Oz{j%rLEZ#@#z{cc{fq!7;(fsY delta 280 zcmZo@U}|V!s+V}A%K!q*K+MR%AW#Zq@B^1sunYSuALV&oCU@=z zQq_YE2NH!qbN?d&s5lct?#9O3yqh2Jc^gjtz}K?*V#H;p&HtS87&l*vn7}yskE_6B zBOj^FYHn^I5evr6OFZhBCtr$K#V9@bA)n^vZ$56EK#2~f%|{}fn1L(-rpaP)LO{kF wrpY3SAjStKpvlWN?@5ti=7%{4L@P3U-+VCTC)45&d@P$E!VJLK0vJ<6YdZcBV z?98tx>FwM9eaHX5?b{8BJ}r764hd+0MreX&7y&IX5?Wytv_U&0AqAu1I2Z%R!&n#x zC%}m?9wxvR(e(;Snf~lX+Zuxw0lOW zucB&Jc~N=g!lDAcaKS8T(QMwsSIqUyD)p5VFPO(M9Oqye2M1DEF-HJ73{Q(P5E%}j zT_lJ@JtWAA37eFF3&^5~rthVnvz%9#ug8RMyVUCwnQ9U}_7u2)r=uSpcfLg}Mxy<- zpYPc*nnb>AeFN8D9n;M-iuc{m2$M|1e+MGZ3m3*)g`bjhd#JUOQ`2C9gW-{(rIy} z{`U5+mbN-?%gUvV4V`WNj>eXiDCrnIiAYXEDcgmaXr&9-)zoF+U3`ocX#quZ)Vb(&4@u5~u0O50fv=?xJ*YDD%#sIA&cO^Ui?M zZ8j*;8EES@I%UGBhsJb~C0XJCi|}94i|r3r!ov}kcgWpNX5DYkhC|H^LA5=4`{bq* z0ZxaSN!fI$6O9-mzUO*W#8IIR%o{Qs#Kb936;-}~#Cwx4!CthVyMb+bS-tRM@L5OnjW%|`p5V_A`xL(Qh* zGJN`C@%g3UB4>p}Uf4WXQ?%fB*L0DyD6=l|*VP-BGqVuu0yD>b(rfhHXjR7`i-F0zAlp-UHP02*1mzyp_n-uM+=ihtF)%xO7coAsO+8R8O;MXkg1 zc|04ORZtm~_H{wJ<&N9wANfv6wdVj6Rur+cWU;zhYi2-%BHBwEzOZ1DJ z?5Y!(l*Of-%rk=1$3Bq)1exU|0eG2wkHGSbi}3*<^DM{seA=n*GpOWdKoGH!=lZs< zee+h9?g4_jiBWf`n<{)Aj8Ice1{{x#)j!9N*Jh1cVEnoLOBUr;{4LkelY11anehN7 zHsXW5cy!Jr5PtvQYI)p~o0U90&7gIIs#$G2Znl2ky4AWNpj@=XM;HhK8^i{K<7w=4 za6E;bQg3ItSD0dhN$V2!HDr@N|2XuJX{d{Kvt}!Aoo=0`_R;QlBjd~loVbq-hKAFj z;gtG<%l(EaIrxZGTVESU6sCCXw~ zBZg15>tD4?{}nlTZvC1He^Y0DyZZdFp&XCsv3wco|h!X z!RJc_4x!Ko93DPjbnpTzdN|P|dHBL_hC3m6bh8XCNOZw$i;EvPZZ7iL+v92e9_?WuFcoIZK8%T>MnJQx=y`E4Xb!|#G6#;@cPpkIw`#=d|jDrmXF}? zZV0X;M=)v%g{UfWggUOj-3*brvY`wALdZ>$p&dv5XE+{Rxyq}F%FFG>y)T+wp&e?O z?ouC7H>mfi5q*b4l*MR>#7#zn1?4ScQsO^2+BxUSVcj0a=S2EoNx(H7#apk*kGU%^S!Ysroyvmq_ja delta 947 zcmb7>Ye-XZ7>C`Ky40P`yK7pTOY_onXUAR6@v+71jg8#*$=5Qa%Z%M4vokfEX!u5JFKK19%m--j1op5Md!cC-Pr!<8Cf z025fS4!pq!e1Q$?!4Lc)062gF7kCf|K@bcf5DH-s4iUhI4IqF>h=Pr<34|bmXb{6@ zh=Ewx0&x%z36Ka|K>|sT3{t>B1_Y#l927lD!5xD=mg2BW_bkdJ0 zO-YiIxKt%q(CR8m#9%Y}TK8Iom(S3RGbE44HrIQ-m=}7b)52`ZH8yuOX0eU^xwNW? zV(|=lR+7Wk5#4s%GUtb$cZE+E7Ex80-e^2RzmB2!40i6k&El_ZV$!?HsE?RGzE-Hh zr83mVYFo*dXO1nQzUIZ%^6DnB6!o?EJPYkTY&)y39Oe72a?80h*h~7Hn3;#^?e7|B z^$^KtaDyfteG?V(dJeYW6@c9}6qv{e#_u(iHx}-6It{|BtY|&;UV_X7mdOuhykH)k zLgqG8;4-CxB$3*HUq-0-ixx*}iQ2IP#{!MBNG-Tlc0RJV^)a1eavut_R1f!L*O=)N zt9yL=;6{%90y&51gojQjWKvv-=*6|esr;-?4AHkSEw`sM=4C|JOg~J%-txSg9`JGB zeWYP_rGICHlO7Lqk9yHm#-URcIz&(L(B%r1f>0rP!UChP+j@dVblK-+$~>n8!1PcW&G0akiWjsQ9NRfzL`0L3gw