Merge branch 'v9/dev' into v9/feature/language-keys-cleanup

src/Umbraco.Web.UI/Startup.cs

@@ -15,10 +15,10 @@ namespace Umbraco.Cms.Web.UI
         private readonly IConfiguration _config;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Startup"/> class.
+        /// Initializes a new instance of the <see cref="Startup" /> class.
         /// </summary>
-        /// <param name="webHostEnvironment">The Web Host Environment</param>
-        /// <param name="config">The Configuration</param>
+        /// <param name="webHostEnvironment">The web hosting environment.</param>
+        /// <param name="config">The configuration.</param>
         /// <remarks>
         /// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337
         /// </remarks>
@@ -28,11 +28,10 @@ namespace Umbraco.Cms.Web.UI
             _config = config ?? throw new ArgumentNullException(nameof(config));
         }
 
-
-
         /// <summary>
-        /// Configures the services
+        /// Configures the services.
         /// </summary>
+        /// <param name="services">The services.</param>
         /// <remarks>
         /// This method gets called by the runtime. Use this method to add services to the container.
         /// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
@@ -50,8 +49,10 @@ namespace Umbraco.Cms.Web.UI
         }
 
         /// <summary>
-        /// Configures the application
+        /// Configures the application.
         /// </summary>
+        /// <param name="app">The application builder.</param>
+        /// <param name="env">The web hosting environment.</param>
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
@@ -59,6 +60,10 @@ namespace Umbraco.Cms.Web.UI
                 app.UseDeveloperExceptionPage();
             }
 
+#if (UseHttpsRedirect)
+            app.UseHttpsRedirection();
+
+#endif
             app.UseUmbraco()
                 .WithMiddleware(u =>
                 {

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -66,12 +66,12 @@
   <!-- We don't want to include the generated files, they will throw a lot of errors -->
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.10" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Umbraco.Code" Version="1.1.1">
+    <PackageReference Include="Umbraco.Code" Version="1.2.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>