Merge branch 'main' into dev

# Conflicts:
#	Directory.Build.props
#	src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCurrencyServiceConnector.cs
#	src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs
#	src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs
#	version.json

Author: mattbrailsford

.gitignore

@@ -60,7 +60,6 @@ BenchmarkDotNet.Artifacts/
 # .NET
 project.lock.json
 project.fragment.lock.json
-artifacts/
 
 # Tye
 .tye/
@@ -479,3 +478,4 @@ $RECYCLE.BIN/
 ##
 ## Umbraco Commerce specific
 ##
+.idea

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Company>Umbraco HQ</Company>
     <Authors>Umbraco</Authors>
     <Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
@@ -33,7 +33,7 @@
   <!-- Package validation -->
   <PropertyGroup>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>14.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
   </PropertyGroup>

Directory.Packages.props

@@ -5,13 +5,12 @@
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
-    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
-    <GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
+    <GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
+    <GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[12.0.0, 13)" />
-    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[12.0.0, 13)" />
-    <PackageVersion Include="Umbraco.Deploy.Contrib" Version="[12.0.0, 13)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[14.0.0, 15)" />
+    <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[14.1.0, 15)" />
   </ItemGroup>
 </Project>

NuGet.config

@@ -5,16 +5,4 @@
     <add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
     <add key="Umbraco Nightly" value="https://www.myget.org/F/umbraconightly/api/v3/index.json" />
   </packageSources>
-  <packageSourceMapping>
-    <packageSource key="nuget.org">
-      <package pattern="Umbraco.*" />
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="Umbraco Prereleases">
-      <package pattern="Umbraco.*" />
-    </packageSource>
-    <packageSource key="Umbraco Nightly">
-      <package pattern="Umbraco.*" />
-    </packageSource>
-  </packageSourceMapping>
 </configuration>

assets/logo-128.png

@@ -7,6 +7,7 @@ trigger:
       - release/*
       - hotfix/*
       - support/*
+      - feature/*
   tags:
     include:
       - release-*

assets/logo-320.png

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100-rc.2.23502.2",
     "rollForward": "latestFeature"
   }
 }

assets/logo-64.png

@@ -4,6 +4,6 @@ namespace Umbraco.Commerce.Deploy.Artifacts
 {
     public class AllowedCountryRegionArtifact : AllowedCountryArtifact
     {
-        public GuidUdi RegionUdi { get; set; }
+        public GuidUdi? RegionUdi { get; set; }
     }
 }