diff --git a/Build/Build.csproj b/Build/Build.csproj
index 461044f7fd7..540453af6be 100644
--- a/Build/Build.csproj
+++ b/Build/Build.csproj
@@ -8,11 +8,10 @@
-
+
-
-
+
diff --git a/Build/Cake/unit-tests.cs b/Build/Cake/unit-tests.cs
index 92caf1f765d..6832e5cb91b 100644
--- a/Build/Cake/unit-tests.cs
+++ b/Build/Cake/unit-tests.cs
@@ -1,9 +1,7 @@
-using Cake.Common.IO;
-using Cake.Common.Tools.MSBuild;
+using System.Linq;
+
+using Cake.Common.IO;
using Cake.Common.Tools.VSTest;
-using Cake.Common.Tools.VSWhere;
-using Cake.Common.Tools.VSWhere.Latest;
-using Cake.Core.Diagnostics;
using Cake.Frosting;
///
@@ -21,27 +19,17 @@ public override void Run(Context context)
testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Integration.dll");
testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Urls.dll");
+ var vsTestPath = context.GetFiles("tools/Microsoft.TestPlatform.16.8.0/tools/**/vstest.console.exe").First();
context.VSTest(
testAssemblies,
- FixToolPath(
- context,
- new VSTestSettings
- {
- Logger = "trx",
- Parallel = true,
- EnableCodeCoverage = true,
- TestAdapterPath = @"tools\NUnitTestAdapter.2.3.0\build"
- }));
- }
-
-// https://github.com/cake-build/cake/issues/1522
- VSTestSettings FixToolPath(Context context, VSTestSettings settings)
- {
-// #tool vswhere
- settings.ToolPath =
- context.VSWhereLatest(new VSWhereLatestSettings {Requires = "Microsoft.VisualStudio.PackageGroup.TestTools.Core"})
- .CombineWithFilePath(context.File(@"Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"));
- return settings;
+ new VSTestSettings
+ {
+ ToolPath = vsTestPath,
+ Logger = "trx",
+ Parallel = true,
+ EnableCodeCoverage = true,
+ TestAdapterPath = @"tools\NUnitTestAdapter.2.3.0\build"
+ });
}
}
diff --git a/Build/Program.cs b/Build/Program.cs
index 80c2d0c22a5..7579ff2307d 100644
--- a/Build/Program.cs
+++ b/Build/Program.cs
@@ -1,38 +1,20 @@
using System;
-using System.Collections.Generic;
-using System.IO;
-using Cake.Core;
-using Cake.Core.Configuration;
+
using Cake.Frosting;
-using Cake.NuGet;
-public class Program : IFrostingStartup
+public class Program
{
public static int Main(string[] args)
{
- // Create the host.
- var host = new CakeHostBuilder()
- .WithArguments(args)
- .UseStartup()
- .Build();
-
- // Run the host.
- return host.Run();
- }
-
- public void Configure(ICakeServices services)
- {
- services.UseContext();
- services.UseLifetime();
- services.UseWorkingDirectory("..");
-
- // from https://github.com/cake-build/cake/discussions/2931
- var module = new NuGetModule(new CakeConfiguration(new Dictionary()));
- module.Register(services);
-
- services.UseTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"));
- services.UseTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"));
- services.UseTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"));
- services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"));
+ return new CakeHost()
+ .UseContext()
+ .UseLifetime()
+ .UseWorkingDirectory("..")
+ .SetToolPath("../tools")
+ .InstallTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"))
+ .InstallTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"))
+ .InstallTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"))
+ .InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"))
+ .Run(args);
}
}
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 ab610ef6f44..cc7ad35df35 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
@@ -1,5 +1,6 @@
+
Debug
@@ -13,6 +14,8 @@
512
true
+
+
AnyCPU
@@ -115,6 +118,12 @@
+
+
+ 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}.
+
+
+
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config
index b90a8c4dcbb..b68ddb98ad1 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config
@@ -9,7 +9,7 @@
-
+
\ No newline at end of file
diff --git a/build.cake b/build.cake
deleted file mode 100644
index ee036257206..00000000000
--- a/build.cake
+++ /dev/null
@@ -1,112 +0,0 @@
-// Main Cake Build entry points. Note most Cake scripts are located under Build/Cake.
-
-#addin nuget:?package=Cake.XdtTransform&version=0.18.1&loaddependencies=true
-#addin nuget:?package=Cake.FileHelpers&version=3.2.0
-#addin nuget:?package=Cake.Powershell&version=0.4.8
-
-#addin nuget:?package=Dnn.CakeUtils&version=1.1.6
-#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
-#tool "nuget:?package=Microsoft.TestPlatform&version=15.7.0"
-#tool "nuget:?package=NUnitTestAdapter&version=2.1.1"
-
-#load "local:?path=Build/Cake/ci.cake"
-#load "local:?path=Build/Cake/compiling.cake"
-#load "local:?path=Build/Cake/create-database.cake"
-#load "local:?path=Build/Cake/database.cake"
-#load "local:?path=Build/Cake/devsite.cake"
-#load "local:?path=Build/Cake/nuget.cake"
-#load "local:?path=Build/Cake/packaging.cake"
-#load "local:?path=Build/Cake/settings.cake"
-#load "local:?path=Build/Cake/testing.cake"
-#load "local:?path=Build/Cake/thirdparty.cake"
-#load "local:?path=Build/Cake/unit-tests.cake"
-#load "local:?path=Build/Cake/version.cake"
-
-//////////////////////////////////////////////////////////////////////
-// ARGUMENTS
-//////////////////////////////////////////////////////////////////////
-
-var target = Argument("target", "Default");
-var configuration = Argument("configuration", "Release");
-
-//////////////////////////////////////////////////////////////////////
-// PREPARATION
-//////////////////////////////////////////////////////////////////////
-
-// Define directories.
-var tempFolder = "./Temp/";
-var tempDir = Directory(tempFolder);
-var artifactsFolder = "./Artifacts/";
-var artifactsDir = Directory(artifactsFolder);
-var websiteFolder = "./Website/";
-var websiteDir = Directory(websiteFolder);
-
-// Global information variables
-bool isRunningInCI = false;
-
-//////////////////////////////////////////////////////////////////////
-// SETUP/TEARDOWN
-//////////////////////////////////////////////////////////////////////
-
-// Executed BEFORE the first task.
-Setup(context =>
-{
- isRunningInCI = context.HasEnvironmentVariable("TF_BUILD");
- Information("Is Running in CI : {0}", isRunningInCI);
- if(Settings.Version == "auto" && !isRunningInCI){
- // Temporarelly commit all changes to prevent checking in scripted changes like versioning.
- StartPowershellScript("git add .");
- StartPowershellScript("git commit --allow-empty -m 'backup'");
- }
-});
-
-// Executed AFTER the last task even if any task fails.
-Teardown(context =>
-{
- if(Settings.Version == "auto" && !isRunningInCI){
- // Undoes the script changes to all tracked files.
- StartPowershellScript("git reset --hard");
- // Undoes the setup commit keeping file states as before this build script ran.
- StartPowershellScript("git reset HEAD^");
- }
-});
-
-//////////////////////////////////////////////////////////////////////
-// TASKS
-//////////////////////////////////////////////////////////////////////
-
-Task("CleanWebsite")
- .Does(() =>
- {
- CleanDirectory(websiteDir);
- });
-
-Task("CleanTemp")
- .Does(() =>
- {
- CleanDirectory(tempDir);
- });
-
-Task("CleanArtifacts")
- .Does(() =>
- {
- CleanDirectory(artifactsDir);
- });
-
-//////////////////////////////////////////////////////////////////////
-// TASK TARGETS
-//////////////////////////////////////////////////////////////////////
-
-Task("Default")
- .IsDependentOn("CleanArtifacts")
- .IsDependentOn("UpdateDnnManifests")
- .IsDependentOn("CreateInstall")
- .IsDependentOn("CreateUpgrade")
- .IsDependentOn("CreateDeploy")
- .IsDependentOn("CreateSymbols");
-
-//////////////////////////////////////////////////////////////////////
-// EXECUTION
-//////////////////////////////////////////////////////////////////////
-
-RunTarget(target);
diff --git a/build.config b/build.config
index 4e44c8b72fa..f4cc673f70f 100644
--- a/build.config
+++ b/build.config
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
CAKE_VERSION=0.38.5
-DOTNET_VERSION=5.0.100
+DOTNET_VERSION=5.0.102
diff --git a/tools/packages.config b/tools/packages.config
deleted file mode 100644
index ec87d006ab6..00000000000
--- a/tools/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-