Apply hotfix 29.3.3

Directory.Packages.props

@@ -6,15 +6,15 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.0" />
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.2.0" />
-    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.2.0" />
-    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.2.0" />
-    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.2.0" />
-    <PackageVersion Include="Kentico.Xperience.Core" Version="29.2.0" />
+    <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.3.3" />
+    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.3.3" />
+    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.3.3" />
+    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.3.3" />
+    <PackageVersion Include="Kentico.Xperience.Core" Version="29.3.3" />
     <PackageVersion Include="Scrutor" Version="4.2.2" />
-    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="7.0.2" />
-    <PackageVersion Include="NSwag.ApiDescription.Client" Version="13.18.2" />
+    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.8" />
+    <PackageVersion Include="NSwag.ApiDescription.Client" Version="14.1.0" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.17.0.82934" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="NUnit" Version="4.1.0" />

examples/DancingGoat-K13Ecommerce/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs

@@ -39,7 +39,7 @@ public class SampleDataGeneratorApplication : OverviewPageBase
         private readonly IInfoProvider<ConsentInfo> consentInfoProvider;
         private readonly IInfoProvider<BizFormInfo> bizFormInfoProvider;
         private readonly IInfoProvider<ContactGroupInfo> contactGroupInfoProvider;
-        private readonly ISettingsKeyInfoProvider settingsKeyInfoProvider;
+        private readonly IInfoProvider<SettingsKeyInfo> settingsKeyInfoProvider;
         private readonly IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider;
 
 
@@ -59,7 +59,7 @@ public SampleDataGeneratorApplication(
             IInfoProvider<ConsentInfo> consentInfoProvider,
             IInfoProvider<BizFormInfo> bizFormInfoProvider,
             IInfoProvider<ContactGroupInfo> contactGroupInfoProvider,
-            ISettingsKeyInfoProvider settingsKeyInfoProvider,
+            IInfoProvider<SettingsKeyInfo> settingsKeyInfoProvider,
             IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider)
         {
             this.formBuilderConfigurationSerializer = formBuilderConfigurationSerializer;
@@ -141,14 +141,14 @@ private OverviewCard GetGdprCard()
                         ButtonColor = ButtonColor.Secondary
                     }
                 },
-                Components = new List<IOverviewCardComponent>()
-                {
+                Components =
+                [
                     new StringContentCardComponent
                     {
                         Content =  @"Generates data and enables demonstration of giving consents, personal data portability, right to access, and right to be forgotten features.
                             Once enabled, the demo functionality cannot be disabled. Use on demo instances only."
                     }
-                }
+                ]
             };
         }
 

examples/DancingGoat-K13Ecommerce/DataProtectionSamples/DancingGoatSamplesModule.cs

@@ -32,10 +32,10 @@ internal class DancingGoatSamplesModule : Module
         private IInfoProvider<ConsentAgreementInfo> consentAgreementInfoProvider;
         private IInfoProvider<BizFormInfo> bizFormInfoProvider;
         private IInfoProvider<AccountContactInfo> accountContactInfoProvider;
-        private ISettingsKeyInfoProvider settingsKeyInfoProvider;
+        private IInfoProvider<SettingsKeyInfo> settingsKeyInfoProvider;
         private IInfoProvider<ActivityInfo> activityInfoProvider;
-        private ICountryInfoProvider countryInfoProvider;
-        private IStateInfoProvider stateInfoProvider;
+        private IInfoProvider<CountryInfo> countryInfoProvider;
+        private IInfoProvider<StateInfo> stateInfoProvider;
         private IInfoProvider<AccountInfo> accountInfoProvider;
 
 
@@ -59,10 +59,10 @@ protected override void OnInit()
             consentAgreementInfoProvider = Service.Resolve<IInfoProvider<ConsentAgreementInfo>>();
             bizFormInfoProvider = Service.Resolve<IInfoProvider<BizFormInfo>>();
             accountContactInfoProvider = Service.Resolve<IInfoProvider<AccountContactInfo>>();
