Setup UmbPack.

Author: AndyButland

.gitignore

@@ -395,4 +395,5 @@ src/Umbraco.Forms.Integrations.TestSite/css
 src/Umbraco.Forms.Integrations.TestSite/Media
 src/Umbraco.Forms.Integrations.TestSite/scripts
 src/Umbraco.Forms.Integrations.TestSite/Umbraco
-src/Umbraco.Forms.Integrations.TestSite/Views
+src/Umbraco.Forms.Integrations.TestSite/Views
+*.zip

azure-pipeline - Crm.Hubspot.yml

@@ -44,19 +44,19 @@ steps:
     configuration: '$(buildConfiguration)'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Create NuGet and Zip'
+  displayName: 'Create NuGet Package'
   inputs:
     command: 'pack'
     arguments: '--configuration $(buildConfiguration)'
     packagesToPack: '$(project)'
     versioningScheme: 'off'
 
-- task: CopyFiles@2
-  displayName: 'Copy Zip Artifact To Staging'
+- task: CmdLine@2
+  displayName: 'Create Umbraco Package'
   inputs:
-    SourceFolder: '$(Build.SourcesDirectory)\src\$(projectName)\bin\$(buildConfiguration)\'
-    Contents: '$(projectName).*.zip'
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    script: |
+      dotnet tool install --global Umbraco.Tools.Packages
+      umbpack pack src/$(projectName)/package.xml -o $(Build.ArtifactStagingDirectory)
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Build Artifacts'

src/Umbraco.Forms.Integrations.Crm.Hubspot/Umbraco.Forms.Integrations.Crm.Hubspot.csproj

@@ -17,9 +17,6 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Umbraco.Packaging" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="UmbracoCms.Web" Version="8.1.0" />
     <PackageReference Include="UmbracoForms.Core" Version="8.7.4" />
   </ItemGroup>
@@ -42,49 +39,4 @@
     <Exec Command="xcopy /E /Y /I &quot;$(ProjectDir)App_Plugins\UmbracoForms.Integrations\Crm\Hubspot&quot; &quot;$(SolutionDir)\Umbraco.Forms.Integrations.TestSite\App_Plugins\UmbracoForms.Integrations\Crm\Hubspot&quot;&#xD;&#xA;EXIT 0" />
   </Target>
 
-  <!--
-  Create Umbraco package zip along with NuGet when dotnet pack is called.
-  See and hat-tip:
-   - https://24days.in/umbraco-cms/2019/umbraco-packages-2019/packaging/
-   - https://github.com/callumbwhyte/msbuild-umbraco-packaging
-  -->
-  <UsingTask AssemblyFile="$(TargetDir)\MSBuild.Umbraco.Packaging.dll" TaskName="MSBuild.Umbraco.Packaging.GatherAssemblies" />
-
-  <Target Name="UmbracoGatherFiles">
-    <GatherAssemblies Dependencies="@(ReferenceCopyLocalPaths)"
-              PackageRefs="@(PackageReference);@(ProjectReference)">
-      <Output TaskParameter="Assemblies" ItemName="PackageAssemblies" />
-    </GatherAssemblies>
-
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(TempFolder)\bin\" />
-    <Copy SourceFiles="@(PackageAssemblies)" DestinationFolder="$(TempFolder)\bin\" />
-
-    <Copy SourceFiles="@(Content)" DestinationFiles="$(TempFolder)%(RelativeDir)%(Filename)%(Extension)" />
-  </Target>
-
-  <UsingTask AssemblyFile="$(TargetDir)\MSBuild.Umbraco.Packaging.dll" TaskName="MSBuild.Umbraco.Packaging.GenerateManifest" />
-
-  <Target Name="UmbracoPackage" AfterTargets="Pack" DependsOnTargets="UmbracoClean;UmbracoGatherFiles">
-    <GenerateManifest TargetDirectory="$(TempFolder)"
-              Name="$(Product)"
-              Description="$(Description)"
-              Version="$(Version)"
-              UmbracoVersion="$(UmbracoVersion)"
-              Author="$(Authors)"
-              AuthorUrl="$(AuthorUrl)"
-              ProjectUrl="$(PackageProjectUrl)"
-              IconUrl="$(PackageIconUrl)"
-              LicenseUrl="$(PackageLicenseUrl)" />
-  </Target>
-
-  <Target Name="UmbracoPackage" AfterTargets="Pack" DependsOnTargets="UmbracoClean;UmbracoGatherFiles">
-    <ZipDirectory SourceDirectory="$(TempFolder)"
-            DestinationFile="$(DestFolder)\$(Product).$(Version).zip"
-            Overwrite="true" />
-  </Target>
-
-  <Target Name="UmbracoClean" AfterTargets="Clean">
-    <RemoveDir Directories="$(TempFolder)" />
-  </Target>
-
 </Project>

src/Umbraco.Forms.Integrations.Crm.Hubspot/package.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<umbPackage>
+  <info>
+    <package>
+      <name>Umbraco.Forms.Integrations.Crm.Hubspot</name>
+      <version>1.0.0</version>
+      <iconUrl></iconUrl>
+      <licence url="https://opensource.org/licenses/MIT">MIT</licence>
+      <url>https://github.com/umbraco/Umbraco.Forms.Integrations</url>
+      <requirements type="strict">
+        <major>8</major>
+        <minor>1</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Umbraco HQ</name>
+      <website>https://github.com/umbraco/Umbraco.Forms.Integrations</website>
+    </author>
+    <contributors>
+      <contributor>Warren Buckley</contributor>
+      <contributor>Andy Butland</contributor>
+    </contributors>
+    <readme><![CDATA[An extension for Umbraco Forms to add support for submitting data to Hubspot]]></readme>
+  </info>
+  <files>
+    <folder path="App_Plugins/UmbracoForms.Integrations/Crm/Hubspot" orgPath="App_Plugins/UmbracoForms.Integrations/Crm/Hubspot" />
+    <file path="bin/release/net472/Umbraco.Forms.Integrations.Crm.Hubspot.dll" orgPath="bin/Umbraco.Forms.Integrations.Crm.Hubspot.dll" />
+  </files>
+</umbPackage>