Push WiX v4 .nupkgs to GitHub Packages

2 files changed, 15 insertions, 7 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2eeedec8..7a9aa795 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,14 +48,18 @@ jobs:
           name: artifacts
           path: build/artifacts/
 
-      - name: Zip temp logs
+      - name: Collect integration test logs
+        if: always()
         shell: cmd
         run: 7z a "build\logs\test_burn_%GITHUB_RUN_ID%.zip" "%TEMP%\*.log" "%TEMP%\..\*.log"
-        if: always()
 
       - name: Save logs
-        uses: actions/upload-artifact@v2
         if: always()
+        uses: actions/upload-artifact@v2
         with:
           name: logs_${{ github.run_id }}
           path: build/logs/
+
+      - name: Push to GitHub Packages
+        if: ${{ github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') }}
+        run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 11ebc2e0..969bbcc1 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -38,6 +38,13 @@
       <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion>
       <!-- We already included the $(GitSha) in the informational version so do not include it again.  -->
       <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+
+      <RepositoryUrl Condition=" '$(RepositoryUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</RepositoryUrl>
+      <RepositoryType Condition=" '$(RepositoryType)'=='' ">git</RepositoryType>
+      <RepositoryCommit Condition=" '$(RepositoryCommit)'=='' ">$(GitSha)</RepositoryCommit>
+      <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
     </PropertyGroup>
 
     <Message Importance="$(GitInfoReportImportance)" Text="Properties from Git:
@@ -60,17 +67,14 @@
   <Target Name="__SetNuspecProperties" DependsOnTargets="__SetPropertiesFromGit"
           Condition=" Exists('$(MSBuildProjectName).nuspec') ">
     <PropertyGroup>
-      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</ProjectUrl>
-
       <NuspecFile Condition=" '$(NuspecFile)'=='' ">$(MSBuildProjectName).nuspec</NuspecFile>
       <PackageId Condition=" '$(PackageId)'=='' ">$(MSBuildProjectName)</PackageId>
       <Title Condition=" '$(Title)'=='' ">$(Description)</Title>
       <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)</NuspecBasePath>
       <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);RepositoryType=git;RepositoryCommit=$(GitSha);RepositoryUrl=$(GitRepositoryUrl)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties>
-      <PublishRepositoryUrl>true</PublishRepositoryUrl>
       <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>