From 2dd84810fcc6b29923b4f4af4096537a07d0f6c4 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:26:04 +0100 Subject: [PATCH 01/22] KX-11751 - Agent pool change --- .azuredevops/pipelines/build-and-release.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 0c7a7f0..2f23e13 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -7,13 +7,23 @@ parameters: - name: AgentPoolName displayName: Agent pool name type: string - default: Default + default: ADO Windows Server 2022 - name: AgentName displayName: Agent name - single char for any type: string default: " " +resources: + repositories: + - repository: self + type: git + + containers: + - container: Windows + image: base/mcr-servercore-ltsc2022:latest + endpoint: xperienceagentshub.azurecr.io + variables: - name: SIGN_FILE value: true @@ -29,6 +39,7 @@ stages: ${{ if ne(length(parameters.AgentName), 1) }}: demands: - Agent.Name -equals ${{ parameters.AgentName }} + container: Windows variables: - group: Code Sign KV Auth @@ -122,6 +133,7 @@ stages: ${{ if ne(length(parameters.AgentName), 1) }}: demands: - Agent.Name -equals ${{ parameters.AgentName }} + container: Windows environment: integrations-release-nuget workspace: From ba0bbe7343231157a6569dd780e15b369045d18b Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:37:10 +0100 Subject: [PATCH 02/22] KX-11751 - Testing base/mcr-dotnet-sdk-6.0-servercore-ltsc2022 image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 2f23e13..2808e6b 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-servercore-ltsc2022:latest + image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:latest endpoint: xperienceagentshub.azurecr.io variables: From 0b578fdf0aa81248a3195736523446c345a9f22b Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:42:43 +0100 Subject: [PATCH 03/22] KX-11751 - Testing base/mcr-dotnet-sdk-8.0-servercore-ltsc2022 image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 2808e6b..5c44f82 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:latest + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:latest endpoint: xperienceagentshub.azurecr.io variables: From e688e18bebc73a94d66ef41dcc2446b00be1aa30 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:48:47 +0100 Subject: [PATCH 04/22] KX-11751 - Testing base/mcr-dotnet-sdk-8.0-ubuntu-22.04 image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 5c44f82..99c117a 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:latest + image: base/mcr-dotnet-sdk-8.0-ubuntu-22.04:latest endpoint: xperienceagentshub.azurecr.io variables: From 9dc76eb1401304af64983b059461c1bd9efa968e Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:52:42 +0100 Subject: [PATCH 05/22] KX-11751 - Testing base/mcr-dotnet-sdk-8.0-ubuntu-22.04 image 2 --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 99c117a..29e3f63 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -7,7 +7,7 @@ parameters: - name: AgentPoolName displayName: Agent pool name type: string - default: ADO Windows Server 2022 + default: ADO Ubuntu 22.04 Scale Set - name: AgentName displayName: Agent name - single char for any From 7fd5a3e0158ccc0bc13843dd759de826527afd3a Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Wed, 6 Mar 2024 16:57:29 +0100 Subject: [PATCH 06/22] KX-11751 - Back to base/mcr-servercore-ltsc2022 image --- .azuredevops/pipelines/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 29e3f63..2f23e13 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -7,7 +7,7 @@ parameters: - name: AgentPoolName displayName: Agent pool name type: string - default: ADO Ubuntu 22.04 Scale Set + default: ADO Windows Server 2022 - name: AgentName displayName: Agent name - single char for any @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-ubuntu-22.04:latest + image: base/mcr-servercore-ltsc2022:latest endpoint: xperienceagentshub.azurecr.io variables: From 3de2d88edf4f17d5f36d128eb21b4d5198a22244 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 10:28:10 +0100 Subject: [PATCH 07/22] KX-11751 - Testing image in release version --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 2f23e13..25562ec 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-servercore-ltsc2022:latest + image: base/mcr-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: From 2f85783fc9b59ae1d370e69fd614c20e3aed3c10 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 10:38:54 +0100 Subject: [PATCH 08/22] KX-11751 - Testing base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 25562ec..f2a1e64 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: From df083277f4463e21c82c2e6a67b21692c4dacaec Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 11:26:24 +0100 Subject: [PATCH 09/22] KX-11751 - Back to base/mcr-servercore-ltsc2022:release image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index f2a1e64..25562ec 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release + image: base/mcr-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: From 972047811f78d10bc68c042a8afda37908623d45 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 11:44:46 +0100 Subject: [PATCH 10/22] KX-11751 - Remove "select dotnet version" task --- .azuredevops/pipelines/build-and-release.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 25562ec..87bdbe3 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -72,12 +72,6 @@ stages: inputs: version: $(PACKAGE_JSON_NODE_VERSION) - - task: UseDotNet@2 - displayName: Select dotnet version - inputs: - packageType: sdk - useGlobalJson: true - - task: DotNetCoreCLI@2 displayName: Restore dotnet tools inputs: From 380ecf1a40f2c962a5eff75fc77ce4178b84461a Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 12:09:38 +0100 Subject: [PATCH 11/22] KX-11751 - Switch to base/mcr-dotnet-sdk-8.0-servercore-ltsc2022 image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 87bdbe3..6ea0f4d 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: From a68b8f23efea96f2c68f205dfee10f93d6ef424e Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 14:21:59 +0100 Subject: [PATCH 12/22] KX-11751 - Testing ado/net8/solution-build-servercore-2022 image --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 6ea0f4d..75ea369 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release + image: ado/net8/solution-build-servercore-2022:1 endpoint: xperienceagentshub.azurecr.io variables: From 6fe7cc7d66d0ffcee0f9f706235f0d710217c6e9 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 14:45:12 +0100 Subject: [PATCH 13/22] KX-11751 - Back to base/mcr-dotnet-sdk-8.0-servercore-ltsc2022 image & verbose signing --- .azuredevops/pipelines/build-and-release.yaml | 2 +- Directory.build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 75ea369..6ea0f4d 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: ado/net8/solution-build-servercore-2022:1 + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: diff --git a/Directory.build.targets b/Directory.build.targets index fec5935..3767195 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From 2f277a37720517cce706ce8231db52216fa9a8e7 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 15:34:22 +0100 Subject: [PATCH 14/22] KX-11751 - Testing base/mcr-dotnet-sdk-6.0-servercore-ltsc2022 image & signing without verbose --- .azuredevops/pipelines/build-and-release.yaml | 2 +- Directory.build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 6ea0f4d..a9ca6a0 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: diff --git a/Directory.build.targets b/Directory.build.targets index 3767195..fec5935 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From 1298a12f45dd3fcc3e7ec7b2ad2028615a45564a Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Thu, 7 Mar 2024 15:47:32 +0100 Subject: [PATCH 15/22] KX-11751 - Switch project to net8.0 --- .azuredevops/pipelines/build-and-release.yaml | 2 +- Directory.Build.props | 2 +- examples/DancingGoat/packages.lock.json | 110 ++++++++---------- .../packages.lock.json | 110 ++++++++---------- 4 files changed, 100 insertions(+), 124 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index a9ca6a0..6ea0f4d 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: diff --git a/Directory.Build.props b/Directory.Build.props index 33e3c7d..258928d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,7 +22,7 @@ - net6.0 + net8.0 enable enable nullable diff --git a/examples/DancingGoat/packages.lock.json b/examples/DancingGoat/packages.lock.json index bcd16e6..30073e0 100644 --- a/examples/DancingGoat/packages.lock.json +++ b/examples/DancingGoat/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net6.0": { + "net8.0": { "Kentico.Xperience.Admin": { "type": "Direct", "requested": "[28.1.2, )", @@ -168,8 +168,8 @@ "resolved": "13.7.0", "contentHash": "BjZ2KbrQT36hEYW4Hj9lzA/nH514jgFD1e1zDprxBOfQMGbD2mMlGaU4sBJf4GEYdKYRUdxUHSACK7yDUDTYVA==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0", + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", + "System.Diagnostics.DiagnosticSource": "8.0.0-rc.2.23479.6", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -194,8 +194,7 @@ "contentHash": "D7ITncily71twwVwH68vOW7epqVvduZGDcqg0J9Cuct4QxFAkxc/YcVh0c8WxM1i4O915xJuJBpEQxLr+q1AlA==", "dependencies": { "HotChocolate.Language": "13.7.0", - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "8.0.0-rc.2.23479.6" } }, "HotChocolate.AspNetCore": { @@ -237,8 +236,8 @@ "HotChocolate.Fetching": "13.7.0", "HotChocolate.Types": "13.7.0", "HotChocolate.Validation": "13.7.0", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "System.Threading.Channels": "6.0.0" + "Microsoft.Extensions.DependencyInjection": "8.0.0-rc.2.23479.6", + "System.Threading.Channels": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Execution.Abstractions": { @@ -247,7 +246,7 @@ "contentHash": "7gzjF4xqCa0BYIzJ/nDTlnhdjYOJdydhYi7X5Be4PV41iy3V3rG74Pus+LcvOEi+5INFtxAhbXkDQR7n/rQwpQ==", "dependencies": { "HotChocolate.Abstractions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Fetching": { @@ -275,7 +274,7 @@ "resolved": "13.7.0", "contentHash": "oU1hquKD90p3NxEXgQ2kd4F92ceGVO1uFVfuQ9YV8oQ3lCa6xm8UTVSHJX0nnKAmv59deolaMdfXAV16sKMWOg==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "6.0.0" + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2" } }, "HotChocolate.Language.Utf8": { @@ -318,7 +317,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.7.0", "HotChocolate.Subscriptions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Transport.Sockets": { @@ -326,7 +325,7 @@ "resolved": "13.7.0", "contentHash": "DoRW/Htb6G/SHbWuPiq+mDqL5TdEsTbmuOQ19B9x1Z5X7iDW64N5hNTfR6YbT17J5OgQvb7XrPQLhVl6DALagQ==", "dependencies": { - "System.IO.Pipelines": "6.0.0" + "System.IO.Pipelines": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Types": { @@ -337,10 +336,10 @@ "HotChocolate.Abstractions": "13.7.0", "HotChocolate.Types.Shared": "13.7.0", "HotChocolate.Utilities": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.ObjectPool": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "6.0.7" + "System.Text.Json": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Types.CursorPagination": { @@ -397,8 +396,8 @@ "contentHash": "/y6kX7cBkRbI9UgeWHgs/Kt8phJql1IrZjwSwdU6s8QOidFbanhsBU4euqVnM+hSeCbArzzKdrKt98DoPyfldA==", "dependencies": { "HotChocolate.Types": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.Options": "8.0.0-rc.2.23479.6" } }, "HtmlSanitizer": { @@ -635,8 +634,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -741,17 +740,16 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "pUD/Gjd0MTrWPD4/SnKazYQvky2EHEtPyGb3FWZkEPWAfYPFVVw5fMRTkfoBPivpWLuxEw4FNK7GX77xEErUQQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "QLTBDvE/E05Xl2UVFXOBFIW0VLn/mMJ8DSbTyK6ODsO3sqDs0fyPqydACTnX/nbGZRrTMeud3XDbUrt24ab1EA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -849,16 +847,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" + "resolved": "8.0.0-rc.2.23480.2", + "contentHash": "iL9VcNK4dbMOLqAHInwcmVxzr+5sXp70m5Tt1uyIkc5SfJUTuFN6VaxrZy3k91oquTtYrkK9DbE5IP18iJUrtw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "f2uTnKEleplKK+pVKEg1rOCmM3+cuLpafTpKJzbj9lm8dmj0+dWxb0L6MAt9r1s3OYlIKY5IdkW0TUFKXvRCMg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.Primitives": "8.0.0-rc.2.23479.6" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -875,11 +873,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "I3fTiDmV+2cCR3VjH+oz49AMgrAqX1cmNiWXmEAituAI7jCLA16uXzvYQTwxhQzov5BTdPVXKGNTxsMb1GpcLQ==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -1058,10 +1053,7 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -1073,16 +1065,19 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { + "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "D1Fi5wRyRVwriEdlSniYlo2kW8SCGaSCM/alsY8R7eXcW+xCPRB7gohE45X00EiNkhdUrJ3yNfltV8lLK0HoWQ==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1122,8 +1117,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "4bqn2Kj0keumJ0x3wdZtO1Ex/5Ppu01fP7Rtmn1uJBR08WWRKeKSX6U9a/BiEieE9JjhzapvhjPtFypE7ZIAyQ==" }, "System.Memory": { "type": "Transitive", @@ -1219,32 +1214,25 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "n66ZIJjetmrMq9hJ61Xed2cp9O2zr/VdzhhURjkLDEFOZ38/VpOWnvM3CWCXA18NbM7x0tdKZYex9rj0NimpPA==" }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "SXMjrmm/e0Om+731AEUgm+81dC+i9mV54nKJGOq9+zTYpzujMCmSQSMS1sgQb0gmiiAfTfRC5WgD3l92cfAP+g==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Text.Encodings.Web": "8.0.0-rc.2.23479.6" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "z8/q0WPKxQsxuzywRbY1oCb2ZO4qgRbE0nYwXjwrIJ7y10796vJl9P2++MF4JcBcKXfNLgw0JSQslMTxXB+C/A==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", diff --git a/src/Kentico.Xperience.Algolia/packages.lock.json b/src/Kentico.Xperience.Algolia/packages.lock.json index b035686..44aadc2 100644 --- a/src/Kentico.Xperience.Algolia/packages.lock.json +++ b/src/Kentico.Xperience.Algolia/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net6.0": { + "net8.0": { "Algolia.Search": { "type": "Direct", "requested": "[6.16.0, )", @@ -113,8 +113,8 @@ "resolved": "13.7.0", "contentHash": "BjZ2KbrQT36hEYW4Hj9lzA/nH514jgFD1e1zDprxBOfQMGbD2mMlGaU4sBJf4GEYdKYRUdxUHSACK7yDUDTYVA==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0", + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", + "System.Diagnostics.DiagnosticSource": "8.0.0-rc.2.23479.6", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -139,8 +139,7 @@ "contentHash": "D7ITncily71twwVwH68vOW7epqVvduZGDcqg0J9Cuct4QxFAkxc/YcVh0c8WxM1i4O915xJuJBpEQxLr+q1AlA==", "dependencies": { "HotChocolate.Language": "13.7.0", - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "8.0.0-rc.2.23479.6" } }, "HotChocolate.AspNetCore": { @@ -182,8 +181,8 @@ "HotChocolate.Fetching": "13.7.0", "HotChocolate.Types": "13.7.0", "HotChocolate.Validation": "13.7.0", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "System.Threading.Channels": "6.0.0" + "Microsoft.Extensions.DependencyInjection": "8.0.0-rc.2.23479.6", + "System.Threading.Channels": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Execution.Abstractions": { @@ -192,7 +191,7 @@ "contentHash": "7gzjF4xqCa0BYIzJ/nDTlnhdjYOJdydhYi7X5Be4PV41iy3V3rG74Pus+LcvOEi+5INFtxAhbXkDQR7n/rQwpQ==", "dependencies": { "HotChocolate.Abstractions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Fetching": { @@ -220,7 +219,7 @@ "resolved": "13.7.0", "contentHash": "oU1hquKD90p3NxEXgQ2kd4F92ceGVO1uFVfuQ9YV8oQ3lCa6xm8UTVSHJX0nnKAmv59deolaMdfXAV16sKMWOg==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "6.0.0" + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2" } }, "HotChocolate.Language.Utf8": { @@ -263,7 +262,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.7.0", "HotChocolate.Subscriptions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Transport.Sockets": { @@ -271,7 +270,7 @@ "resolved": "13.7.0", "contentHash": "DoRW/Htb6G/SHbWuPiq+mDqL5TdEsTbmuOQ19B9x1Z5X7iDW64N5hNTfR6YbT17J5OgQvb7XrPQLhVl6DALagQ==", "dependencies": { - "System.IO.Pipelines": "6.0.0" + "System.IO.Pipelines": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Types": { @@ -282,10 +281,10 @@ "HotChocolate.Abstractions": "13.7.0", "HotChocolate.Types.Shared": "13.7.0", "HotChocolate.Utilities": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.ObjectPool": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "6.0.7" + "System.Text.Json": "8.0.0-rc.2.23479.6" } }, "HotChocolate.Types.CursorPagination": { @@ -342,8 +341,8 @@ "contentHash": "/y6kX7cBkRbI9UgeWHgs/Kt8phJql1IrZjwSwdU6s8QOidFbanhsBU4euqVnM+hSeCbArzzKdrKt98DoPyfldA==", "dependencies": { "HotChocolate.Types": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.Options": "8.0.0-rc.2.23479.6" } }, "HtmlSanitizer": { @@ -408,8 +407,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -488,17 +487,16 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "pUD/Gjd0MTrWPD4/SnKazYQvky2EHEtPyGb3FWZkEPWAfYPFVVw5fMRTkfoBPivpWLuxEw4FNK7GX77xEErUQQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "QLTBDvE/E05Xl2UVFXOBFIW0VLn/mMJ8DSbTyK6ODsO3sqDs0fyPqydACTnX/nbGZRrTMeud3XDbUrt24ab1EA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -587,16 +585,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" + "resolved": "8.0.0-rc.2.23480.2", + "contentHash": "iL9VcNK4dbMOLqAHInwcmVxzr+5sXp70m5Tt1uyIkc5SfJUTuFN6VaxrZy3k91oquTtYrkK9DbE5IP18iJUrtw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "f2uTnKEleplKK+pVKEg1rOCmM3+cuLpafTpKJzbj9lm8dmj0+dWxb0L6MAt9r1s3OYlIKY5IdkW0TUFKXvRCMg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.Primitives": "8.0.0-rc.2.23479.6" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -613,11 +611,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "I3fTiDmV+2cCR3VjH+oz49AMgrAqX1cmNiWXmEAituAI7jCLA16uXzvYQTwxhQzov5BTdPVXKGNTxsMb1GpcLQ==" }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -737,10 +732,7 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -752,16 +744,19 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { + "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "D1Fi5wRyRVwriEdlSniYlo2kW8SCGaSCM/alsY8R7eXcW+xCPRB7gohE45X00EiNkhdUrJ3yNfltV8lLK0HoWQ==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.Formats.Asn1": { "type": "Transitive", @@ -784,8 +779,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "4bqn2Kj0keumJ0x3wdZtO1Ex/5Ppu01fP7Rtmn1uJBR08WWRKeKSX6U9a/BiEieE9JjhzapvhjPtFypE7ZIAyQ==" }, "System.Memory": { "type": "Transitive", @@ -867,32 +862,25 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "n66ZIJjetmrMq9hJ61Xed2cp9O2zr/VdzhhURjkLDEFOZ38/VpOWnvM3CWCXA18NbM7x0tdKZYex9rj0NimpPA==" }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "SXMjrmm/e0Om+731AEUgm+81dC+i9mV54nKJGOq9+zTYpzujMCmSQSMS1sgQb0gmiiAfTfRC5WgD3l92cfAP+g==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Text.Encodings.Web": "8.0.0-rc.2.23479.6" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" + "resolved": "8.0.0-rc.2.23479.6", + "contentHash": "z8/q0WPKxQsxuzywRbY1oCb2ZO4qgRbE0nYwXjwrIJ7y10796vJl9P2++MF4JcBcKXfNLgw0JSQslMTxXB+C/A==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", From b3bb8a94339edc65049e615d8fe6d8ed838f9326 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Fri, 8 Mar 2024 18:29:08 +0100 Subject: [PATCH 16/22] Revert "KX-11751 - Switch project to net8.0" This reverts commit 1298a12f45dd3fcc3e7ec7b2ad2028615a45564a. --- .azuredevops/pipelines/build-and-release.yaml | 2 +- Directory.Build.props | 2 +- examples/DancingGoat/packages.lock.json | 110 ++++++++++-------- .../packages.lock.json | 110 ++++++++++-------- 4 files changed, 124 insertions(+), 100 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 6ea0f4d..a9ca6a0 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: diff --git a/Directory.Build.props b/Directory.Build.props index 258928d..33e3c7d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,7 +22,7 @@ - net8.0 + net6.0 enable enable nullable diff --git a/examples/DancingGoat/packages.lock.json b/examples/DancingGoat/packages.lock.json index 30073e0..bcd16e6 100644 --- a/examples/DancingGoat/packages.lock.json +++ b/examples/DancingGoat/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net6.0": { "Kentico.Xperience.Admin": { "type": "Direct", "requested": "[28.1.2, )", @@ -168,8 +168,8 @@ "resolved": "13.7.0", "contentHash": "BjZ2KbrQT36hEYW4Hj9lzA/nH514jgFD1e1zDprxBOfQMGbD2mMlGaU4sBJf4GEYdKYRUdxUHSACK7yDUDTYVA==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", - "System.Diagnostics.DiagnosticSource": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.ObjectPool": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -194,7 +194,8 @@ "contentHash": "D7ITncily71twwVwH68vOW7epqVvduZGDcqg0J9Cuct4QxFAkxc/YcVh0c8WxM1i4O915xJuJBpEQxLr+q1AlA==", "dependencies": { "HotChocolate.Language": "13.7.0", - "System.Collections.Immutable": "8.0.0-rc.2.23479.6" + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Collections.Immutable": "6.0.0" } }, "HotChocolate.AspNetCore": { @@ -236,8 +237,8 @@ "HotChocolate.Fetching": "13.7.0", "HotChocolate.Types": "13.7.0", "HotChocolate.Validation": "13.7.0", - "Microsoft.Extensions.DependencyInjection": "8.0.0-rc.2.23479.6", - "System.Threading.Channels": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "System.Threading.Channels": "6.0.0" } }, "HotChocolate.Execution.Abstractions": { @@ -246,7 +247,7 @@ "contentHash": "7gzjF4xqCa0BYIzJ/nDTlnhdjYOJdydhYi7X5Be4PV41iy3V3rG74Pus+LcvOEi+5INFtxAhbXkDQR7n/rQwpQ==", "dependencies": { "HotChocolate.Abstractions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Fetching": { @@ -274,7 +275,7 @@ "resolved": "13.7.0", "contentHash": "oU1hquKD90p3NxEXgQ2kd4F92ceGVO1uFVfuQ9YV8oQ3lCa6xm8UTVSHJX0nnKAmv59deolaMdfXAV16sKMWOg==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2" + "Microsoft.Extensions.ObjectPool": "6.0.0" } }, "HotChocolate.Language.Utf8": { @@ -317,7 +318,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.7.0", "HotChocolate.Subscriptions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Transport.Sockets": { @@ -325,7 +326,7 @@ "resolved": "13.7.0", "contentHash": "DoRW/Htb6G/SHbWuPiq+mDqL5TdEsTbmuOQ19B9x1Z5X7iDW64N5hNTfR6YbT17J5OgQvb7XrPQLhVl6DALagQ==", "dependencies": { - "System.IO.Pipelines": "8.0.0-rc.2.23479.6" + "System.IO.Pipelines": "6.0.0" } }, "HotChocolate.Types": { @@ -336,10 +337,10 @@ "HotChocolate.Abstractions": "13.7.0", "HotChocolate.Types.Shared": "13.7.0", "HotChocolate.Utilities": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "8.0.0-rc.2.23479.6" + "System.Text.Json": "6.0.7" } }, "HotChocolate.Types.CursorPagination": { @@ -396,8 +397,8 @@ "contentHash": "/y6kX7cBkRbI9UgeWHgs/Kt8phJql1IrZjwSwdU6s8QOidFbanhsBU4euqVnM+hSeCbArzzKdrKt98DoPyfldA==", "dependencies": { "HotChocolate.Types": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.Options": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "HtmlSanitizer": { @@ -634,8 +635,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -740,16 +741,17 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "pUD/Gjd0MTrWPD4/SnKazYQvky2EHEtPyGb3FWZkEPWAfYPFVVw5fMRTkfoBPivpWLuxEw4FNK7GX77xEErUQQ==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "QLTBDvE/E05Xl2UVFXOBFIW0VLn/mMJ8DSbTyK6ODsO3sqDs0fyPqydACTnX/nbGZRrTMeud3XDbUrt24ab1EA==" + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -847,16 +849,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23480.2", - "contentHash": "iL9VcNK4dbMOLqAHInwcmVxzr+5sXp70m5Tt1uyIkc5SfJUTuFN6VaxrZy3k91oquTtYrkK9DbE5IP18iJUrtw==" + "resolved": "6.0.0", + "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "f2uTnKEleplKK+pVKEg1rOCmM3+cuLpafTpKJzbj9lm8dmj0+dWxb0L6MAt9r1s3OYlIKY5IdkW0TUFKXvRCMg==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.Primitives": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -873,8 +875,11 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "I3fTiDmV+2cCR3VjH+oz49AMgrAqX1cmNiWXmEAituAI7jCLA16uXzvYQTwxhQzov5BTdPVXKGNTxsMb1GpcLQ==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -1053,7 +1058,10 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -1065,19 +1073,16 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "D1Fi5wRyRVwriEdlSniYlo2kW8SCGaSCM/alsY8R7eXcW+xCPRB7gohE45X00EiNkhdUrJ3yNfltV8lLK0HoWQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1117,8 +1122,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "4bqn2Kj0keumJ0x3wdZtO1Ex/5Ppu01fP7Rtmn1uJBR08WWRKeKSX6U9a/BiEieE9JjhzapvhjPtFypE7ZIAyQ==" + "resolved": "6.0.0", + "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" }, "System.Memory": { "type": "Transitive", @@ -1214,25 +1219,32 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "n66ZIJjetmrMq9hJ61Xed2cp9O2zr/VdzhhURjkLDEFOZ38/VpOWnvM3CWCXA18NbM7x0tdKZYex9rj0NimpPA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "SXMjrmm/e0Om+731AEUgm+81dC+i9mV54nKJGOq9+zTYpzujMCmSQSMS1sgQb0gmiiAfTfRC5WgD3l92cfAP+g==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { - "System.Text.Encodings.Web": "8.0.0-rc.2.23479.6" + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "z8/q0WPKxQsxuzywRbY1oCb2ZO4qgRbE0nYwXjwrIJ7y10796vJl9P2++MF4JcBcKXfNLgw0JSQslMTxXB+C/A==" + "resolved": "6.0.0", + "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", diff --git a/src/Kentico.Xperience.Algolia/packages.lock.json b/src/Kentico.Xperience.Algolia/packages.lock.json index 44aadc2..b035686 100644 --- a/src/Kentico.Xperience.Algolia/packages.lock.json +++ b/src/Kentico.Xperience.Algolia/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net8.0": { + "net6.0": { "Algolia.Search": { "type": "Direct", "requested": "[6.16.0, )", @@ -113,8 +113,8 @@ "resolved": "13.7.0", "contentHash": "BjZ2KbrQT36hEYW4Hj9lzA/nH514jgFD1e1zDprxBOfQMGbD2mMlGaU4sBJf4GEYdKYRUdxUHSACK7yDUDTYVA==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", - "System.Diagnostics.DiagnosticSource": "8.0.0-rc.2.23479.6", + "Microsoft.Extensions.ObjectPool": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.0" } }, @@ -139,7 +139,8 @@ "contentHash": "D7ITncily71twwVwH68vOW7epqVvduZGDcqg0J9Cuct4QxFAkxc/YcVh0c8WxM1i4O915xJuJBpEQxLr+q1AlA==", "dependencies": { "HotChocolate.Language": "13.7.0", - "System.Collections.Immutable": "8.0.0-rc.2.23479.6" + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Collections.Immutable": "6.0.0" } }, "HotChocolate.AspNetCore": { @@ -181,8 +182,8 @@ "HotChocolate.Fetching": "13.7.0", "HotChocolate.Types": "13.7.0", "HotChocolate.Validation": "13.7.0", - "Microsoft.Extensions.DependencyInjection": "8.0.0-rc.2.23479.6", - "System.Threading.Channels": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "System.Threading.Channels": "6.0.0" } }, "HotChocolate.Execution.Abstractions": { @@ -191,7 +192,7 @@ "contentHash": "7gzjF4xqCa0BYIzJ/nDTlnhdjYOJdydhYi7X5Be4PV41iy3V3rG74Pus+LcvOEi+5INFtxAhbXkDQR7n/rQwpQ==", "dependencies": { "HotChocolate.Abstractions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Fetching": { @@ -219,7 +220,7 @@ "resolved": "13.7.0", "contentHash": "oU1hquKD90p3NxEXgQ2kd4F92ceGVO1uFVfuQ9YV8oQ3lCa6xm8UTVSHJX0nnKAmv59deolaMdfXAV16sKMWOg==", "dependencies": { - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2" + "Microsoft.Extensions.ObjectPool": "6.0.0" } }, "HotChocolate.Language.Utf8": { @@ -262,7 +263,7 @@ "dependencies": { "HotChocolate.Execution.Abstractions": "13.7.0", "HotChocolate.Subscriptions": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0" } }, "HotChocolate.Transport.Sockets": { @@ -270,7 +271,7 @@ "resolved": "13.7.0", "contentHash": "DoRW/Htb6G/SHbWuPiq+mDqL5TdEsTbmuOQ19B9x1Z5X7iDW64N5hNTfR6YbT17J5OgQvb7XrPQLhVl6DALagQ==", "dependencies": { - "System.IO.Pipelines": "8.0.0-rc.2.23479.6" + "System.IO.Pipelines": "6.0.0" } }, "HotChocolate.Types": { @@ -281,10 +282,10 @@ "HotChocolate.Abstractions": "13.7.0", "HotChocolate.Types.Shared": "13.7.0", "HotChocolate.Utilities": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.ObjectPool": "8.0.0-rc.2.23480.2", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.ObjectPool": "6.0.0", "System.ComponentModel.Annotations": "5.0.0", - "System.Text.Json": "8.0.0-rc.2.23479.6" + "System.Text.Json": "6.0.7" } }, "HotChocolate.Types.CursorPagination": { @@ -341,8 +342,8 @@ "contentHash": "/y6kX7cBkRbI9UgeWHgs/Kt8phJql1IrZjwSwdU6s8QOidFbanhsBU4euqVnM+hSeCbArzzKdrKt98DoPyfldA==", "dependencies": { "HotChocolate.Types": "13.7.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.Options": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "HtmlSanitizer": { @@ -407,8 +408,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -487,16 +488,17 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "pUD/Gjd0MTrWPD4/SnKazYQvky2EHEtPyGb3FWZkEPWAfYPFVVw5fMRTkfoBPivpWLuxEw4FNK7GX77xEErUQQ==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "QLTBDvE/E05Xl2UVFXOBFIW0VLn/mMJ8DSbTyK6ODsO3sqDs0fyPqydACTnX/nbGZRrTMeud3XDbUrt24ab1EA==" + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -585,16 +587,16 @@ }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23480.2", - "contentHash": "iL9VcNK4dbMOLqAHInwcmVxzr+5sXp70m5Tt1uyIkc5SfJUTuFN6VaxrZy3k91oquTtYrkK9DbE5IP18iJUrtw==" + "resolved": "6.0.0", + "contentHash": "7hR9FU0JJHOCLmn/Ary31pLLAhlzoMptBKs5CJmNUzD87dXjl+/NqVkyCTl6cT2JAfTK0G39HpvCOv1fhsX3BQ==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "f2uTnKEleplKK+pVKEg1rOCmM3+cuLpafTpKJzbj9lm8dmj0+dWxb0L6MAt9r1s3OYlIKY5IdkW0TUFKXvRCMg==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0-rc.2.23479.6", - "Microsoft.Extensions.Primitives": "8.0.0-rc.2.23479.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -611,8 +613,11 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "I3fTiDmV+2cCR3VjH+oz49AMgrAqX1cmNiWXmEAituAI7jCLA16uXzvYQTwxhQzov5BTdPVXKGNTxsMb1GpcLQ==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", @@ -732,7 +737,10 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -744,19 +752,16 @@ "resolved": "8.0.0", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "D1Fi5wRyRVwriEdlSniYlo2kW8SCGaSCM/alsY8R7eXcW+xCPRB7gohE45X00EiNkhdUrJ3yNfltV8lLK0HoWQ==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Formats.Asn1": { "type": "Transitive", @@ -779,8 +784,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "4bqn2Kj0keumJ0x3wdZtO1Ex/5Ppu01fP7Rtmn1uJBR08WWRKeKSX6U9a/BiEieE9JjhzapvhjPtFypE7ZIAyQ==" + "resolved": "6.0.0", + "contentHash": "mXX66shZ4xLlI3vNLaJ0lt8OIZdmXTvIqXRdQX5HLVGSkLhINLsVhyZuX2UdRFnOGkqnwmMUs40pIIQ7mna4+A==" }, "System.Memory": { "type": "Transitive", @@ -862,25 +867,32 @@ "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==" + "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "n66ZIJjetmrMq9hJ61Xed2cp9O2zr/VdzhhURjkLDEFOZ38/VpOWnvM3CWCXA18NbM7x0tdKZYex9rj0NimpPA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "SXMjrmm/e0Om+731AEUgm+81dC+i9mV54nKJGOq9+zTYpzujMCmSQSMS1sgQb0gmiiAfTfRC5WgD3l92cfAP+g==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { - "System.Text.Encodings.Web": "8.0.0-rc.2.23479.6" + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "8.0.0-rc.2.23479.6", - "contentHash": "z8/q0WPKxQsxuzywRbY1oCb2ZO4qgRbE0nYwXjwrIJ7y10796vJl9P2++MF4JcBcKXfNLgw0JSQslMTxXB+C/A==" + "resolved": "6.0.0", + "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", From c4eb43ac4a94ec700fb5e530f434148dbb19850d Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Fri, 8 Mar 2024 18:32:58 +0100 Subject: [PATCH 17/22] KX-11751 - Testing net8 image with --roll-forward Major for azuresigntool --- .azuredevops/pipelines/build-and-release.yaml | 2 +- Directory.build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index a9ca6a0..6ea0f4d 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -21,7 +21,7 @@ resources: containers: - container: Windows - image: base/mcr-dotnet-sdk-6.0-servercore-ltsc2022:release + image: base/mcr-dotnet-sdk-8.0-servercore-ltsc2022:release endpoint: xperienceagentshub.azurecr.io variables: diff --git a/Directory.build.targets b/Directory.build.targets index fec5935..868be14 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From c69ef18a4343c22a8de50b90d6ce14ebf2ee24c5 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Fri, 8 Mar 2024 18:40:09 +0100 Subject: [PATCH 18/22] KX-11751 - Testing azuresigntool with --roll-forward LastMajor --- Directory.build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.build.targets b/Directory.build.targets index 868be14..80f7491 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From ccb678dbec687bf5cb66f397b91d5a54d5559a76 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Fri, 8 Mar 2024 18:45:03 +0100 Subject: [PATCH 19/22] KX-11751 - Testing azuresigntool with --allow-roll-forward --- Directory.build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.build.targets b/Directory.build.targets index 80f7491..ecdd986 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From bd35ba409c5cce313a668556c786084abebf628c Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Mon, 11 Mar 2024 10:16:35 +0100 Subject: [PATCH 20/22] KX-11751 - Testing azuresigntool with env variable DOTNET_ROLL_FORWARD --- .azuredevops/pipelines/build-and-release.yaml | 1 + Directory.build.targets | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 6ea0f4d..310883c 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -97,6 +97,7 @@ stages: arguments: --no-restore env: AuthenticodeClientSecret: $(AuthenticodeClientSecret) + DOTNET_ROLL_FORWARD: LatestMajor - task: DotNetCoreCLI@2 displayName: Create NuGet package diff --git a/Directory.build.targets b/Directory.build.targets index ecdd986..fec5935 100644 --- a/Directory.build.targets +++ b/Directory.build.targets @@ -9,6 +9,6 @@ - + From ce07320db12f5f00029ad112057d0d5cfc6e3994 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Mon, 11 Mar 2024 10:39:24 +0100 Subject: [PATCH 21/22] KX-11751 - Testing env variable DOTNET_ROLL_FORWARD with Major --- .azuredevops/pipelines/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 310883c..505a5a2 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -97,7 +97,7 @@ stages: arguments: --no-restore env: AuthenticodeClientSecret: $(AuthenticodeClientSecret) - DOTNET_ROLL_FORWARD: LatestMajor + DOTNET_ROLL_FORWARD: Major - task: DotNetCoreCLI@2 displayName: Create NuGet package From 9cd19da17a4ddd2737c889b08e68d7468017e741 Mon Sep 17 00:00:00 2001 From: Zdenek Strach Date: Mon, 11 Mar 2024 12:32:08 +0100 Subject: [PATCH 22/22] KX-11751 - Comment added to env variable DOTNET_ROLL_FORWARD --- .azuredevops/pipelines/build-and-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azuredevops/pipelines/build-and-release.yaml b/.azuredevops/pipelines/build-and-release.yaml index 505a5a2..3b39edb 100644 --- a/.azuredevops/pipelines/build-and-release.yaml +++ b/.azuredevops/pipelines/build-and-release.yaml @@ -97,6 +97,7 @@ stages: arguments: --no-restore env: AuthenticodeClientSecret: $(AuthenticodeClientSecret) + # Roll-forward behavior set for AzureSignTool dotnet tool (see .config\dotnet-tools.json) which requires .Net 6.0 runtime DOTNET_ROLL_FORWARD: Major - task: DotNetCoreCLI@2