Merge branch 'release/12.0.0'

Author: mattbrailsford

Directory.Build.props

@@ -7,7 +7,7 @@
     <Product>Umbraco Commerce Checkout</Product>
     <PackageProjectUrl>https://github.com/umbraco/Umbraco.Commerce.Checkout</PackageProjectUrl>
     <PackageIcon>logo-128.png</PackageIcon>
-    <PackageTags>umbraco commerce checkout</PackageTags>
+    <PackageTags>umbraco commerce checkout umbraco-marketplace</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <NeutralLanguage>en-US</NeutralLanguage>

Directory.Packages.props

@@ -11,7 +11,7 @@
     <GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[12.0.0-rc1, 13)" />
-    <PackageVersion Include="Umbraco.Cms.Web.Website" Version="[12.0.0-rc3, 13)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[12.0.0, 13)" />
+    <PackageVersion Include="Umbraco.Cms.Web.Website" Version="[12.0.0, 13)" />
   </ItemGroup>
 </Project>

src/Umbraco.Commerce.Checkout/Client/src/backoffice/views/dashboards/installer.controller.js

@@ -7,7 +7,7 @@
         var vm = this;
 
         var dialogOptions = {
-            view: '/app_plugins/umbracocommercecheckout/backoffice/views/dialogs/installer.html',
+            view: '/App_Plugins/UmbracoCommerceCheckout/backoffice/views/dialogs/installer.html',
             size: 'small',
             config: { },
             submit: function (model) {

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutGiftCardEmail.cshtml

@@ -5,7 +5,7 @@
 
     // Lookup the umbraco commerce checkout page for the associated orders store
     // so that we can extract relevant settings to configure the email template
-    var ctx = this.GetService<IUmbracoContextAccessor>().GetRequiredUmbracoContext();
+    var ctx = this.GetService<IUmbracoContextFactory>().EnsureUmbracoContext().UmbracoContext;
     var checkoutContentType = ctx.Content.GetContentType("uccCheckoutPage");
     var checkoutPages = ctx.Content.GetByContentType(checkoutContentType);
     var checkoutPage = checkoutPages.First(x => x.GetStore()?.Id == Model.StoreId);

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderConfirmationEmail.cshtml

@@ -23,7 +23,7 @@
 
     // Lookup the umbraco commerce checkout page for the associated orders store
     // so that we can extract relevant settings to configure the email template
-    var ctx = this.GetService<IUmbracoContextAccessor>().GetRequiredUmbracoContext();
+    var ctx = this.GetService<IUmbracoContextFactory>().EnsureUmbracoContext().UmbracoContext;
     var checkoutContentType = ctx.Content.GetContentType("uccCheckoutPage");
     var checkoutPages = ctx.Content.GetByContentType(checkoutContentType);
     var checkoutPage = checkoutPages.First(x => x.GetStore()?.Id == Model.StoreId);

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderErrorEmail.cshtml

@@ -5,7 +5,7 @@
 
     // Lookup the umbraco commerce checkout page for the associated orders store
     // so that we can extract relevant settings to configure the email template
-    var ctx = this.GetService<IUmbracoContextAccessor>().GetRequiredUmbracoContext();
+    var ctx = this.GetService<IUmbracoContextFactory>().EnsureUmbracoContext().UmbracoContext;
     var checkoutContentType = ctx.Content.GetContentType("uccCheckoutPage");
     var checkoutPages = ctx.Content.GetByContentType(checkoutContentType);
     var checkoutPage = checkoutPages.First(x => x.GetStore()?.Id == Model.StoreId);

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "12.0.0-rc1",
+  "version": "12.0.0",
   "assemblyVersion": {
     "precision": "build"
   },