Merge pull request #5031 from dnnsoftware/v9.11.0/dependabot/github_a…

…ctions/peter-evans/create-pull-request-3.14.0-79286499d0356f840de97a3e777008472616783c v9.11.0 Bump peter-evans/create-pull-request from 3.12.1 to 3.14.0
dnnsoftware · Mar 1, 2022 · 6ae1c04 · 6ae1c04
2 parents 5797e9c + e2b3164
commit 6ae1c04
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 18 deletions.
diff --git a/.github/BUILD.md b/.github/BUILD.md
@@ -11,11 +11,10 @@ When contributing to DNN, you'd typically go through steps 2 and 3 at least and
 
 ## External sources
 
-There are two projects not included in this repository that are distributed with DNN:
-* [CKEditorProvider](https://github.com/DNN-Connect/CKEditorProvider) - The default HTML Editor Provider
+There is one project not included in this repository that are distributed with DNN:
 * [CDF](https://github.com/dnnsoftware/ClientDependency) - The Dnn Client Dependency Framework
 
-If you wish to make changes to those, please keep this in mind.
+If you wish to make changes to that project, please keep this in mind.
 
 ## Used Build Technologies
 

diff --git a/.github/workflows/image-actions.yml b/.github/workflows/image-actions.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Create Pull Request
         if: | # If it's not a Pull Request then commit any changes as a new PR.
           github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v3.12.1
+        uses: peter-evans/create-pull-request@v3.14.0
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

diff --git a/.github/workflows/updateVersions.yml b/.github/workflows/updateVersions.yml
@@ -28,7 +28,7 @@ jobs:
         run: yarn install --mode=update-lockfile --no-immutable
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.12.1
+        uses: peter-evans/create-pull-request@v3.14.0
         with:
           commit-message: Updates versions as per release candidate creation
           title: Updates versions as per release candidate creation

diff --git a/Build/Tasks/packaging.json b/Build/Tasks/packaging.json
@@ -40,7 +40,8 @@
     "/bin/System.Web.WebPages.Razor.dll",
     "/bin/WebMatrix.Data.dll",
     "/bin/WebMatrix.WebData.dll",
-    "/Install/Module/DNNCE_Website.Deprecated_*_Install.zip"
+    "/Install/Module/DNNCE_Website.Deprecated_*_Install.zip",
+    "/bin/WebFormsMvp.dll"
   ],
   "installInclude": ["/Install/InstallWizard.aspx.cs"],
   "upgradeExclude": [
@@ -52,7 +53,8 @@
     "/bin/Providers/DotNetNuke.Providers.AspNetClientCapabilityProvider.dll",
     "/bin/Newtonsoft.Json.dll",
     "/Config/DotNetNuke.config",
-    "/Install/InstallWizard.aspx"
+    "/Install/InstallWizard.aspx",
+    "/bin/WebFormsMvp.dll"
   ],
   "symbolsInclude": [
     "/bin/*.pdb",

diff --git a/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec
@@ -18,9 +18,9 @@
       <dependency id="DotNetNuke.Web" version="$version$" />
       <dependency id="DotNetNuke.Web.Client" version="$version$" />
       <dependency id="DotNetNuke.WebApi" version="$version$" />
-      <dependency id="Microsoft.AspNet.Mvc" version="5.1.3" />
-      <dependency id="Microsoft.AspNet.Razor" version="3.1.2" />
-      <dependency id="Microsoft.AspNet.WebPages" version="3.1.2" />
+      <dependency id="Microsoft.AspNet.Mvc" version="5.2.7" />
+      <dependency id="Microsoft.AspNet.Razor" version="3.2.7" />
+      <dependency id="Microsoft.AspNet.WebPages" version="3.2.7" />
       <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
     </dependencies>
   </metadata>

diff --git a/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec b/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec
@@ -15,8 +15,8 @@
     </description>
     <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
     <dependencies>
-      <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
-      <dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />
+      <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.7" />
+      <dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.7" />
       <dependency id="NewtonSoft.Json" version="10.0.3" />
       <dependency id="DotNetNuke.Web" version="$version$" />
     </dependencies>

diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManager.config b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManager.config
@@ -4,7 +4,7 @@
 		<AnalyticsEngine>
 			<EngineType>DotNetNuke.Services.Analytics.GoogleTagManagerEngine, DNN.Connectors.GoogleTagManager</EngineType>
 			<ElementId>Head</ElementId>
-			<InjectTop>False</InjectTop>
+			<InjectTop>True</InjectTop>
 			<ScriptTemplate>
 				<![CDATA[     
           <!-- Google Tag Manager -->

diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/DotNetNuke.Data.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/DotNetNuke.Data.SqlDataProvider
@@ -6447,7 +6447,6 @@ INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [Package
 INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (19, NULL, N'System.Web.WebPages.Deployment.dll', N'2.0.20710')
 INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (20, NULL, N'System.Web.WebPages.dll', N'2.0.20710')
 INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (21, NULL, N'System.Web.WebPages.Razor.dll', N'2.0.20126')
-INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (22, NULL, N'WebFormsMvp.dll', N'1.4.1')
 INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (23, NULL, N'WebMatrix.Data.dll', N'2.0.20126')
 INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] ([AssemblyID], [PackageID], [AssemblyName], [Version]) VALUES (24, NULL, N'WebMatrix.WebData.dll', N'2.0.20126')
 SET IDENTITY_INSERT {databaseOwner}[{objectQualifier}Assemblies] OFF

diff --git a/DNN Platform/Website/release.config b/DNN Platform/Website/release.config
@@ -260,10 +260,6 @@
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebFormsMvp" publicKeyToken="537f18701145dff0" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.999.999" newVersion="1.4.1.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />