Skip to content

Commit a790c1a

Browse files
bdukesbdukes
authored
Resolve warnings (#6852)
* Convert DotNetNuke.Tests.Utilities to SDK project * Convert DotNetNuke.Tests.Web.Mvc to SDK project * Convert DotNetNuke.Tests.Web to SDK project * Convert DotNetNuke.Tests.UI to SDK project * Convert DotNetNuke.Tests.Modules.DDRMenu to SDK project * Convert DotNetNuke.Tests.Modules to SDK project * Convert DotNetNuke.Tests.Mail to SDK project * Convert DotNetNuke.Tests.Data to SDK project * Convert DotNetNuke.Tests.Authentication to SDK project * Convert DotNetNuke.Tests.AspNetCCP to SDK project * Convert DotNetNuke.Tests.Content to SDK project * Convert DotNetNuke.Tests.Core to SDK project * Convert Dnn.PersonaBar.Users.Tests to SDK project * Convert Dnn.PersonaBar.Security.Tests to SDK project * Convert Dnn.PersonaBar.Pages.Tests to SDK project * Convert Dnn.PersonaBar.ConfigConsole.Tests to SDK project * Fix error when running URL tests * Misc cleanup in DotNetNuke.Tests.Urls * Convert DotNetNuke.Tests.Urls to SDK project * Adjust timing of UrlTestBase config * Fix typo in site template page name * Remove usages of Is.True with more exact constraints * Start using async/await for integration test HTTP * Convert DotNetNuke.Tests.Integration to SDK project * Fix path to DotNetNuke.Tests.Utilities assembly * Convert DNN.Integration.Test.Framework to SDK project * Bump test NuGet packages Bump Microsoft.NET.Test.Sdk from 17.13.0 to 18.0.1 Bump NUnit from 4.3.2 to 4.4.0 Bump NUnit.Analyzers from 4.6.0 to 4.11.2 Bump NUnit3TestAdapter from 5.0.0 to 6.0.0 Bump Verify.NUnit from 28.10.1 to 31.8.0 * Fix not finding test assemblies * Ignore exceptions copying test files * Bump source generator tests from .NET 8 to 10 * Fix DotNetNuke.Log4Net reference in DotNetNuke.Instrumentation * Fix DotNetNuke.Instrumentation reference in DotNetNuke.Web.Client * Fix DotNetNuke.Web.Client reference in DotNetNuke.WebUtility * Fix DotNetNuke.Instrumentation reference in DotNetNuke.HttpModules * Fix four references in DotNetNuke.Web * Fix DotNetNuke.Library reference in DotNetNuke.Web.Mvc * Fix DotNetNuke.Library reference in DotNetNuke.Web.Razor * Fix DotNetNuke.Instrumentation reference in DotNetNuke.Modules.RazorHost * Fix two references in DotNetNuke.Modules.MemberDirectory * Fix two references in DotNetNuke.Modules.MemberDirectory * Fix DotNetNuke.Web.Client reference in DotNetNuke.Modules.Html * Fix DotNetNukeInstrumentation reference in DotNetNuke.Modules.Groups * Fix DotNetNuke.Web.Razor reference in DotNetNuke.Modules.DDRMenu * Fix two references in DotNetNuke.Modules.CoreMessaging * Remove unused compiled version of DotNetNuke.WebUtility * Remove references to SolPartMenu * Convert projects from packages.config to PackageReference * Ignore warnings about transitive net48 dependencies in netstandard library * Convert Dnn.PersonaBar.UI from packages.config to PackageReference * Convert Dnn.PersonaBar.Library from packages.config to PackageReference * Convert Dnn.PersonaBar.Extensions from packages.config to PackageReference * Convert Dnn.EditBar.UI from packages.config to PackageReference * Convert Dnn.EditBar.Library from packages.config to PackageReference * Convert Dnn.GoogleMailAuthProvider from packages.config to PackageReference * Convert Dnn.ExchangeOnlineAuthProvider from packages.config to PackageReference * Convert DNNConnect.CKEditorProvider from packages.config to PackageReference * Convert DotNetNuke.Website from packages.config to PackageReference * Convert DotNetNuke.Providers.FolderProviders from packages.config to PackageReference * Convert DotNetNuke.Providers.AspNetCCP from packages.config to PackageReference * Convert DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider from packages.config to PackageReference * Convert DotNetNuke.Authentication.Twitter from packages.config to PackageReference * Convert DotNetNuke.Authentication.LiveConnect from packages.config to PackageReference * Convert DotNetNuke.Authentication.Google from packages.config to PackageReference * Convert DotNetNuke.Authentication.Facebook from packages.config to PackageReference * Convert Dnn.AuthServices.Jwt from packages.config to PackageReference * Convert DotNetNuke.Modules.RazorHost from packages.config to PackageReference * Convert DotNetNuke.Modules.MemberDirectory from packages.config to PackageReference * Convert DotNetNuke.Modules.Journal from packages.config to PackageReference * Convert DotNetNuke.Modules.HtmlEditorManager from packages.config to PackageReference * Convert DotNetNuke.Modules.Html from packages.config to PackageReference * Convert DotNetNuke.Modules.Groups from packages.config to PackageReference * Convert DotNetNuke.Modules.DDRMenu from packages.config to PackageReference * Convert DotNetNuke.Modules.CoreMessaging from packages.config to PackageReference * Convert DnnExportImportLibrary from packages.config to PackageReference * Convert DnnExportImport from packages.config to PackageReference * Convert Dnn.Modules.TelerikRemoval from packages.config to PackageReference * Convert Dnn.Modules.ResourceManager from packages.config to PackageReference * Convert Dnn.Modules.Console from packages.config to PackageReference * Convert Dnn.GoogleTagManagerConnector from packages.config to PackageReference * Convert Dnn.GoogleAnalyticsConnector from packages.config to PackageReference * Convert Dnn.GoogleAnalytics4Connector from packages.config to PackageReference * Convert Dnn.AzureConnector from packages.config to PackageReference * Fix source generator references * Use BeforeTargets instead of overriding AfterBuild See dotnet/msbuild#1680 * Convert Dnn.PersonaBar.UI to SDK-style project * Convert Dnn.PersonaBar.Library to SDK-style project * Convert Dnn.PersonaBar.Extensions to SDK-style project * Convert Dnn.EditBar.UI to SDK-style project * Convert Dnn.EditBar.Library to SDK-style project * Convert DotNetNuke.Web.Razor to SDK-style project * Convert DotNetNuke.Web.Mvc to SDK-style project * Convert DotNetNuke.Web to SDK-style project * Update DotNetNuke.ModulePipeline project file Add analyzers config Rearrange to match order of other projects * Update DotNetNuke.Maintenance project file Enable deterministic builds Add analyzers config Rearrange to match order of other projects * Convert DotNetNuke.Library to SDK-style project * Update DotNetNuke.Internal.SourceGenerators project file Add analyzers config Rearrange to match order of other projects * Resolve warnings in DotNetNuke.Internal.SourceGenerators * Convert DotNetNuke.HttpModules to SDK-style project * Update DotNetNuke.DependencyInjection project file Add analyzers config Rearrange to match order of other projects * Update DotNetNuke.Abstractions project file Add analyzers config Rearrange to match order of other projects * Update Build project file Add analyzers config Rearrange to match order of other projects * Convert DotNetNuke.WebUtility to SDK-style project * Update DotNetNuke.Web.Client.ResourceManager project file Add analyzers config Rearrange to match order of other projects * Convert DotNetNuke.Web.Client to SDK-style project * Convert DotNetNuke.Syndication to SDK-style project * Convert DotNetNuke.Instrumentation to SDK-style project * Convert CountryListBox to SDK-style project * Update Dnn.Skins.Aperture project file Bump .NET from 6 to 8 Add analyzers config Rearrange to match order of other projects * Convert Dnn.AzureConnector to SDK-style project * Convert Dnn.GoogleAnalytics4Connector to SDK-style project * Convert Dnn.GoogleAnalyticsConnector to SDK-style project * Convert Dnn.GoogleTagManagerConnector to SDK-style project * Convert DnnExportImport to SDK-style project * Convert DnnExportImportLibrary to SDK-style project * Convert DotNetNuke.Providers.AspNetCCP to SDK-style project * Convert DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider to SDK-style project * Resolve CA1200: Avoid using cref tags with a prefix * Resolve CA2263: Prefer generic overload when type is known * Resolve CA2251: Use String.Equals over String.Compare * Resolve CA2245: Do not assign a property to itself * Resolve CA2211: Non-constant fields should not be visible * Resolve CA2200: Rethrow to preserve stack details * Resolve CA2201: Do not raise reserved exception types * Resolve CA2208: Instantiate argument exceptions correctly * Resolve CA2011: Do not assign property within its setter * Resolve CA2016: Forward the CancellationToken parameter to methods that take one * Resolve CA2022: Avoid inexact read with Stream.Read * Resolve CA1805: Do not initialize unnecessarily * Resolve CA1806: Do not ignore method results * Resolve CA1816: Call GC.SuppressFinalize correctly * Resolve CA1822: Mark members as static * Resolve CA1824: Mark assemblies with NeutralResourcesLanguageAttribute * Resolve CA1825: Avoid zero-length array allocations * Resolve CA1827: Do not use Count()/LongCount() when Any() can be used * Resolve CA1829: Use Length/Count property instead of Enumerable.Count method * Resolve CA1830: Prefer strongly-typed Append and Insert method overloads on StringBuilder * Resolve CA1834: Use StringBuilder.Append(char) for single character strings * Resolve CA1840: Use Environment.CurrentManagedThreadId instead of Thread.CurrentThread.ManagedThreadId * Resolve CA1845: Use span-based 'string.Concat' * Resolve CA1852: Seal internal types * Resolve CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method * Resolve CA1858: Use StartsWith instead of IndexOf * Resolve CA1859: Use concrete types when possible for improved performance * Resolve CA1860: Avoid using 'Enumerable.Any()' extension method * Resolve CA1861: Avoid constant arrays as arguments * Resolve CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons * Resolve CA1309: Use ordinal StringComparison * Resolve CA1872: Prefer 'Convert.ToHexString' and 'Convert.ToHexStringLower' over call chains based on 'BitConverter.ToString' * Resolve CA1507: Use nameof in place of string * Resolve CA1514: Avoid redundant length argument * Resolve CA1304: Specify CultureInfo
1 parent 192857a commit a790c1a

925 files changed

Lines changed: 25708 additions & 41088 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ csharp_prefer_braces = true:silent
185185
csharp_preserve_single_line_blocks = true
186186
csharp_preserve_single_line_statements = true
187187

188+
csharp_preferred_modifier_order = public, private, protected, internal, static, required, abstract, virtual, sealed, override, new, readonly, extern, unsafe, volatile, async:suggestion
189+
188190
# ReSharper properties
189191
resharper_instance_members_qualify_members = field, property, event, method
190192
resharper_csharp_wrap_arguments_style = chop_if_long

‎Build/Build.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net10.0</TargetFramework>
54
<PackAsTool>true</PackAsTool>
65
<!-- Make sure start same folder .NET Core CLI and Visual Studio -->
76
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
87
<RootNamespace>DotNetNuke.Build</RootNamespace>
8+
<TargetFramework>net10.0</TargetFramework>
9+
<LangVersion>latest</LangVersion>
10+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
11+
<AnalysisLevel>latest</AnalysisLevel>
12+
<AnalysisMode>Recommended</AnalysisMode>
913
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
<WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
14+
<WarningsNotAsErrors>CS0618,CA1305,CA1716,CA1725,CA5351</WarningsNotAsErrors>
1115
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<LangVersion>latest</LangVersion>
1316
</PropertyGroup>
1417
<ItemGroup>
1518
<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />

‎Build/BuildScripts/AEModule.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<WorkingDirectory>$(RootDirectory)</WorkingDirectory>
77
</PropertyGroup>
88

9-
<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package"></Target>
9+
<Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package" />
1010
<Target Name="GetFiles">
1111
<ItemGroup>
1212
<PersonaBar-views Include="admin/personaBar/**/*.html" />

‎Build/BuildScripts/Module.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package">
3-
</Target>
2+
<Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package" />
43
<Target Name="GetFiles">
54
<ItemGroup>
65
<TextFiles Include="*.txt" Exclude="license.txt;releasenotes.txt" />

‎Build/BuildScripts/Provider.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package">
3-
</Target>
2+
<Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package" />
43
<Target Name="GetFiles">
54
<ItemGroup>
65
<TextFiles Include="*.txt" Exclude="license.txt;releasenotes.txt" />

‎Build/Lifetime.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ namespace DotNetNuke.Build
1414
/// <inheritdoc/>
1515
public sealed class Lifetime : FrostingLifetime<Context>
1616
{
17+
private static readonly string[] CorepackToolNames = ["corepack", "corepack.cmd",];
18+
1719
/// <inheritdoc/>
1820
public override void Setup(Context context, ISetupContext setupContext)
1921
{
@@ -26,7 +28,7 @@ public override void Setup(Context context, ISetupContext setupContext)
2628
Git(context, "commit --allow-empty -m 'backup'");
2729
}
2830

29-
if (context.Tools.Resolve(new[] { "corepack", "corepack.cmd", }) is null)
31+
if (context.Tools.Resolve(CorepackToolNames) is null)
3032
{
3133
throw new CakeException("Could not find corepack, Node.js 18 or later must be installed.");
3234
}

‎Build/LocalSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class LocalSettings
3434
public string DatabasePath { get; set; } = string.Empty;
3535

3636
/// <summary>Gets or sets a value indicating whether to copy the sample projects to the build output.</summary>
37-
public bool CopySampleProjects { get; set; } = false;
37+
public bool CopySampleProjects { get; set; }
3838

3939
/// <summary>Gets or sets the version to use for the build.</summary>
4040
public string Version { get; set; } = "auto";

‎Build/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ namespace DotNetNuke.Build
1212
public class Program
1313
{
1414
/// <summary>The version of the Microsoft.TestPlatform NuGet package.</summary>
15-
internal const string MicrosoftTestPlatformVersion = "17.14.1";
15+
internal const string MicrosoftTestPlatformVersion = "18.0.1";
1616

1717
/// <summary>The version of the NUnit3TestAdapter NuGet package.</summary>
18-
internal const string NUnit3TestAdapterVersion = "5.0.0";
18+
internal const string NUnit3TestAdapterVersion = "6.0.0";
1919

2020
/// <summary>Runs the build process.</summary>
2121
/// <param name="args">The arguments from the command line.</param>

‎Build/Tasks/Build.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private static MSBuildSettings CreateMsBuildSettings(Context context, FilePath b
5656
.SetNoConsoleLogger(context.IsRunningInCI);
5757
}
5858

59-
private static void ReportIssuesToAzurePipelines(ICakeContext context, FilePath cleanLog, FilePath buildLog)
59+
private static void ReportIssuesToAzurePipelines(Context context, FilePath cleanLog, FilePath buildLog)
6060
{
6161
var issueProviders =
6262
from logFilePath in new[] { cleanLog, buildLog, }

‎Build/Tasks/BuildAll.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public sealed class BuildAll : FrostingTask<Context>
2222
/// <inheritdoc/>
2323
public override void Run(Context context)
2424
{
25-
this.RevertSqlDataProvider(context);
25+
RevertSqlDataProvider(context);
2626
}
2727

28-
private void RevertSqlDataProvider(Context context)
28+
private static void RevertSqlDataProvider(Context context)
2929
{
3030
var fileName = context.GetTwoDigitsVersionNumber() + ".SqlDataProvider";
3131
var filePath = "./Dnn Platform/Website/Providers/DataProviders/SqlDataProvider/" + fileName;

0 commit comments

Comments
 (0)