Merge branch 'main' into develop

GeekInTheNorth · Sep 26, 2024 · 9d7ea1a · 9d7ea1a
2 parents 2014672 + e920a26
commit 9d7ea1a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/Sample/OptimizelyTwelveTest/Views/Shared/_Layout.cshtml b/Sample/OptimizelyTwelveTest/Views/Shared/_Layout.cshtml
@@ -12,6 +12,14 @@
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
 
+    <link rel="stylesheet" asp-href-include="~/*.css" />
+
+    <style nonce="">
+        body {
+            padding-top: 3.5rem;
+        }
+    </style>
+
     @Html.RequiredClientResources(RenderingTags.Header)
     @await Html.RenderEPiServerQuickNavigatorAsync()
 </head>
@@ -36,6 +44,7 @@
     @RenderBody()
 
     <script nonce src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js" integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+" crossorigin="anonymous"></script>
+    <script nonce asp-src-include="~/*.js"></script>
 
     @await RenderSectionAsync("Scripts", required: false)
     @Html.RequiredClientResources(RenderingTags.Footer)

diff --git a/Sample/OptimizelyTwelveTest/Views/_ViewImports.cshtml b/Sample/OptimizelyTwelveTest/Views/_ViewImports.cshtml
@@ -1,3 +1,5 @@
 @using OptimizelyTwelveTest.Features.MetaData
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, OptimizelyTwelveTest.Features
-@addTagHelper *, Stott.Security.Optimizely
+@addTagHelper *, Stott.Security.Optimizely
diff --git a/Sample/OptimizelyTwelveTest/wwwroot/Site.js b/Sample/OptimizelyTwelveTest/wwwroot/Site.js
@@ -0,0 +1 @@
+
diff --git a/Sample/OptimizelyTwelveTest/wwwroot/Style.css b/Sample/OptimizelyTwelveTest/wwwroot/Style.css
@@ -0,0 +1,3 @@
+body {
+    background-color: lightpink;
+}
diff --git a/src/Stott.Security.Optimizely/Features/Nonce/NonceTagHelper.cs b/src/Stott.Security.Optimizely/Features/Nonce/NonceTagHelper.cs
@@ -8,6 +8,8 @@ public sealed class NonceTagHelper : TagHelper
 {
     private readonly INonceProvider _nonceProvider;
 
+    public override int Order => -9999;
+
     public NonceTagHelper(INonceProvider nonceProvider)
     {
         _nonceProvider = nonceProvider;

diff --git a/src/Stott.Security.Optimizely/Stott.Security.Optimizely.csproj b/src/Stott.Security.Optimizely/Stott.Security.Optimizely.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>2.8.0.0</Version>
+    <Version>2.8.1.0</Version>
     <RepositoryUrl>https://github.com/GeekInTheNorth/Stott.Security.Optimizely</RepositoryUrl>
     <PackageProjectUrl>https://github.com/GeekInTheNorth/Stott.Security.Optimizely</PackageProjectUrl>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -14,10 +14,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <AssemblyVersion>2.8.0.0</AssemblyVersion>
+    <AssemblyVersion>2.8.1.0</AssemblyVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageOutputPath>D:\Repos\Nuget</PackageOutputPath>
-    <PackageReleaseNotes>Update of the menu system, caching and lazy loading improvements and package updates.</PackageReleaseNotes>
+    <PackageReleaseNotes>Correct tag helper to work with the built in .net script tag helper.</PackageReleaseNotes>
     <Nullable>enable</Nullable>
     <Title>Stott Security</Title>
   </PropertyGroup>