Merge branch 'develop'

README.md

@@ -75,6 +75,10 @@ When you only need the source url of the iframe in the embed code you can do the
 
 ## Changelog
 
+### 12.0.0
+
+- Support for Umbraco 12
+
 ### 11.0.0
 
 - Support for Umbraco 11

Utilities/CreateNugetPackages.ps1

@@ -4,11 +4,15 @@ $directoryBuildProps = [xml](Get-Content -Path "$SourceDir\Directory.Build.props
 $version = $directoryBuildProps.Project.PropertyGroup.VersionPrefix;
 Write-Host "Package version: $version";
 
-$dateTime = get-date -Format "yyyyMMddhhmmss"
+$dateTime = get-date -Format "yyyyMMddHHmmss"
 
 Write-Host "Version suffix $dateTime"
 
-dotnet pack $SourceDir\$PackageName.sln -c Debug -o $TestSitesFolder\nuget --version-suffix "$dateTime"
+if (Test-Path -Path  $TestSitesFolder\nuget) {
+    Remove-Item -LiteralPath $TestSitesFolder\nuget -Force -Recurse
+}
+
+dotnet pack $SourceDir\$SolutionName.sln -c Debug -o $TestSitesFolder\nuget --version-suffix "$dateTime"
 
 cd "$TestSitesFolder\$TestProjectName"
 

Utilities/SetupTestSite.ps1

@@ -16,15 +16,15 @@
     Write-Host $CurrentDir
 
     Write-Host "Installing Umbraco templates"
-    dotnet new install Umbraco.Templates
+    dotnet new --install Umbraco.Templates
 
     Write-Host "Creating Umbraco site"
     cd $Destination
     dotnet new umbraco -n $ProjectName --development-database-type SQLite --version $CmsVersion --friendly-name "Test admin" --email "[email protected]" --password "1234567890"
 
     cd "$Destination\$ProjectName"
 
-    dotnet add package Umbraco.TheStarterKit --version $CmsVersion --source https://api.nuget.org/v3/index.json
+    dotnet add package Umbraco.TheStarterKit --version $StarterKitVersion --source https://api.nuget.org/v3/index.json
 
     dotnet build
 
@@ -37,7 +37,7 @@
     $newNode.InnerText = '../Nuget'
     $propertyGroup.Node.AppendChild($newNode)  
     $xml.Save("$Destination\$ProjectName\$ProjectName.csproj")
-
+    
     cd $CurrentDir
 }
 
@@ -47,8 +47,10 @@ $CurrentDir = Split-Path $MyInvocation.MyCommand.Path
 
 Write-Host "Cleaning up existing test site"
 
-if (Test-Path -Path $TestSitesFolder) {
-    Remove-Item -LiteralPath $TestSitesFolder -Force -Recurse
+$TestSitePath = "$TestSitesFolder\$TestProjectName"
+
+if (Test-Path -Path $TestSitePath) {
+    Remove-Item -LiteralPath $TestSitePath -Force -Recurse
 }
 
 New-Item -Path $RootDir -Name $TestSitesFolderName -ItemType "directory"

Utilities/Variables.ps1

@@ -1,7 +1,9 @@
 $RootDir = Split-Path -Path $CurrentDir -Parent
 $TestSitesFolderName = "testsites"
 $TestSitesFolder = "$RootDir\$TestSitesFolderName"
-$TestProjectName = "OEmbedPickerSite"
+$TestProjectName = "V12"
 $PackageName = "Dawoe.OEmbedPickerPropertyEditor"
+$SolutionName = "Dawoe.OEmbedPickerPropertyEditor"
 $SourceDir = "$RootDir\src"
-$UmbracoVersion = "11.0.0"
+$UmbracoVersion = "12.0.0"
+$StarterKitVersion = "11.0.0"

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2022
 
 # Version format
-version: 11.0.0.{build}
+version: 12.0.0.{build}
 
 branches:
   only:

src/Directory.Build.props

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0,12.0.0)" />
-    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[11.0.0,12.0.0)" />
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[12.0.0,13.0.0)" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[12.0.0,13.0.0)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,9 +27,9 @@
       <RepositoryType>git</RepositoryType>
       <Copyright>Copyright &amp;#169; Dave Woestenborghs and contributors.</Copyright>
       <PackageLicenseExpression>MIT</PackageLicenseExpression>
-      <AssemblyVersion>11.0.0</AssemblyVersion>
-      <VersionPrefix>11.0.0</VersionPrefix>
-      <InformationalVersion>11.0.0</InformationalVersion>
+      <AssemblyVersion>12.0.0</AssemblyVersion>
+      <VersionPrefix>12.0.0</VersionPrefix>
+      <InformationalVersion>12.0.0</InformationalVersion>
     </PropertyGroup>
 
 

umbraco-marketplace.json

@@ -31,5 +31,5 @@
   "PackageType": "Package",
   "PackagesByAuthor": [ "Our.Umbraco.MultilanguageTextbox" ],  
   "Tags": [ "embed", "media" ],
-  "Title": "OEmbed Picker Property Editorv"
+  "Title": "OEmbed Picker Property Editor"
 }