From 535d07486fa77e3cb80f7af512e761f5e0c1c4be Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Tue, 11 Oct 2022 23:42:32 +0200 Subject: [PATCH 1/2] Re-add --no-build to dotnet pack Should be fixed in .NET SDK 7: https://github.com/dotnet/aspnetcore/issues/43062 --- build/azure-pipelines.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 5ba27baff8..c41d2550be 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -72,7 +72,6 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) - performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet restore @@ -111,7 +110,7 @@ stages: } } - dotnet pack $(solution) --configuration $(buildConfiguration) -p:BuildProjectReferences=false --output $(Build.ArtifactStagingDirectory)/nupkg + dotnet pack $(solution) --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg - script: | sha="$(Build.SourceVersion)" sha=${sha:0:7} @@ -246,7 +245,6 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) - performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test @@ -283,7 +281,6 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) - performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test @@ -418,7 +415,6 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) - performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) # Linux containers smooth - task: PowerShell@2 From d73ab7c9ca4827e2f715a1c03f3899e308cf16d7 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Tue, 11 Oct 2022 23:54:20 +0200 Subject: [PATCH 2/2] Add compatibility suppressions --- src/Umbraco.Core/CompatibilitySuppressions.xml | 7 +++++++ src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml | 7 +++++++ src/Umbraco.Infrastructure/CompatibilitySuppressions.xml | 7 +++++++ .../CompatibilitySuppressions.xml | 7 +++++++ src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml | 7 +++++++ src/Umbraco.Web.Common/CompatibilitySuppressions.xml | 7 +++++++ src/Umbraco.Web.Website/CompatibilitySuppressions.xml | 7 +++++++ tests/Umbraco.Tests.Common/CompatibilitySuppressions.xml | 7 +++++++ 8 files changed, 56 insertions(+) create mode 100644 src/Umbraco.Core/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.Infrastructure/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.Web.Common/CompatibilitySuppressions.xml create mode 100644 src/Umbraco.Web.Website/CompatibilitySuppressions.xml create mode 100644 tests/Umbraco.Tests.Common/CompatibilitySuppressions.xml diff --git a/src/Umbraco.Core/CompatibilitySuppressions.xml b/src/Umbraco.Core/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Core/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml b/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml b/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.PublishedCache.NuCache/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml b/src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.Web.Common/CompatibilitySuppressions.xml b/src/Umbraco.Web.Common/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Web.Common/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/src/Umbraco.Web.Website/CompatibilitySuppressions.xml b/src/Umbraco.Web.Website/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/src/Umbraco.Web.Website/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file diff --git a/tests/Umbraco.Tests.Common/CompatibilitySuppressions.xml b/tests/Umbraco.Tests.Common/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..7baad05aa0 --- /dev/null +++ b/tests/Umbraco.Tests.Common/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net6.0 + + \ No newline at end of file