Merge branch 'release/v04.01.00'

DocFx Generator/articles/changelog.md

@@ -17,6 +17,7 @@
 * The `AttributeOptions` and `TagOptions` were made read-only for reliable fluid / immutable APIs.
   This is kind of a **breaking change** but we believe it won't affect anybody.
   since it was basically an internal API which nobody used outside of this.
+* Changed minimum requirement on `Razor.Blade.Dnn` to be DNN 9.6.1
 
 ## Version 3
 

Razor.Blade/Blade/HtmlTagService/HtmlTagServiceImplementation_Generated.cs

@@ -1,10 +1,14 @@
-using ToSic.Razor.Html5;
 
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
+using ToSic.Razor.Markup;
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands

Razor.Blade/Blade/HtmlTagService/IHtmlTagService_Generated.cs

@@ -1,10 +1,14 @@
-using ToSic.Razor.Html5;
 
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
+using ToSic.Razor.Markup;
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands

Razor.Blade/Blade/Interfaces/IHtmlTag.cs

@@ -92,6 +92,7 @@ public interface IHtmlTag: ITag
         /// So just run AsHtmlTag() so it becomes a more generic object but still has all the common Id, Class, Wrap etc.
         /// </summary>
         /// <returns></returns>
+        [PrivateApi("not sure if this is useful")]
         IHtmlTag AsHtmlTag();
     }
 }

Razor.Blade/Blade/Tags/SafeUrl.cs

@@ -1,10 +1,4 @@
-#if NETFRAMEWORK
-using HtmlString = System.Web.HtmlString;
-#else
-//using IHtmlString = Microsoft.AspNetCore.Html.IHtmlContent;
-using HtmlString = Microsoft.AspNetCore.Html.HtmlString;
-//using HtmlEncoder = System.Text.Encodings.Web.HtmlEncoder;
-#endif
+using ToSic.Razor.Internals;
 using ToSic.Razor.Markup;
 
 namespace ToSic.Razor.Blade
@@ -17,6 +11,6 @@ public partial class Tags
         /// </summary>
         /// <param name="url"></param>
         /// <returns></returns>
-        public static HtmlString SafeUrl(string url) => new HtmlString(TagBase.UriEncode(url));
+        public static RawHtmlString SafeUrl(string url) => new RawHtmlString(UriHelpers.UriEncode(url));
     }
 }

Razor.Blade/Html5/GeneratedFormatting.cs

@@ -1,11 +1,14 @@
 using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands

