From 2f321ff15b77e90f289798c31041669da83e6245 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 01:34:57 +0000 Subject: [PATCH 1/7] Bump Microsoft.Build.Tasks.Git from 1.0.0 to 1.1.1 Bumps [Microsoft.Build.Tasks.Git](https://github.com/dotnet/sourcelink) from 1.0.0 to 1.1.1. - [Release notes](https://github.com/dotnet/sourcelink/releases) - [Commits](https://github.com/dotnet/sourcelink/compare/1.0.0...1.1.1) --- updated-dependencies: - dependency-name: Microsoft.Build.Tasks.Git dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../DotNetNuke.Instrumentation.csproj | 218 +-- .../packages.config | 2 +- .../DotNetNuke.Log4Net.csproj | 1528 ++++++++--------- .../DotNetNuke.Log4net/packages.config | 2 +- .../DotNetNuke.Web.Client.csproj | 8 +- .../DotNetNuke.Web.Client/packages.config | 2 +- .../DotNetNuke.Web.Mvc.csproj | 512 +++--- .../DotNetNuke.Web.Mvc/packages.config | 2 +- .../DotNetNuke.Web.Razor.csproj | 8 +- .../DotNetNuke.Web.Razor/packages.config | 2 +- .../DotNetNuke.Web/DotNetNuke.Web.csproj | 8 +- DNN Platform/DotNetNuke.Web/packages.config | 2 +- .../DotNetNuke.WebUtility.vbproj | 446 ++--- .../DotNetNuke.WebUtility/packages.config | 2 +- .../HttpModules/DotNetNuke.HttpModules.csproj | 342 ++-- DNN Platform/HttpModules/packages.config | 2 +- .../Library/DotNetNuke.Library.csproj | 8 +- DNN Platform/Library/packages.config | 2 +- .../DotNetNuke.Modules.DigitalAssets.csproj | 8 +- .../Modules/DigitalAssets/packages.config | 2 +- .../DnnExportImport/DnnExportImport.csproj | 20 +- .../Modules/DnnExportImport/packages.config | 2 +- .../DnnExportImportLibrary.csproj | 256 +-- .../DnnExportImportLibrary/packages.config | 2 +- ...otNetNuke.Providers.FolderProviders.csproj | 326 ++-- .../Providers/FolderProviders/packages.config | 2 +- .../DNN.Integration.Test.Framework.csproj | 8 +- .../packages.config | 2 +- .../DotNetNuke.Tests.Utilities.csproj | 8 +- .../packages.config | 2 +- .../Dnn.EditBar.Library.csproj | 8 +- .../Dnn.EditBar.Library/packages.config | 2 +- .../Dnn.EditBar.UI/Dnn.EditBar.UI.csproj | 8 +- .../EditBar/Dnn.EditBar.UI/packages.config | 2 +- .../Dnn.PersonaBar.Library.csproj | 20 +- .../Dnn.PersonaBar.Library/packages.config | 2 +- .../Dnn.PersonaBar.UI.csproj | 8 +- .../Library/Dnn.PersonaBar.UI/packages.config | 2 +- 38 files changed, 1893 insertions(+), 1893 deletions(-) diff --git a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj index a98d362268e..4945dd349a4 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj +++ b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj @@ -1,111 +1,111 @@ - + - - - - - true - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {3CD5F6B8-8360-4862-80B6-F402892DB7DD} - Library - Properties - DotNetNuke.Instrumentation - DotNetNuke.Instrumentation - v4.7.2 - 512 - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - bin\DotNetNuke.Instrumentation.xml - 1591, 0649 - 7 - true - - - pdbonly - true - bin\ - TRACE - prompt - 4 - bin\DotNetNuke.Instrumentation.xml - 1591, 0649 - 7 - true - - - - False - ..\DotNetNuke.Log4net\bin\dotnetnuke.log4net.dll - - - - - - - - - SolutionInfo.cs - - - - - - - - - - - - stylecop.json - - - - - - - - - - - - $(MSBuildProjectDirectory)\..\.. - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - + + + + + true + + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {3CD5F6B8-8360-4862-80B6-F402892DB7DD} + Library + Properties + DotNetNuke.Instrumentation + DotNetNuke.Instrumentation + v4.7.2 + 512 + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + bin\DotNetNuke.Instrumentation.xml + 1591, 0649 + 7 + true + + + pdbonly + true + bin\ + TRACE + prompt + 4 + bin\DotNetNuke.Instrumentation.xml + 1591, 0649 + 7 + true + + + + False + ..\DotNetNuke.Log4net\bin\dotnetnuke.log4net.dll + + + + + + + + + SolutionInfo.cs + + + + + + + + + + + + stylecop.json + + + + + + + + + + + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Instrumentation/packages.config b/DNN Platform/DotNetNuke.Instrumentation/packages.config index 05c281d39b4..b757d19eb41 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/packages.config +++ b/DNN Platform/DotNetNuke.Instrumentation/packages.config @@ -1,6 +1,6 @@  - + diff --git a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj index 986cbe8e00f..72ad2166f11 100644 --- a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj +++ b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj @@ -1,766 +1,766 @@ - - + + - - - - - true - - - - - {04F77171-0634-46E0-A95E-D7477C88712E} - 2 - Debug - AnyCPU - DotNetNuke.log4net - Library - v4.7.2 - - - - bin\ - true - TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5 - false - 4 - full - prompt - AnyCPU - false - 7 - bin\DotNetNuke.log4net.xml - - - bin\ - false - TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5 - true - 4 - pdbonly - prompt - AnyCPU - false - 7 - bin\DotNetNuke.log4net.xml - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - - $(MSBuildProjectDirectory)\..\.. - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - + + + + + true + + + + + {04F77171-0634-46E0-A95E-D7477C88712E} + 2 + Debug + AnyCPU + DotNetNuke.log4net + Library + v4.7.2 + + + + bin\ + true + TRACE;DEBUG;NET;NET_2_0;NET_4_0;NET_4_5 + false + 4 + full + prompt + AnyCPU + false + 7 + bin\DotNetNuke.log4net.xml + + + bin\ + false + TRACE;STRONG;NET;NET_2_0;NET_4_0;NET_4_5 + true + 4 + pdbonly + prompt + AnyCPU + false + 7 + bin\DotNetNuke.log4net.xml + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Log4net/packages.config b/DNN Platform/DotNetNuke.Log4net/packages.config index f48bd46073a..7c26d1bf3db 100644 --- a/DNN Platform/DotNetNuke.Log4net/packages.config +++ b/DNN Platform/DotNetNuke.Log4net/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj index f2d1c6ac149..6cec8e18318 100644 --- a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj +++ b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj @@ -2,7 +2,7 @@ - + true @@ -114,14 +114,14 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Client/packages.config b/DNN Platform/DotNetNuke.Web.Client/packages.config index 8ab2bff8bc1..e739358d9ee 100644 --- a/DNN Platform/DotNetNuke.Web.Client/packages.config +++ b/DNN Platform/DotNetNuke.Web.Client/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj index 55388cf6ab3..aeba61b674e 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj +++ b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj @@ -1,258 +1,258 @@ - + - - - - - - true - - - - - Debug - AnyCPU - {64DC5798-9D37-4F8D-97DD-8403E6E70DD3} - Library - Properties - DotNetNuke.Web.Mvc - DotNetNuke.Web.Mvc - v4.7.2 - 512 - ..\..\ - true - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - 7 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - 7 - - - - False - ..\Library\bin\DotNetNuke.dll - - - - ..\..\packages\Microsoft.AspNet.WebHelpers.3.2.7\lib\net45\Microsoft.Web.Helpers.dll - True - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - True - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - True - - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - True - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - True - - - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - True - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - True - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - True - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.Data.3.2.7\lib\net45\WebMatrix.Data.dll - True - - - ..\..\packages\Microsoft.AspNet.WebPages.WebData.3.2.7\lib\net45\WebMatrix.WebData.dll - True - - - - - SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - stylecop.json - - - - Designer - - - Designer - - - - - {6928a9b1-f88a-4581-a132-d3eb38669bb0} - DotNetNuke.Abstractions - - - {0fca217a-5f9a-4f5b-a31b-86d64ae65198} - DotNetNuke.DependencyInjection - - - {3cd5f6b8-8360-4862-80b6-f402892db7dd} - DotNetNuke.Instrumentation - - - {03E3AFA5-DDC9-48FB-A839-AD4282CE237E} - DotNetNuke.Web.Client - - - {3D9C3F5F-1D2D-4D89-995B-438055A5E3A6} - DotNetNuke.HttpModules - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - + + + + + + true + + + + + Debug + AnyCPU + {64DC5798-9D37-4F8D-97DD-8403E6E70DD3} + Library + Properties + DotNetNuke.Web.Mvc + DotNetNuke.Web.Mvc + v4.7.2 + 512 + ..\..\ + true + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + 7 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + 7 + + + + False + ..\Library\bin\DotNetNuke.dll + + + + ..\..\packages\Microsoft.AspNet.WebHelpers.3.2.7\lib\net45\Microsoft.Web.Helpers.dll + True + + + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + + + + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + True + + + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + True + + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll + + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + True + + + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + True + + + False + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll + True + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + True + + + + + + + + ..\..\packages\Microsoft.AspNet.WebPages.Data.3.2.7\lib\net45\WebMatrix.Data.dll + True + + + ..\..\packages\Microsoft.AspNet.WebPages.WebData.3.2.7\lib\net45\WebMatrix.WebData.dll + True + + + + + SolutionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stylecop.json + + + + Designer + + + Designer + + + + + {6928a9b1-f88a-4581-a132-d3eb38669bb0} + DotNetNuke.Abstractions + + + {0fca217a-5f9a-4f5b-a31b-86d64ae65198} + DotNetNuke.DependencyInjection + + + {3cd5f6b8-8360-4862-80b6-f402892db7dd} + DotNetNuke.Instrumentation + + + {03E3AFA5-DDC9-48FB-A839-AD4282CE237E} + DotNetNuke.Web.Client + + + {3D9C3F5F-1D2D-4D89-995B-438055A5E3A6} + DotNetNuke.HttpModules + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Mvc/packages.config b/DNN Platform/DotNetNuke.Web.Mvc/packages.config index 38e8fda58fb..e9710e11a2a 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/packages.config +++ b/DNN Platform/DotNetNuke.Web.Mvc/packages.config @@ -9,7 +9,7 @@ - + diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj index ae2ddb16e2e..d91a3555dc2 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj +++ b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj @@ -2,7 +2,7 @@ - + true @@ -160,14 +160,14 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Razor/packages.config b/DNN Platform/DotNetNuke.Web.Razor/packages.config index 5febd36410b..abc306c283c 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/packages.config +++ b/DNN Platform/DotNetNuke.Web.Razor/packages.config @@ -5,7 +5,7 @@ - + diff --git a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj index 8c5c82f2101..863284d9d80 100644 --- a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj +++ b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj @@ -2,7 +2,7 @@ - + true @@ -457,14 +457,14 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/packages.config b/DNN Platform/DotNetNuke.Web/packages.config index a56fca777db..a1f1f0b190a 100644 --- a/DNN Platform/DotNetNuke.Web/packages.config +++ b/DNN Platform/DotNetNuke.Web/packages.config @@ -7,7 +7,7 @@ - + diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj index 017d0f81bee..639ff8dc1cb 100644 --- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj +++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj @@ -1,225 +1,225 @@ - + - - - - - true - - - - - Local - 9.0.30729 - 2.0 - {4912F062-F8A8-4F9D-8F8E-244EBEE1ACBD} - Debug - AnyCPU - - - - - DotNetNuke.WebUtility - - - None - JScript - Grid - IE50 - false - Library - Binary - On - On - - - - - - - Windows - - - v4.7.2 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\ - DotNetNuke.WebUtility.xml - 2015428608 - - - - - true - true - true - false - false - false - false - 1 - 42016,42017,42018,42019,42032,42353,42354,42355 - full - AllRules.ruleset - - - bin\ - DotNetNuke.WebUtility.xml - 2015428608 - - - - - false - true - true - true - false - false - false - 1 - 42016,42017,42018,42019,42032,42353,42354,42355 - pdbonly - AllRules.ruleset - - - - ..\DotNetNuke.Web.Client\bin\DotNetNuke.Web.Client.dll - - - System - - - - System.Web - - - System.XML - - - - - - - - - - - Code - - - - - - - - - - Code - - - Code - - - - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - stylecop.json - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\..\.. - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - + + + + + true + + + + + Local + 9.0.30729 + 2.0 + {4912F062-F8A8-4F9D-8F8E-244EBEE1ACBD} + Debug + AnyCPU + + + + + DotNetNuke.WebUtility + + + None + JScript + Grid + IE50 + false + Library + Binary + On + On + + + + + + + Windows + + + v4.7.2 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + bin\ + DotNetNuke.WebUtility.xml + 2015428608 + + + + + true + true + true + false + false + false + false + 1 + 42016,42017,42018,42019,42032,42353,42354,42355 + full + AllRules.ruleset + + + bin\ + DotNetNuke.WebUtility.xml + 2015428608 + + + + + false + true + true + true + false + false + false + 1 + 42016,42017,42018,42019,42032,42353,42354,42355 + pdbonly + AllRules.ruleset + + + + ..\DotNetNuke.Web.Client\bin\DotNetNuke.Web.Client.dll + + + System + + + + System.Web + + + System.XML + + + + + + + + + + + Code + + + + + + + + + + Code + + + Code + + + + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stylecop.json + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.WebUtility/packages.config b/DNN Platform/DotNetNuke.WebUtility/packages.config index 05c281d39b4..b757d19eb41 100644 --- a/DNN Platform/DotNetNuke.WebUtility/packages.config +++ b/DNN Platform/DotNetNuke.WebUtility/packages.config @@ -1,6 +1,6 @@  - + diff --git a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj index ce1237baf05..0fd39948e11 100644 --- a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj +++ b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj @@ -1,173 +1,173 @@ - + - - - - - true - - - - - 9.0.30729 - 2.0 - {3D9C3F5F-1D2D-4D89-995B-438055A5E3A6} - Debug - AnyCPU - DotNetNuke.HttpModules - Library - v4.7.2 - DotNetNuke.HttpModules - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - bin\ - bin\DotNetNuke.HttpModules.XML - true - true - 4 - full - AllRules.ruleset - 1591 - 7 - DEBUG - - - bin\ - bin\DotNetNuke.HttpModules.XML - true - true - 4 - pdbonly - AllRules.ruleset - 1591 - true - 7 - - - - False - ..\DotNetNuke.Instrumentation\bin\DotNetNuke.Instrumentation.dll - - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - - - - - - - - - SolutionInfo.cs - - - - - - - Code - - - - - - - - - - - {6928A9B1-F88A-4581-A132-D3EB38669BB0} - DotNetNuke.Abstractions - - - {6b29aded-7b56-4484-bea5-c0e09079535b} - DotNetNuke.Library - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - stylecop.json - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\..\.. - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - + + + + + true + + + + + 9.0.30729 + 2.0 + {3D9C3F5F-1D2D-4D89-995B-438055A5E3A6} + Debug + AnyCPU + DotNetNuke.HttpModules + Library + v4.7.2 + DotNetNuke.HttpModules + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + bin\ + bin\DotNetNuke.HttpModules.XML + true + true + 4 + full + AllRules.ruleset + 1591 + 7 + DEBUG + + + bin\ + bin\DotNetNuke.HttpModules.XML + true + true + 4 + pdbonly + AllRules.ruleset + 1591 + true + 7 + + + + False + ..\DotNetNuke.Instrumentation\bin\DotNetNuke.Instrumentation.dll + + + + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + + + + + + + + + SolutionInfo.cs + + + + + + + Code + + + + + + + + + + + {6928A9B1-F88A-4581-A132-D3EB38669BB0} + DotNetNuke.Abstractions + + + {6b29aded-7b56-4484-bea5-c0e09079535b} + DotNetNuke.Library + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stylecop.json + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/HttpModules/packages.config b/DNN Platform/HttpModules/packages.config index a207d534a2c..db1a127b7f8 100644 --- a/DNN Platform/HttpModules/packages.config +++ b/DNN Platform/HttpModules/packages.config @@ -1,6 +1,6 @@  - + diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index 4a1740fb139..6061c1880a2 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -2,7 +2,7 @@ - + true @@ -1930,14 +1930,14 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/DNN Platform/Library/packages.config b/DNN Platform/Library/packages.config index fb905e72231..b4986c96d3c 100644 --- a/DNN Platform/Library/packages.config +++ b/DNN Platform/Library/packages.config @@ -4,7 +4,7 @@ - + diff --git a/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj b/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj index 252dfc7d942..fefdb42a0ba 100644 --- a/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj +++ b/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj @@ -2,7 +2,7 @@ - + true @@ -392,14 +392,14 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/DNN Platform/Modules/DigitalAssets/packages.config b/DNN Platform/Modules/DigitalAssets/packages.config index 4c907085514..2e3603393c8 100644 --- a/DNN Platform/Modules/DigitalAssets/packages.config +++ b/DNN Platform/Modules/DigitalAssets/packages.config @@ -4,7 +4,7 @@ - + diff --git a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj index 18f6d396d1b..f453bb5682d 100644 --- a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj +++ b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj @@ -2,7 +2,7 @@ - + true @@ -186,21 +186,21 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + - \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImport/packages.config b/DNN Platform/Modules/DnnExportImport/packages.config index 0180aeaa216..76a00f64653 100644 --- a/DNN Platform/Modules/DnnExportImport/packages.config +++ b/DNN Platform/Modules/DnnExportImport/packages.config @@ -3,7 +3,7 @@ - + diff --git a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj index 093e3e0fc83..ebbfda3e79e 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj +++ b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj @@ -1,130 +1,130 @@ - + - - - - - - true - - - - - Debug - AnyCPU - {2C624453-4ED2-4BCB-9D71-664AC7D5955C} - Library - Properties - Dnn.ExportImport - DotNetNuke.SiteExportImport.Library - v4.7.2 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 1591 - 7 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - 1591 - 7 - - - - ..\..\..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll - True - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - stylecop.json - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - + + + + + + true + + + + + Debug + AnyCPU + {2C624453-4ED2-4BCB-9D71-664AC7D5955C} + Library + Properties + Dnn.ExportImport + DotNetNuke.SiteExportImport.Library + v4.7.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + 1591 + 7 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + 1591 + 7 + + + + ..\..\..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll + True + + + + + + + Properties\SolutionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stylecop.json + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImportLibrary/packages.config b/DNN Platform/Modules/DnnExportImportLibrary/packages.config index dce84d57d76..b5119fdc492 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/packages.config +++ b/DNN Platform/Modules/DnnExportImportLibrary/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj b/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj index d79423cb1bc..20096216618 100644 --- a/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj +++ b/DNN Platform/Providers/FolderProviders/DotNetNuke.Providers.FolderProviders.csproj @@ -1,165 +1,165 @@ - + - - - - - true - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {B267CE88-DFFC-4BD8-9962-319E79C52526} - Library - Properties - DotNetNuke.Providers.FolderProviders - DotNetNuke.Providers.FolderProviders - v4.7.2 - 512 - - ..\..\..\ - true - - - true - full - false - bin\Providers - DEBUG;TRACE - prompt - 4 - bin\Providers\DotNetNuke.Providers.FolderProviders.XML - 7 - 1591 - - - pdbonly - true - bin\Providers - TRACE - prompt - 4 - bin\Providers\DotNetNuke.Providers.FolderProviders.XML - 1591 - 7 - - - true - full - false - bin\Providers - DEBUG;TRACE;CLOUD;CLOUD_DEBUG - prompt - 4 - bin\Providers\DotNetNuke.Providers.FolderProviders.XML - 7 - 1591 - - - pdbonly - true - bin\Providers - TRACE;CLOUD;CLOUD_RELEASE - prompt - 4 - bin\Providers\DotNetNuke.Providers.FolderProviders.XML - 1591 - 7 - - - - - False - ..\..\Components\WindowsAzure\Microsoft.WindowsAzure.Storage.dll - - - - - - - - - - - - - SolutionInfo.cs - - - - - - - - Settings.ascx - ASPXCodeBehind - - - Settings.ascx.cs - - - - - - - - - - - - stylecop.json - - - - Designer - - - ASPXCodeBehind - - - - - Designer - - - - - - - - - {3cd5f6b8-8360-4862-80b6-f402892db7dd} - DotNetNuke.Instrumentation - - - {6b29aded-7b56-4484-bea5-c0e09079535b} - DotNetNuke.Library - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - + + + + + true + + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {B267CE88-DFFC-4BD8-9962-319E79C52526} + Library + Properties + DotNetNuke.Providers.FolderProviders + DotNetNuke.Providers.FolderProviders + v4.7.2 + 512 + + ..\..\..\ + true + + + true + full + false + bin\Providers + DEBUG;TRACE + prompt + 4 + bin\Providers\DotNetNuke.Providers.FolderProviders.XML + 7 + 1591 + + + pdbonly + true + bin\Providers + TRACE + prompt + 4 + bin\Providers\DotNetNuke.Providers.FolderProviders.XML + 1591 + 7 + + + true + full + false + bin\Providers + DEBUG;TRACE;CLOUD;CLOUD_DEBUG + prompt + 4 + bin\Providers\DotNetNuke.Providers.FolderProviders.XML + 7 + 1591 + + + pdbonly + true + bin\Providers + TRACE;CLOUD;CLOUD_RELEASE + prompt + 4 + bin\Providers\DotNetNuke.Providers.FolderProviders.XML + 1591 + 7 + + + + + False + ..\..\Components\WindowsAzure\Microsoft.WindowsAzure.Storage.dll + + + + + + + + + + + + + SolutionInfo.cs + + + + + + + + Settings.ascx + ASPXCodeBehind + + + Settings.ascx.cs + + + + + + + + + + + + stylecop.json + + + + Designer + + + ASPXCodeBehind + + + + + Designer + + + + + + + + + {3cd5f6b8-8360-4862-80b6-f402892db7dd} + DotNetNuke.Instrumentation + + + {6b29aded-7b56-4484-bea5-c0e09079535b} + DotNetNuke.Library + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Providers/FolderProviders/packages.config b/DNN Platform/Providers/FolderProviders/packages.config index 05c281d39b4..b757d19eb41 100644 --- a/DNN Platform/Providers/FolderProviders/packages.config +++ b/DNN Platform/Providers/FolderProviders/packages.config @@ -1,6 +1,6 @@  - + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj index 170c31d0741..4a427e34472 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj @@ -4,7 +4,7 @@ - + Debug @@ -127,8 +127,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + @@ -136,7 +136,7 @@ - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config index f77b6add13b..ebd48bc260d 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config @@ -2,7 +2,7 @@ - + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj index 6b16f5bdb3d..8144d479537 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -303,14 +303,14 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config index 7f33772cf67..efdf2878862 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config @@ -4,7 +4,7 @@ - + From 21503f6eac1c057a38fb5d4cb08de04e5eb22a11 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Tue, 1 Feb 2022 17:16:05 -0600 Subject: [PATCH 2/7] Update SourceLink packages to 1.1.1 --- .../DotNetNuke.Abstractions.csproj | 76 +++++++++---------- .../DotNetNuke.DependencyInjection.csproj | 8 +- .../DotNetNuke.Instrumentation.csproj | 16 ++-- .../packages.config | 4 +- .../DotNetNuke.Log4Net.csproj | 18 ++--- .../DotNetNuke.Log4net/packages.config | 4 +- .../DotNetNuke.Web.Client.csproj | 16 ++-- .../DotNetNuke.Web.Client/packages.config | 4 +- .../DotNetNuke.Web.Mvc.csproj | 18 ++--- .../DotNetNuke.Web.Mvc/packages.config | 4 +- .../DotNetNuke.Web.Razor.csproj | 16 ++-- .../DotNetNuke.Web.Razor/packages.config | 4 +- .../DotNetNuke.Web/DotNetNuke.Web.csproj | 16 ++-- DNN Platform/DotNetNuke.Web/packages.config | 4 +- .../DotNetNuke.WebUtility.vbproj | 18 ++--- .../DotNetNuke.WebUtility/packages.config | 4 +- .../HttpModules/DotNetNuke.HttpModules.csproj | 18 ++--- DNN Platform/HttpModules/packages.config | 4 +- .../Library/DotNetNuke.Library.csproj | 16 ++-- DNN Platform/Library/packages.config | 4 +- .../DotNetNuke.Modules.DigitalAssets.csproj | 16 ++-- .../Modules/DigitalAssets/packages.config | 4 +- .../DnnExportImport/DnnExportImport.csproj | 16 ++-- .../Modules/DnnExportImport/packages.config | 4 +- .../DnnExportImportLibrary.csproj | 18 ++--- .../DnnExportImportLibrary/packages.config | 4 +- ...otNetNuke.Providers.FolderProviders.csproj | 18 ++--- .../Providers/FolderProviders/packages.config | 4 +- .../DNN.Integration.Test.Framework.csproj | 16 ++-- .../packages.config | 4 +- .../DotNetNuke.Tests.Utilities.csproj | 16 ++-- .../packages.config | 4 +- .../Dnn.EditBar.Library.csproj | 16 ++-- .../Dnn.EditBar.Library/packages.config | 4 +- .../Dnn.EditBar.UI/Dnn.EditBar.UI.csproj | 16 ++-- .../EditBar/Dnn.EditBar.UI/packages.config | 4 +- .../Dnn.PersonaBar.Library.csproj | 16 ++-- .../Dnn.PersonaBar.Library/packages.config | 4 +- .../Dnn.PersonaBar.UI.csproj | 16 ++-- .../Library/Dnn.PersonaBar.UI/packages.config | 4 +- 40 files changed, 238 insertions(+), 238 deletions(-) diff --git a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj index 91e49477f1f..4f08342f527 100644 --- a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj +++ b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj @@ -1,40 +1,40 @@ - - - - netstandard2.0 - false - true - $(MSBuildProjectDirectory)\..\.. - bin/$(Configuration)/$(TargetFramework)/DotNetNuke.Abstractions.xml - - - true - - - - + + + + netstandard2.0 + false + true + $(MSBuildProjectDirectory)\..\.. + bin/$(Configuration)/$(TargetFramework)/DotNetNuke.Abstractions.xml + + + true + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - SolutionInfo.cs - - - - - - - - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + SolutionInfo.cs + + + + + + + + + + + + + diff --git a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj index cdafdb10dac..96d34a626f5 100644 --- a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj +++ b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj @@ -7,14 +7,14 @@ $(MSBuildProjectDirectory)\..\.. bin/$(Configuration)/$(TargetFramework)/DotNetNuke.DependencyInjection.xml - + - true + true - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj index 4945dd349a4..0fe4212618b 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj +++ b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj @@ -1,8 +1,8 @@  - - + + true @@ -99,13 +99,13 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Instrumentation/packages.config b/DNN Platform/DotNetNuke.Instrumentation/packages.config index b757d19eb41..fda0b41b27a 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/packages.config +++ b/DNN Platform/DotNetNuke.Instrumentation/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj index 72ad2166f11..d77e2278944 100644 --- a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj +++ b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj @@ -19,9 +19,9 @@ under the License. --> - - - + + + true @@ -755,12 +755,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Log4net/packages.config b/DNN Platform/DotNetNuke.Log4net/packages.config index 7c26d1bf3db..4b574d18a20 100644 --- a/DNN Platform/DotNetNuke.Log4net/packages.config +++ b/DNN Platform/DotNetNuke.Log4net/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj index 6cec8e18318..de7a19a34ec 100644 --- a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj +++ b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj @@ -1,7 +1,7 @@  - - + + true @@ -116,12 +116,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Client/packages.config b/DNN Platform/DotNetNuke.Web.Client/packages.config index e739358d9ee..7ac79ab9c99 100644 --- a/DNN Platform/DotNetNuke.Web.Client/packages.config +++ b/DNN Platform/DotNetNuke.Web.Client/packages.config @@ -2,7 +2,7 @@ - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj index aeba61b674e..8f56c18a1f2 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj +++ b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj @@ -1,7 +1,7 @@  - - - + + + @@ -246,13 +246,13 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Mvc/packages.config b/DNN Platform/DotNetNuke.Web.Mvc/packages.config index e9710e11a2a..4768c78ed8a 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/packages.config +++ b/DNN Platform/DotNetNuke.Web.Mvc/packages.config @@ -10,8 +10,8 @@ - - + + diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj index d91a3555dc2..c6a2c841a15 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj +++ b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj @@ -1,7 +1,7 @@  - - + + true @@ -162,12 +162,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Razor/packages.config b/DNN Platform/DotNetNuke.Web.Razor/packages.config index abc306c283c..6d98bdf5c3c 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/packages.config +++ b/DNN Platform/DotNetNuke.Web.Razor/packages.config @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj index 863284d9d80..39bac822c1d 100644 --- a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj +++ b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj @@ -1,7 +1,7 @@  - - + + true @@ -459,12 +459,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/packages.config b/DNN Platform/DotNetNuke.Web/packages.config index a1f1f0b190a..caa6d460e5f 100644 --- a/DNN Platform/DotNetNuke.Web/packages.config +++ b/DNN Platform/DotNetNuke.Web/packages.config @@ -10,8 +10,8 @@ - - + + diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj index 639ff8dc1cb..d47e9619f1d 100644 --- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj +++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj @@ -1,7 +1,7 @@  - - - + + + true @@ -214,12 +214,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.WebUtility/packages.config b/DNN Platform/DotNetNuke.WebUtility/packages.config index b757d19eb41..fda0b41b27a 100644 --- a/DNN Platform/DotNetNuke.WebUtility/packages.config +++ b/DNN Platform/DotNetNuke.WebUtility/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj index 0fd39948e11..b859eca5acb 100644 --- a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj +++ b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj @@ -1,7 +1,7 @@  - - - + + + true @@ -162,12 +162,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/HttpModules/packages.config b/DNN Platform/HttpModules/packages.config index db1a127b7f8..c79737534b3 100644 --- a/DNN Platform/HttpModules/packages.config +++ b/DNN Platform/HttpModules/packages.config @@ -1,8 +1,8 @@  - - + + \ No newline at end of file diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index 6061c1880a2..af36fccf982 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -1,7 +1,7 @@  - - + + true @@ -1932,12 +1932,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/Library/packages.config b/DNN Platform/Library/packages.config index b4986c96d3c..a34ea0acd65 100644 --- a/DNN Platform/Library/packages.config +++ b/DNN Platform/Library/packages.config @@ -8,8 +8,8 @@ - - + + diff --git a/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj b/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj index fefdb42a0ba..1e2a1d057dc 100644 --- a/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj +++ b/DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj @@ -1,7 +1,7 @@  - - + + @@ -394,12 +394,12 @@ - - - - + + + + - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/DigitalAssets/packages.config b/DNN Platform/Modules/DigitalAssets/packages.config index 2e3603393c8..dc42ace79c9 100644 --- a/DNN Platform/Modules/DigitalAssets/packages.config +++ b/DNN Platform/Modules/DigitalAssets/packages.config @@ -7,8 +7,8 @@ - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj index f453bb5682d..b44df62b289 100644 --- a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj +++ b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj @@ -1,7 +1,7 @@  - - + + @@ -188,14 +188,14 @@ - - - - + + + + - - + + $(MSBuildProjectDirectory) @@ -14,20 +14,20 @@ - - - - - + + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/Build/Tasks/Build.cs b/Build/Tasks/Build.cs index 9c4f6339b90..eb8d995e687 100644 --- a/Build/Tasks/Build.cs +++ b/Build/Tasks/Build.cs @@ -17,8 +17,8 @@ namespace DotNetNuke.Build.Tasks using DotNetNuke.Build; /// A cake task to compile the platform. - [Dependency(typeof(CleanWebsite))] - [Dependency(typeof(RestoreNuGetPackages))] + [IsDependentOn(typeof(CleanWebsite))] + [IsDependentOn(typeof(RestoreNuGetPackages))] public sealed class Build : FrostingTask { /// diff --git a/Build/Tasks/BuildAll.cs b/Build/Tasks/BuildAll.cs index 1b056263f1e..f3e74b5315e 100644 --- a/Build/Tasks/BuildAll.cs +++ b/Build/Tasks/BuildAll.cs @@ -7,16 +7,16 @@ namespace DotNetNuke.Build.Tasks /// A cake task to compile the platform and create all of the packages. /// This is the task run during CI. - [Dependency(typeof(CleanArtifacts))] - [Dependency(typeof(UpdateDnnManifests))] - [Dependency(typeof(GenerateSecurityAnalyzerChecksums))] - [Dependency(typeof(SetPackageVersions))] - [Dependency(typeof(CreateInstall))] - [Dependency(typeof(CreateUpgrade))] - [Dependency(typeof(CreateDeploy))] - [Dependency(typeof(CreateSymbols))] - [Dependency(typeof(CreateNugetPackages))] - [Dependency(typeof(GeneratePackagesChecksums))] + [IsDependentOn(typeof(CleanArtifacts))] + [IsDependentOn(typeof(UpdateDnnManifests))] + [IsDependentOn(typeof(GenerateSecurityAnalyzerChecksums))] + [IsDependentOn(typeof(SetPackageVersions))] + [IsDependentOn(typeof(CreateInstall))] + [IsDependentOn(typeof(CreateUpgrade))] + [IsDependentOn(typeof(CreateDeploy))] + [IsDependentOn(typeof(CreateSymbols))] + [IsDependentOn(typeof(CreateNugetPackages))] + [IsDependentOn(typeof(GeneratePackagesChecksums))] public sealed class BuildAll : FrostingTask { /// diff --git a/Build/Tasks/BuildServerSetVersion.cs b/Build/Tasks/BuildServerSetVersion.cs index d0ac4b28ba2..69a76d86fa2 100644 --- a/Build/Tasks/BuildServerSetVersion.cs +++ b/Build/Tasks/BuildServerSetVersion.cs @@ -9,7 +9,7 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to update the build number in CI. - [Dependency(typeof(SetVersion))] + [IsDependentOn(typeof(SetVersion))] public sealed class BuildServerSetVersion : FrostingTask { /// diff --git a/Build/Tasks/BuildToTempFolder.cs b/Build/Tasks/BuildToTempFolder.cs index ae1133b5aa8..0b431b01959 100644 --- a/Build/Tasks/BuildToTempFolder.cs +++ b/Build/Tasks/BuildToTempFolder.cs @@ -9,11 +9,11 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to build the platform. - [Dependency(typeof(SetVersion))] - [Dependency(typeof(UpdateDnnManifests))] - [Dependency(typeof(ResetDatabase))] - [Dependency(typeof(PreparePackaging))] - [Dependency(typeof(OtherPackages))] + [IsDependentOn(typeof(SetVersion))] + [IsDependentOn(typeof(UpdateDnnManifests))] + [IsDependentOn(typeof(ResetDatabase))] + [IsDependentOn(typeof(PreparePackaging))] + [IsDependentOn(typeof(OtherPackages))] public sealed class BuildToTempFolder : FrostingTask { } diff --git a/Build/Tasks/BuildWithDatabase.cs b/Build/Tasks/BuildWithDatabase.cs index 367cd96ecb1..779c10faa1a 100644 --- a/Build/Tasks/BuildWithDatabase.cs +++ b/Build/Tasks/BuildWithDatabase.cs @@ -9,13 +9,13 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to compile the platform and create a localdb database. - [Dependency(typeof(CleanArtifacts))] - [Dependency(typeof(UpdateDnnManifests))] - [Dependency(typeof(CreateInstall))] - [Dependency(typeof(CreateUpgrade))] - [Dependency(typeof(CreateDeploy))] - [Dependency(typeof(CreateSymbols))] - [Dependency(typeof(CreateDatabase))] + [IsDependentOn(typeof(CleanArtifacts))] + [IsDependentOn(typeof(UpdateDnnManifests))] + [IsDependentOn(typeof(CreateInstall))] + [IsDependentOn(typeof(CreateUpgrade))] + [IsDependentOn(typeof(CreateDeploy))] + [IsDependentOn(typeof(CreateSymbols))] + [IsDependentOn(typeof(CreateDatabase))] public sealed class BuildWithDatabase : FrostingTask { } diff --git a/Build/Tasks/CopyWebsite.cs b/Build/Tasks/CopyWebsite.cs index 016df4af832..0d3924d85e7 100644 --- a/Build/Tasks/CopyWebsite.cs +++ b/Build/Tasks/CopyWebsite.cs @@ -10,8 +10,8 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to copy the built website folder. - [Dependency(typeof(CleanWebsite))] - [Dependency(typeof(GenerateSqlDataProvider))] + [IsDependentOn(typeof(CleanWebsite))] + [IsDependentOn(typeof(GenerateSqlDataProvider))] public sealed class CopyWebsite : FrostingTask { /// diff --git a/Build/Tasks/CreateDeploy.cs b/Build/Tasks/CreateDeploy.cs index 266e512040a..2cf8a761932 100644 --- a/Build/Tasks/CreateDeploy.cs +++ b/Build/Tasks/CreateDeploy.cs @@ -13,8 +13,8 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to crete the Deploy package. - [Dependency(typeof(PreparePackaging))] - [Dependency(typeof(OtherPackages))] + [IsDependentOn(typeof(PreparePackaging))] + [IsDependentOn(typeof(OtherPackages))] public sealed class CreateDeploy : FrostingTask { /// diff --git a/Build/Tasks/CreateInstall.cs b/Build/Tasks/CreateInstall.cs index 5e9cd80902a..1b228f8d000 100644 --- a/Build/Tasks/CreateInstall.cs +++ b/Build/Tasks/CreateInstall.cs @@ -13,8 +13,8 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to create the Install package. - [Dependency(typeof(PreparePackaging))] - [Dependency(typeof(OtherPackages))] + [IsDependentOn(typeof(PreparePackaging))] + [IsDependentOn(typeof(OtherPackages))] public sealed class CreateInstall : FrostingTask { /// diff --git a/Build/Tasks/CreateNugetPackages.cs b/Build/Tasks/CreateNugetPackages.cs index 7e2d2a2e4a9..a0092a31b18 100644 --- a/Build/Tasks/CreateNugetPackages.cs +++ b/Build/Tasks/CreateNugetPackages.cs @@ -16,7 +16,7 @@ namespace DotNetNuke.Build.Tasks using DotNetNuke.Build; /// A cake task to create the platform's NuGet packages. - [Dependency(typeof(PreparePackaging))] + [IsDependentOn(typeof(PreparePackaging))] public sealed class CreateNugetPackages : FrostingTask { /// diff --git a/Build/Tasks/CreateSymbols.cs b/Build/Tasks/CreateSymbols.cs index 2fb92e75906..7e1b897ae38 100644 --- a/Build/Tasks/CreateSymbols.cs +++ b/Build/Tasks/CreateSymbols.cs @@ -12,8 +12,8 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to create the Symbols package. - [Dependency(typeof(PreparePackaging))] - [Dependency(typeof(OtherPackages))] + [IsDependentOn(typeof(PreparePackaging))] + [IsDependentOn(typeof(OtherPackages))] public sealed class CreateSymbols : FrostingTask { /// diff --git a/Build/Tasks/CreateUpgrade.cs b/Build/Tasks/CreateUpgrade.cs index 3976db0f02e..72ce60b6133 100644 --- a/Build/Tasks/CreateUpgrade.cs +++ b/Build/Tasks/CreateUpgrade.cs @@ -14,11 +14,11 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to create the Upgrade package. - [Dependency(typeof(PreparePackaging))] - [Dependency(typeof(OtherPackages))] - [Dependency(typeof(CreateInstall))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed - [Dependency(typeof(CreateSymbols))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed - [Dependency(typeof(CreateDeploy))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed + [IsDependentOn(typeof(PreparePackaging))] + [IsDependentOn(typeof(OtherPackages))] + [IsDependentOn(typeof(CreateInstall))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed + [IsDependentOn(typeof(CreateSymbols))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed + [IsDependentOn(typeof(CreateDeploy))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed public sealed class CreateUpgrade : FrostingTask { /// diff --git a/Build/Tasks/Default.cs b/Build/Tasks/Default.cs index 74aedacfec3..d5e82b2f190 100644 --- a/Build/Tasks/Default.cs +++ b/Build/Tasks/Default.cs @@ -10,12 +10,12 @@ namespace DotNetNuke.Build.Tasks /// A cake task to build the platform and create packages. /// This is the default Cake target if no target is supplied. - [Dependency(typeof(CleanArtifacts))] - [Dependency(typeof(UpdateDnnManifests))] - [Dependency(typeof(CreateInstall))] - [Dependency(typeof(CreateUpgrade))] - [Dependency(typeof(CreateDeploy))] - [Dependency(typeof(CreateSymbols))] + [IsDependentOn(typeof(CleanArtifacts))] + [IsDependentOn(typeof(UpdateDnnManifests))] + [IsDependentOn(typeof(CreateInstall))] + [IsDependentOn(typeof(CreateUpgrade))] + [IsDependentOn(typeof(CreateDeploy))] + [IsDependentOn(typeof(CreateSymbols))] public sealed class Default : FrostingTask { } diff --git a/Build/Tasks/GeneratePackagesChecksums.cs b/Build/Tasks/GeneratePackagesChecksums.cs index 09a71c295b8..dee3de466e3 100644 --- a/Build/Tasks/GeneratePackagesChecksums.cs +++ b/Build/Tasks/GeneratePackagesChecksums.cs @@ -15,12 +15,12 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to generate a checksums.md file with the artifact checksums. - [Dependency(typeof(CleanArtifacts))] - [Dependency(typeof(UpdateDnnManifests))] - [Dependency(typeof(CreateInstall))] - [Dependency(typeof(CreateUpgrade))] - [Dependency(typeof(CreateDeploy))] - [Dependency(typeof(CreateSymbols))] + [IsDependentOn(typeof(CleanArtifacts))] + [IsDependentOn(typeof(UpdateDnnManifests))] + [IsDependentOn(typeof(CreateInstall))] + [IsDependentOn(typeof(CreateUpgrade))] + [IsDependentOn(typeof(CreateDeploy))] + [IsDependentOn(typeof(CreateSymbols))] public sealed class GeneratePackagesChecksums : FrostingTask { /// diff --git a/Build/Tasks/GenerateSecurityAnalyzerChecksums.cs b/Build/Tasks/GenerateSecurityAnalyzerChecksums.cs index 877a565f7bd..5cef37cd84d 100644 --- a/Build/Tasks/GenerateSecurityAnalyzerChecksums.cs +++ b/Build/Tasks/GenerateSecurityAnalyzerChecksums.cs @@ -12,7 +12,7 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to generate the Default.aspx checksum for the Security Analyzer. - [Dependency(typeof(SetVersion))] + [IsDependentOn(typeof(SetVersion))] public sealed class GenerateSecurityAnalyzerChecksums : FrostingTask { /// diff --git a/Build/Tasks/GenerateSqlDataProvider.cs b/Build/Tasks/GenerateSqlDataProvider.cs index 6212713a43e..fb80272f1df 100644 --- a/Build/Tasks/GenerateSqlDataProvider.cs +++ b/Build/Tasks/GenerateSqlDataProvider.cs @@ -10,7 +10,7 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to generate a SQL Data Provider script if it doesn't exist. - [Dependency(typeof(SetVersion))] + [IsDependentOn(typeof(SetVersion))] public sealed class GenerateSqlDataProvider : FrostingTask { /// diff --git a/Build/Tasks/OtherPackages.cs b/Build/Tasks/OtherPackages.cs index 45784a1754c..1bbd876abc6 100644 --- a/Build/Tasks/OtherPackages.cs +++ b/Build/Tasks/OtherPackages.cs @@ -16,12 +16,12 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to include other 3rd party packages. - [Dependency(typeof(PackageNewtonsoft))] - [Dependency(typeof(PackageMailKit))] - [Dependency(typeof(PackageAspNetWebApi))] - [Dependency(typeof(PackageAspNetWebPages))] - [Dependency(typeof(PackageAspNetMvc))] - [Dependency(typeof(PackageMicrosoftGlobbing))] + [IsDependentOn(typeof(PackageNewtonsoft))] + [IsDependentOn(typeof(PackageMailKit))] + [IsDependentOn(typeof(PackageAspNetWebApi))] + [IsDependentOn(typeof(PackageAspNetWebPages))] + [IsDependentOn(typeof(PackageAspNetMvc))] + [IsDependentOn(typeof(PackageMicrosoftGlobbing))] public sealed class OtherPackages : FrostingTask { /// diff --git a/Build/Tasks/PreparePackaging.cs b/Build/Tasks/PreparePackaging.cs index 6b111ecaf2c..181cfada3b2 100644 --- a/Build/Tasks/PreparePackaging.cs +++ b/Build/Tasks/PreparePackaging.cs @@ -11,10 +11,10 @@ namespace DotNetNuke.Build.Tasks using Cake.Json; /// A cake task to prepare for packaging (by building the platform and copying files). - [Dependency(typeof(CopyWebsite))] - [Dependency(typeof(Build))] - [Dependency(typeof(CopyWebConfig))] - [Dependency(typeof(CopyWebsiteBinFolder))] + [IsDependentOn(typeof(CopyWebsite))] + [IsDependentOn(typeof(Build))] + [IsDependentOn(typeof(CopyWebConfig))] + [IsDependentOn(typeof(CopyWebsiteBinFolder))] public sealed class PreparePackaging : FrostingTask { /// diff --git a/Build/Tasks/ResetDevSite.cs b/Build/Tasks/ResetDevSite.cs index b338ad4b377..27b7f07a682 100644 --- a/Build/Tasks/ResetDevSite.cs +++ b/Build/Tasks/ResetDevSite.cs @@ -9,9 +9,9 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to reset a local dev site. - [Dependency(typeof(BuildToTempFolder))] - [Dependency(typeof(CopyToDevSite))] - [Dependency(typeof(CopyWebConfigToDevSite))] + [IsDependentOn(typeof(BuildToTempFolder))] + [IsDependentOn(typeof(CopyToDevSite))] + [IsDependentOn(typeof(CopyWebConfigToDevSite))] public sealed class ResetDevSite : FrostingTask { } diff --git a/Build/Tasks/RunUnitTests.cs b/Build/Tasks/RunUnitTests.cs index e090871360e..c081b98daae 100644 --- a/Build/Tasks/RunUnitTests.cs +++ b/Build/Tasks/RunUnitTests.cs @@ -11,7 +11,7 @@ namespace DotNetNuke.Build.Tasks /// A cake task to run NUnit 3 tests. /// This task is not used (NUnit 3 is not used by DNN), you probably want . - [Dependency(typeof(Build))] + [IsDependentOn(typeof(Build))] public sealed class RunUnitTests : FrostingTask { /// diff --git a/Build/Tasks/SetPackageVersions.cs b/Build/Tasks/SetPackageVersions.cs index ac6f4fbe21b..91a7d32c097 100644 --- a/Build/Tasks/SetPackageVersions.cs +++ b/Build/Tasks/SetPackageVersions.cs @@ -12,7 +12,7 @@ namespace DotNetNuke.Build.Tasks using Cake.Frosting; /// A cake task to set the version of client-side packages. - [Dependency(typeof(SetVersion))] + [IsDependentOn(typeof(SetVersion))] public sealed class SetPackageVersions : FrostingTask { /// diff --git a/Build/Tasks/UpdateDnnManifests.cs b/Build/Tasks/UpdateDnnManifests.cs index 1abc2bdbd34..9e17f815b0b 100644 --- a/Build/Tasks/UpdateDnnManifests.cs +++ b/Build/Tasks/UpdateDnnManifests.cs @@ -16,8 +16,8 @@ namespace DotNetNuke.Build.Tasks using Dnn.CakeUtils; /// A cake task to set the version attribute in all of the .dnn manifest files. - [Dependency(typeof(SetVersion))] - [Dependency(typeof(SetPackageVersions))] + [IsDependentOn(typeof(SetVersion))] + [IsDependentOn(typeof(SetPackageVersions))] public sealed class UpdateDnnManifests : FrostingTask { /// Gets the version from the context and formats it as a string. From 23ad1f67fa955085d729a9026a73bdab3398e413 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Wed, 9 Feb 2022 08:30:23 -0600 Subject: [PATCH 5/7] Ensure .NET Core 3.1 SDK is available for build --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7aaf3f75e8..20c56590ea1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,6 +52,11 @@ steps: key: 'yarn | "$(Agent.OS)" | yarn.lock' restoreKeys: 'yarn | "$(Agent.OS)"' path: $(YARN_CACHE_FOLDER) + +- task: UseDotNet@2 + displayName: 'Use .NET Core 3.1 SDK' + inputs: + version: 3.1.x - task: PowerShell@2 displayName: 'Run DNN Update Versions' From 975dc7318edbda9388fb01ed43f774a87a24017c Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Tue, 15 Feb 2022 14:08:44 -0600 Subject: [PATCH 6/7] Get all the SDKs --- azure-pipelines.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20c56590ea1..1a369099655 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,6 +58,16 @@ steps: inputs: version: 3.1.x +- task: UseDotNet@2 + displayName: 'Use .NET 5.x SDK' + inputs: + version: 5.x + +- task: UseDotNet@2 + displayName: 'Use .NET 6.x SDK' + inputs: + version: 6.x + - task: PowerShell@2 displayName: 'Run DNN Update Versions' inputs: From 5b7bfd510bfd1e3a3f131e553b8b0e779717a5ed Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Tue, 15 Feb 2022 14:16:05 -0600 Subject: [PATCH 7/7] Revert "Use windows-2019 image for CI build" This reverts commit 9f96880893a45c17d9a7d39c95f12d7ae7583ade. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1a369099655..990f09a6b59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ pool: - vmImage: 'windows-2019' + vmImage: 'windows-latest' variables: - name: "Build.ArtifactStagingDirectory"