-            settingsKeyInfoProvider = Service.Resolve<ISettingsKeyInfoProvider>();
+            settingsKeyInfoProvider = Service.Resolve<IInfoProvider<SettingsKeyInfo>>();
             activityInfoProvider = Service.Resolve<IInfoProvider<ActivityInfo>>();
-            countryInfoProvider = Service.Resolve<ICountryInfoProvider>();
-            stateInfoProvider = Service.Resolve<IStateInfoProvider>();
+            countryInfoProvider = Service.Resolve<IInfoProvider<CountryInfo>>();
+            stateInfoProvider = Service.Resolve<IInfoProvider<StateInfo>>();
             accountInfoProvider = Service.Resolve<IInfoProvider<AccountInfo>>();
 
             InitializeSamples();

examples/DancingGoat-K13Ecommerce/DataProtectionSamples/PersonalDataCollectors/SampleContactDataCollector.cs

@@ -13,8 +13,8 @@ namespace Samples.DancingGoat
     internal class SampleContactDataCollector : IPersonalDataCollector
     {
         private readonly IInfoProvider<ActivityInfo> activityInfoProvider;
-        private readonly ICountryInfoProvider countryInfoProvider;
-        private readonly IStateInfoProvider stateInfoProvider;
+        private readonly IInfoProvider<CountryInfo> countryInfoProvider;
+        private readonly IInfoProvider<StateInfo> stateInfoProvider;
         private readonly IInfoProvider<ConsentAgreementInfo> consentAgreementInfoProvider;
         private readonly IInfoProvider<AccountContactInfo> accountContactInfoProvider;
         private readonly IInfoProvider<AccountInfo> accountInfoProvider;
@@ -33,8 +33,8 @@ internal class SampleContactDataCollector : IPersonalDataCollector
         /// <param name="bizFormInfoProvider">BizForm info provider.</param>
         public SampleContactDataCollector(
             IInfoProvider<ActivityInfo> activityInfoProvider,
-            ICountryInfoProvider countryInfoProvider,
-            IStateInfoProvider stateInfoProvider,
+            IInfoProvider<CountryInfo> countryInfoProvider,
+            IInfoProvider<StateInfo> stateInfoProvider,
             IInfoProvider<ConsentAgreementInfo> consentAgreementInfoProvider,
             IInfoProvider<AccountContactInfo> accountContactInfoProvider,
             IInfoProvider<AccountInfo> accountInfoProvider,
@@ -58,29 +58,23 @@ public SampleContactDataCollector(
         /// <returns><see cref="PersonalDataCollectorResult"/> containing personal data.</returns>
         public PersonalDataCollectorResult Collect(IEnumerable<BaseInfo> identities, string outputFormat)
         {
-            using (var writer = CreateWriter(outputFormat))
+            using var writer = CreateWriter(outputFormat);
+            var dataCollector = new SampleContactDataCollectorCore(writer, activityInfoProvider, countryInfoProvider, stateInfoProvider, consentAgreementInfoProvider,
+                accountContactInfoProvider, accountInfoProvider, bizFormInfoProvider);
+            return new PersonalDataCollectorResult
             {
-                var dataCollector = new SampleContactDataCollectorCore(writer, activityInfoProvider, countryInfoProvider, stateInfoProvider, consentAgreementInfoProvider,
-                    accountContactInfoProvider, accountInfoProvider, bizFormInfoProvider);
-                return new PersonalDataCollectorResult
-                {
-                    Text = dataCollector.CollectData(identities)
-                };
-            }
+                Text = dataCollector.CollectData(identities)
+            };
         }
 
 
         private IPersonalDataWriter CreateWriter(string outputFormat)
         {
-            switch (outputFormat.ToLowerInvariant())
+            return outputFormat.ToLowerInvariant() switch
             {
-                case PersonalDataFormat.MACHINE_READABLE:
-                    return new XmlPersonalDataWriter();
-
-                case PersonalDataFormat.HUMAN_READABLE:
-                default:
-                    return new HumanReadablePersonalDataWriter();
-            }
+                PersonalDataFormat.MACHINE_READABLE => new XmlPersonalDataWriter(),
+                _ => new HumanReadablePersonalDataWriter(),
+            };
         }
     }
 }