Added UmbPack.

Author: AndyButland

azure-pipeline - Commerce.CommerceTools.yml

@@ -31,19 +31,21 @@ 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
+      cd src/$(projectName)/
+      umbpack pack .\package.xml -o $(Build.ArtifactStagingDirectory)
+      cd ../../
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Build Artifacts'

src/Umbraco.Cms.Integrations.Commerce.CommerceTools/Umbraco.Cms.Integrations.Commerce.CommerceTools.csproj

@@ -16,9 +16,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Umbraco.Packaging" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="UmbracoCms.Web" version="8.5.4" />
   </ItemGroup>
 
@@ -29,37 +26,4 @@
     </Content>
   </ItemGroup>
 
-  <!--
-  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.Cms.Integrations.Commerce.CommerceTools/package.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<umbPackage>
+  <info>
+    <package>
+      <name>Umbraco.Cms.Integrations.Commerce.CommerceTools</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>1</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Umbraco HQ</name>
+      <website>https://github.com/umbraco/Umbraco.Cms.Integrations</website>
+    </author>
+    <contributors>
+      <contributor>Søren Kottal</contributor>
+      <contributor>Andy Butland</contributor>
+    </contributors>
+    <readme><![CDATA[An extension for Umbraco CMS providing product and category pickers for CommerceTools.]]></readme>
+  </info>
+  <files>
+    <folder path="App_Plugins/UmbracoCms.Integrations/Commerce/CommerceTools" orgPath="App_Plugins/UmbracoCms.Integrations/Commerce/CommerceTools" />
+    <file path="bin/release/net472/Umbraco.Cms.Integrations.Commerce.CommerceTools.dll" orgPath="bin/Umbraco.Cms.Integrations.Commerce.CommerceTools.dll" />
+  </files>
+</umbPackage>