Razor.Blade/Html5/GeneratedForms.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -792,7 +796,7 @@ private Input(Input original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Input object to enable fluid command chaining</returns>
-        public Input Src(string value) => this.Attr("src", UriEncode(value));
+        public Input Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedFrames.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -99,7 +103,7 @@ private Iframe(Iframe original, CloneChanges changes) : base(original, changes)
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Iframe object to enable fluid command chaining</returns>
-        public Iframe Src(string value) => this.Attr("src", UriEncode(value));
+        public Iframe Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedHead.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -59,7 +63,7 @@ private Base(Base original, CloneChanges changes) : base(original, changes) { }
     /// <param name="value">what should be in href='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Base object to enable fluid command chaining</returns>
-        public Base Href(string value) => this.Attr("href", UriEncode(value));
+        public Base Href(string value) => this.Attr("href", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedImages.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -223,7 +227,7 @@ private Img(Img original, CloneChanges changes) : base(original, changes) { }
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Img object to enable fluid command chaining</returns>
-        public Img Src(string value) => this.Attr("src", UriEncode(value));
+        public Img Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 
@@ -235,7 +239,7 @@ private Img(Img original, CloneChanges changes) : base(original, changes) { }
     /// <param name="value">what should be in srcset='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Img object to enable fluid command chaining</returns>
-        public Img Srcset(string value) => this.Attr("srcset", UriEncodeSrcSet(value), ",");
+        public Img Srcset(string value) => this.Attr("srcset", UriHelpers.UriEncodeSrcSet(value), ",");
 
 
 
@@ -247,7 +251,7 @@ private Img(Img original, CloneChanges changes) : base(original, changes) { }
     /// <param name="name">image name</param>
     /// <param name="multiplier">what the images is for - numbers below 8 are used for resolution densities, larger numbers for pixel widths</param>  
     /// <returns>a Img object to enable fluid command chaining</returns>
-        public Img Srcset(string name, int multiplier) => this.Attr("srcset", UriEncode(name) + " " + multiplier + (multiplier > 8 ? "w" : "x"), ",");
+        public Img Srcset(string name, int multiplier) => this.Attr("srcset", UriHelpers.UriEncode(name) + " " + multiplier + (multiplier > 8 ? "w" : "x"), ",");
 
 
     /// <summary>

Razor.Blade/Html5/GeneratedLinks.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -70,7 +74,7 @@ private A(A original, CloneChanges changes) : base(original, changes) { }
     /// <param name="value">what should be in href='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a A object to enable fluid command chaining</returns>
-        public A Href(string value) => this.Attr("href", UriEncode(value));
+        public A Href(string value) => this.Attr("href", UriHelpers.UriEncode(value));
 
 
 
@@ -192,7 +196,7 @@ private Link(Link original, CloneChanges changes) : base(original, changes) { }
     /// <param name="value">what should be in href='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Link object to enable fluid command chaining</returns>
-        public Link Href(string value) => this.Attr("href", UriEncode(value));
+        public Link Href(string value) => this.Attr("href", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedMedia.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -142,7 +146,7 @@ private Audio(Audio original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Audio object to enable fluid command chaining</returns>
-        public Audio Src(string value) => this.Attr("src", UriEncode(value));
+        public Audio Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 
@@ -187,7 +191,7 @@ private Source(Source original, CloneChanges changes) : base(original, changes)
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Source object to enable fluid command chaining</returns>
-        public Source Src(string value) => this.Attr("src", UriEncode(value));
+        public Source Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 
@@ -199,7 +203,7 @@ private Source(Source original, CloneChanges changes) : base(original, changes)
     /// <param name="value">what should be in srcset='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Source object to enable fluid command chaining</returns>
-        public Source Srcset(string value) => this.Attr("srcset", UriEncodeSrcSet(value), ",");
+        public Source Srcset(string value) => this.Attr("srcset", UriHelpers.UriEncodeSrcSet(value), ",");
 
 
 
@@ -211,7 +215,7 @@ private Source(Source original, CloneChanges changes) : base(original, changes)
     /// <param name="name">image name</param>
     /// <param name="multiplier">what the images is for - numbers below 8 are used for resolution densities, larger numbers for pixel widths</param>  
     /// <returns>a Source object to enable fluid command chaining</returns>
-        public Source Srcset(string name, int multiplier) => this.Attr("srcset", UriEncode(name) + " " + multiplier + (multiplier > 8 ? "w" : "x"), ",");
+        public Source Srcset(string name, int multiplier) => this.Attr("srcset", UriHelpers.UriEncode(name) + " " + multiplier + (multiplier > 8 ? "w" : "x"), ",");
 
 
     /// <summary>
@@ -327,7 +331,7 @@ private Track(Track original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Track object to enable fluid command chaining</returns>
-        public Track Src(string value) => this.Attr("src", UriEncode(value));
+        public Track Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 
@@ -473,7 +477,7 @@ private Video(Video original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in poster='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Video object to enable fluid command chaining</returns>
-        public Video Poster(string value) => this.Attr("poster", UriEncode(value));
+        public Video Poster(string value) => this.Attr("poster", UriHelpers.UriEncode(value));
 
 
 
@@ -496,7 +500,7 @@ private Video(Video original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Video object to enable fluid command chaining</returns>
-        public Video Src(string value) => this.Attr("src", UriEncode(value));
+        public Video Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedScripts.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands
@@ -77,7 +81,7 @@ private Embed(Embed original, CloneChanges changes) : base(original, changes) {
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Embed object to enable fluid command chaining</returns>
-        public Embed Src(string value) => this.Attr("src", UriEncode(value));
+        public Embed Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 
@@ -184,7 +188,7 @@ private Object(Object original, CloneChanges changes) : base(original, changes)
     /// <param name="value">what should be in data='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Object object to enable fluid command chaining</returns>
-        public Object Data(string value) => this.Attr("data", UriEncode(value));
+        public Object Data(string value) => this.Attr("data", UriHelpers.UriEncode(value));
 
 
 
@@ -411,7 +415,7 @@ private Script(Script original, CloneChanges changes) : base(original, changes)
     /// <param name="value">what should be in src='...'.
     /// If called multiple times, later values replace the previous value.</param>
     /// <returns>a Script object to enable fluid command chaining</returns>
-        public Script Src(string value) => this.Attr("src", UriEncode(value));
+        public Script Src(string value) => this.Attr("src", UriHelpers.UriEncode(value));
 
 
 

Razor.Blade/Html5/GeneratedSemantics.cs

@@ -1,10 +1,14 @@
+using System;
+using ToSic.Razor.Blade;
+using ToSic.Razor.Html5;
 using ToSic.Razor.Markup;
-
+using ToSic.Razor.Internals;
+using ToSic.Razor.Internals.Documentation;
 // ****
 // ****
 // This is auto-generated code - don't modify
 // Re-run the generation program to recreate
-// Created 07.12.2022 00:28
+// Created 09.12.2022 16:48
 //
 // Each tag and attributes of it prepare code, and they return an object of the same type again
 // to allow fluid chaining of the commands