Merge branch 'main' into develop

Author: ronaldbarendse

Directory.Build.props

@@ -28,8 +28,9 @@
   <!-- Package Validation -->
   <PropertyGroup>
     <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
-    <!--<EnablePackageValidation>true</EnablePackageValidation>-->
-    <PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
+    <!-- TODO (V14): Re-enable when 14 is released. -->
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <PackageValidationBaselineVersion>14.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
   </PropertyGroup>

Directory.Packages.props

@@ -9,12 +9,12 @@
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <PropertyGroup>
-    <UmbracoCmsPackageVersion>[14.0.0-rc2, 15)</UmbracoCmsPackageVersion>
+    <UmbracoCmsPackageVersion>[14.0.0, 15)</UmbracoCmsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
     <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.2" />
     <PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="$(UmbracoCmsPackageVersion)" />
     <PackageVersion Include="Umbraco.Cms.Web.Common" Version="$(UmbracoCmsPackageVersion)" />
   </ItemGroup>
-</Project>
+</Project>

examples/Umbraco.StorageProviders.AzureBlob.TestSite/Program.cs

@@ -1,5 +1,9 @@
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
+#if DEBUG
+builder.Configuration.AddJsonFile("appsettings.Local.json", optional: true, reloadOnChange: true);
+#endif
+
 builder.CreateUmbracoBuilder()
     .AddBackOffice()
     .AddWebsite()
@@ -11,6 +15,8 @@
 
 await app.BootUmbracoAsync();
 
+app.UseHttpsRedirection();
+
 app.UseUmbraco()
     .WithMiddleware(u =>
     {

examples/Umbraco.StorageProviders.AzureBlob.TestSite/Umbraco.StorageProviders.AzureBlob.TestSite.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms" Version="14.0.0-rc2" />
+    <PackageReference Include="Umbraco.Cms" Version="14.0.0" />
     <!--<PackageReference Include="Umbraco.TheStarterKit" Version="13.0.0" />-->
   </ItemGroup>
 

examples/Umbraco.StorageProviders.AzureBlob.TestSite/appsettings.json

@@ -41,7 +41,7 @@
       "AzureBlob": {
         "Media": {
           "ConnectionString": "UseDevelopmentStorage=true",
-          "ContainerName": "umbraco-storageproviders-13"
+          "ContainerName": "umbraco-storageproviders-14"
         }
       }
     }