Revert breaking changes from #13936 and remove CompatibilitySuppressions.xml (#13979)

* Revert breaking changes introduced by PR #13936 * Update PackageValidationBaselineVersion to 11.0.0 (stable version) and remove all CompatibilitySuppressions.xml files * Fix build pipeline (pack solution again, avoiding trying to pack template projects)
2023-03-16 20:32:54 +01:00
parent 28ce2c5787
commit 180fae342e
7 changed files with 21 additions and 130 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,7 +31,7 @@
  <PropertyGroup>
    <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
    <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>11.0.0-rc1</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>11.0.0</PackageValidationBaselineVersion>
    <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
  </PropertyGroup>
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -86,10 +86,10 @@ stages:
              arguments: '--configuration $(buildConfiguration) --no-restore -p:ContinuousIntegrationBuild=true'
          - script: |
              version="$(Build.BuildNumber)"
-              echo "varsion: $version"
+              echo "Version: $version"

              major="$(echo $version | cut -d '.' -f 1)"
-              echo "major version: $major"
+              echo "Major version: $major"

              echo "##vso[task.setvariable variable=majorVersion;isOutput=true]$major"
            displayName: Set major version
@@ -110,10 +110,7 @@ stages:
                  }
                }

-                foreach($csproj in Get-ChildItem -Recurse -Filter *.csproj)
-                {
-                  dotnet pack $csproj --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg
-                }
+                dotnet pack $(solution) --configuration $(buildConfiguration) --no-build --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg
          - script: |
              sha="$(Build.SourceVersion)"
              sha=${sha:0:7}
--- a/src/Umbraco.Core/CompatibilitySuppressions.xml
+++ b/src/Umbraco.Core/CompatibilitySuppressions.xml
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceLeft</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceRight</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceLeft(System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceRight(System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IDataTypeConfigurationConnector.FromArtifact(Umbraco.Cms.Core.Models.IDataType,System.String,Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IDataTypeConfigurationConnector.ToArtifact(Umbraco.Cms.Core.Models.IDataType,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency},Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IServiceConnector.GetArtifact(System.Object,Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IServiceConnector.GetArtifact(Umbraco.Cms.Core.Udi,Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IValueConnector.FromArtifact(System.String,Umbraco.Cms.Core.Models.IPropertyType,System.Object,Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IValueConnector.ToArtifact(System.Object,Umbraco.Cms.Core.Models.IPropertyType,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency},Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>
--- a/src/Umbraco.Core/Constants-HealthChecks.cs
+++ b/src/Umbraco.Core/Constants-HealthChecks.cs
@@ -45,6 +45,8 @@ public static partial class Constants
                public const string ClickJackingCheck = "https://umbra.co/healthchecks-click-jacking";
                public const string HstsCheck = "https://umbra.co/healthchecks-hsts";
                public const string NoSniffCheck = "https://umbra.co/healthchecks-no-sniff";
+                [Obsolete("This link is not used anymore in the XSS protected check.")]
+                public const string XssProtectionCheck = "https://umbra.co/healthchecks-xss-protection";
                public const string ExcessiveHeadersCheck = "https://umbra.co/healthchecks-excessive-headers";

                public static class HttpsCheck
--- a/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs
+++ b/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Cms.Core.HealthChecks.Checks.Security;
 /// </summary>
 public abstract class BaseHttpHeaderCheck : HealthCheck
 {
-    private static HttpClient? httpClient;
+    private static HttpClient? _httpClient;
    private readonly string _header;
    private readonly IHostingEnvironment _hostingEnvironment;
    private readonly string _localizedTextPrefix;
@@ -23,13 +23,23 @@ public abstract class BaseHttpHeaderCheck : HealthCheck
    /// <summary>
    ///     Initializes a new instance of the <see cref="BaseHttpHeaderCheck" /> class.
    /// </summary>
+    [Obsolete("Use constructor that takes all parameters instead.")]
+    protected BaseHttpHeaderCheck(
+        IHostingEnvironment hostingEnvironment,
+        ILocalizedTextService textService,
+        string header,
+        string localizedTextPrefix,
+        bool metaTagOptionAvailable)
+        : this(hostingEnvironment, textService, header, localizedTextPrefix, metaTagOptionAvailable, false)
+    { }
+
    protected BaseHttpHeaderCheck(
        IHostingEnvironment hostingEnvironment,
        ILocalizedTextService textService,
        string header,
        string localizedTextPrefix,
        bool metaTagOptionAvailable,
-        bool shouldNotExist = false)
+        bool shouldNotExist)
    {
        LocalizedTextService = textService ?? throw new ArgumentNullException(nameof(textService));
        _hostingEnvironment = hostingEnvironment;
@@ -45,9 +55,9 @@ public abstract class BaseHttpHeaderCheck : HealthCheck
    /// <summary>
    ///     Gets a link to an external read more page.
    /// </summary>
-    protected abstract string? ReadMoreLink { get; }
+    protected abstract string ReadMoreLink { get; }

-    private static HttpClient HttpClient => httpClient ??= new HttpClient();
+    private static HttpClient HttpClient => _httpClient ??= new HttpClient();

    /// <summary>
    ///     Get the status for this health check
--- a/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs
+++ b/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs
@@ -29,5 +29,5 @@ public class XssProtectionCheck : BaseHttpHeaderCheck
    }

    /// <inheritdoc />
-    protected override string? ReadMoreLink => null;
+    protected override string ReadMoreLink => string.Empty;
 }
--- a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
+++ b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceLeft</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceRight</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceLeft(System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceRight(System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IGridCellValueConnector.GetValue(Umbraco.Cms.Core.Models.GridValue.GridControl,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency},Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Deploy.IGridCellValueConnector.SetValue(Umbraco.Cms.Core.Models.GridValue.GridControl,Umbraco.Cms.Core.Deploy.IContextCache)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>