Merge pull request #414 from NikolaMilosavljevic/archive

Create OSX archive during build

Author: marcpopMSFT

.vsts-ci.yml

@@ -156,15 +156,12 @@ extends:
                 codesign -dv --verbose=4 artifacts/layout/dotnet-core-uninstall/dotnet-core-uninstall
               name: VerifySignature
               displayName: Verify Signature
-            - task: ArchiveFiles@2
+            - task: CopyFiles@2
               condition: eq(variables['system.pullrequest.isfork'], false)
               inputs:
-                rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
-                includeRootFolder: false
-                archiveType: 'tar'
-                tarCompression: 'gz'
-                archiveFile: '$(Build.ArtifactStagingDirectory)/artifacts/dotnet-core-uninstall-$(_RID).tar.gz'
-                replaceExistingArchive: true
+                sourceFolder: 'artifacts/layout/'
+                contents: '*.tar.gz'
+                targetFolder: '$(Build.ArtifactStagingDirectory)/artifacts'
             - task: 1ES.PublishBuildArtifacts@1
               condition: eq(variables['system.pullrequest.isfork'], false)
               inputs:

.vsts-pr.yml

@@ -135,15 +135,12 @@ stages:
             --prepareMachine
             /p:RID=$(_RID)
           displayName: Build
-        - task: ArchiveFiles@2
+        - task: CopyFiles@2
           condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
           inputs:
-            rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
-            includeRootFolder: false
-            archiveType: 'tar'
-            tarCompression: 'gz'
-            archiveFile: '$(Build.ArtifactStagingDirectory)/dotnet-core-uninstall.tar.gz'
-            replaceExistingArchive: true
+            sourceFolder: 'artifacts/layout/'
+            contents: '*.tar.gz'
+            targetFolder: '$(Build.ArtifactStagingDirectory)/artifacts'
         - task: PublishBuildArtifacts@1
           condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
           inputs:

eng/Signing.props

@@ -13,6 +13,6 @@
   <ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
     <FileSignInfo Include="dotnet-core-uninstall" CertificateName="MacDeveloperHardenWithNotarization" />
     <FileSignInfo Include="dotnet-core-uninstall.pdb" CertificateName="MacDeveloperHarden" />
-    <ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/*" />
+    <ItemsToSign Include="$(ArtifactsDir)layout/*.tar.gz" />
   </ItemGroup>
 </Project>

src/redist/targets/GenerateLayout.targets

@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <DotnetCoreUninstallOutputDirectory>$(ArtifactsDir)layout\dotnet-core-uninstall\</DotnetCoreUninstallOutputDirectory>
+    <DotnetCoreUninstallTarballPath>$(ArtifactsDir)layout\dotnet-core-uninstall-$(RID).tar.gz</DotnetCoreUninstallTarballPath>
     <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
     <_PublishSingleFileForRid>true</_PublishSingleFileForRid>
     <_PublishSingleFileForRid Condition="'$(RID)' == 'win-x86'">false</_PublishSingleFileForRid>
@@ -27,4 +28,13 @@
       Targets="Publish">
     </MSBuild>
   </Target>
+
+  <Target Name="CrateDotnetCoreUninstallTarball"
+          AfterTargets="AfterBuild"
+          Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
+
+    <Exec Command="tar -czf '$(DotnetCoreUninstallTarballPath)' ."
+          WorkingDirectory="$(DotnetCoreUninstallOutputDirectory)"/>
+
+  </Target>
 </Project>