Merge pull request #402 from warrenbuckley/upgrade-umbraco-10

Upgrade to Umbraco 10.0.1
Shazwazza · Jul 22, 2022 · 8a0919c · 8a0919c
2 parents acd88c9 + f04b86c
commit 8a0919c
Show file tree

Hide file tree

Showing 10 changed files with 3,904 additions and 26 deletions.
diff --git a/src/Articulate.Tests.Website/Articulate.Tests.Website.csproj b/src/Articulate.Tests.Website/Articulate.Tests.Website.csproj
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms" Version="9.0.0" />
-    <PackageReference Include="Umbraco.Cms.Core" Version="9.0.0" />
-    <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0" />
-    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="Umbraco.Cms" Version="10.0.1" />
   </ItemGroup>
 
   <Import Project="..\Articulate\build\Articulate.targets" />

diff --git a/src/Articulate.Tests.Website/Program.cs b/src/Articulate.Tests.Website/Program.cs
@@ -14,14 +14,11 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-#if DEBUG
-                .ConfigureAppConfiguration(config
-                    => config.AddJsonFile(
-                            "appsettings.Local.json",
-                            optional: true,
-                            reloadOnChange: true))
-#endif
-                .ConfigureLogging(x => x.ClearProviders())
-                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
+                .ConfigureUmbracoDefaults()
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStaticWebAssets();
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }