Targeting frameworks updates

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/DynamicsComposer.cs

@@ -1,10 +1,12 @@
 #if NETCOREAPP
+using Microsoft.Extensions.DependencyInjection;
+
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Migrations;
 #else
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 using Umbraco.Core;
@@ -21,6 +23,8 @@ public void Compose(IUmbracoBuilder builder)
             var options = builder.Services.AddOptions<DynamicsSettings>()
                 .Bind(builder.Config.GetSection(Constants.Configuration.Settings));
 
+            builder.AddNotificationHandler<UmbracoApplicationStartingNotification, UmbracoAppStartingHandler>();
+
             builder.Services.AddSingleton<IAuthorizationService, AuthorizationService>();
 
             builder.Services.AddSingleton<DynamicsService>();

src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj

@@ -20,17 +20,11 @@
 		<PackageReference Include="UmbracoCms.Web" version="8.4.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net50' Or '$(TargetFramework)' == 'net60'">
 		<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
 		<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
 	</ItemGroup>
-	
-	<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
-		<PackageReference Include="Umbraco.Cms.Web.Website" version="10.0.1" />
-		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="10.0.1" />
-		<PackageReference Include="Umbraco.Cms.Web.Common" version="10.0.1" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\**\*.*">

src/Umbraco.Cms.Integrations.Crm.Dynamics/build/Umbraco.Cms.Integrations.Crm.Dynamics.targets

@@ -0,0 +1,29 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<DynamicsPropertyEditorFilesPath>
+			$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\**\*.*
+		</DynamicsPropertyEditorFilesPath>
+	</PropertyGroup>
+	<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
+		<ItemGroup>
+			<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" />
+		</ItemGroup>
+		<Message
+			Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files"
+			Importance="high" />
+		<Copy SourceFiles="@(DynamicsPropertyEditorFiles)"
+		      DestinationFiles="@(DynamicsPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\%(RecursiveDir)%(Filename)%(Extension)')"
+		      SkipUnchangedFiles="true" />
+
+	</Target>
+
+	<Target Name="ClearDynamicsPropertyEditorAssets" BeforeTargets="Clean">
+		<ItemGroup>
+			<DynamicsPropertyEditorDir
+				Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms\Crm\Dynamics\" />
+		</ItemGroup>
+		<Message Text="Clear old Dynamics Property Editor data"  Importance="high" />
+		<RemoveDir Directories="@(DynamicsPropertyEditorDir)"  />
+	</Target>
+
+</Project>

src/Umbraco.Cms.Integrations.Crm.Dynamics/package.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<umbPackage>
+  <info>
+    <package>
+      <name>Umbraco.Cms.Integrations.Crm.Dynamics</name>
+      <version>1.0.0</version>
+      <iconUrl></iconUrl>
+      <licence url="https://opensource.org/licenses/MIT">MIT</licence>
+      <url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>
+      <requirements type="strict">
+        <major>8</major>
+        <minor>4</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Umbraco HQ</name>
+      <website>https://github.com/umbraco/Umbraco.Cms.Integrations</website>
+    </author>
+    <contributors>
+      <contributor>Adrian Cojocariu</contributor>
+    </contributors>
+    <readme><![CDATA[An extension for Umbraco CMS providing a form picker and rendering component for Dynamics 365 Marketing.]]></readme>
+  </info>
+  <files>
+    <folder path="App_Plugins/UmbracoCms.Integrations/Crm/Dynamics" orgPath="App_Plugins/UmbracoCms.Integrations/Crm/Dynamics" />
+    <file path="bin/release/net472/Umbraco.Cms.Integrations.Crm.Dynamics.dll" orgPath="bin/Umbraco.Cms.Integrations.Crm.Dynamics.dll" />
+  </files>
+</umbPackage>