Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 3 additions & 6 deletions build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
73 changes: 0 additions & 73 deletions src/Umbraco.Core/CompatibilitySuppressions.xml

This file was deleted.

2 changes: 2 additions & 0 deletions src/Umbraco.Core/Constants-HealthChecks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public static class Security
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -45,9 +55,9 @@ protected BaseHttpHeaderCheck(
/// <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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ public XssProtectionCheck(IHostingEnvironment hostingEnvironment, ILocalizedText
}

/// <inheritdoc />
protected override string? ReadMoreLink => null;
protected override string ReadMoreLink => string.Empty;
}
45 changes: 0 additions & 45 deletions src/Umbraco.Infrastructure/CompatibilitySuppressions.xml

This file was deleted.