Merge pull request #59 from cwensley/build-output-updates

Add suffix to each platform output so it is clear which to use
cwensley · Sep 17, 2022 · 6e0b561 · 6e0b561
2 parents e7fcb88 + a48d13c
commit 6e0b561
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,12 +64,12 @@ jobs:
         run: dotnet publish Source/PabloDraw/PabloDraw.csproj ${{ env.BuildParameters }} /bl:artifacts/log/pablodraw-linux.binlog
 
       - name: Create gzip
-        run: tar -czvf pablodraw.tar.gz -C artifacts/publish/${{ env.BuildConfiguration }}/Linux .
+        run: tar -czvf pablodraw-linux-x64.tar.gz -C artifacts/publish/${{ env.BuildConfiguration }}/Linux .
 
       - uses: actions/upload-artifact@v2
         with:
           name: pablodraw-linux-binaries-x64
-          path: pablodraw.tar.gz
+          path: pablodraw-linux-x64.tar.gz
 
       - name: Upload log files
         if: ${{ failure() }}
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: pablodraw-mac
-          path: artifacts/bin/PabloDraw/${{ env.BuildConfiguration }}/net6.0/PabloDraw.dmg
+          path: artifacts/publish/${{ env.BuildConfiguration }}/Mac/*.dmg
 
       - name: Upload log files
         if: ${{ failure() }}

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -106,7 +106,18 @@
                 "clear": true
             },
             "problemMatcher": "$msCompile"
-        }
+        },
+		{
+			"label": "check-outdated-dependencies",
+			"type": "shell",
+			"command": "dotnet tool restore && dotnet outdated \"${workspaceFolder}/Source/Pablo Desktop.sln\" ${input:outdated}",
+			"problemMatcher": [],
+			"presentation": {
+				"clear": true,
+				"focus": true
+			}
+		}
+
     ],
     "inputs": [
         {
@@ -117,6 +128,11 @@
                 "command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[16,18)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe",
                 "useFirstResult": "true"
             }
-        }        
+        },
+		{
+			"type": "promptString",
+			"id": "outdated",
+			"description": "Options for dotnet outdated. --help to see options, -u -inc <MyPackage> to update a single package, or leave blank to check for updates."
+		}
     ]
 }
diff --git a/Source/Pablo/Pablo.csproj b/Source/Pablo/Pablo.csproj
@@ -24,8 +24,8 @@
     <ProjectReference Include="$(EtoBasePath)src\Eto\Eto.csproj" Condition="$(EtoBasePath) != ''" />
     <PackageReference Include="Eto.Forms" Version="2.7.1" Condition="$(EtoBasePath) == ''" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="sharpcompress" Version="0.30.1" />
-    <PackageReference Include="Mono.Nat" Version="3.0.2" />
+    <PackageReference Include="sharpcompress" Version="0.32.2" />
+    <PackageReference Include="Mono.Nat" Version="3.0.3" />
     <PackageReference Include="Lidgren.Network" Version="1.0.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>

diff --git a/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj b/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj
@@ -8,7 +8,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>38a42f6d-a417-45b0-8ec8-a700f31cbe26</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>PabloDraw</OutputName>
+    <OutputName>PabloDraw-Windows-x64</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

diff --git a/Source/PabloDraw/PabloDraw.csproj b/Source/PabloDraw/PabloDraw.csproj
@@ -41,6 +41,9 @@
     <EnableDmgBuild>True</EnableDmgBuild>
     <TrimMode>Link</TrimMode>
     <PublishTrimmed>True</PublishTrimmed>
+    <DmgName>PabloDraw-Mac</DmgName>
+    <DmgVolumeName>PabloDraw</DmgVolumeName>
+    <DmgOutputPath>$(PublishDir)</DmgOutputPath> <!-- Eto will use this by default if specified in 2.7.2 -->
   </PropertyGroup>
 
   <PropertyGroup>
@@ -73,7 +76,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Nat" Version="3.0.2" />
+    <PackageReference Include="Mono.Nat" Version="3.0.3" />
     <PackageReference Include="Lidgren.Network" Version="1.0.2" />
   </ItemGroup>
 
@@ -100,5 +103,9 @@
 
   <Import Project="$(EtoBasePath)\build\Common.Mac.targets" Condition="$(BuildTarget) == 'Mac' and $(EtoBasePath) != ''" />
 
+  <Target Name="_CreateDmgOutputPath" BeforeTargets="MacCreateDmg" Condition="$(DmgOutputPath) != ''">
+    <!-- Should go into Eto 2.7.2 -->
+    <MakeDir Directories="$(DmgOutputPath)" />
+  </Target>
 
 </Project>
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-outdated-tool": {
+      "version": "4.1.0",
+      "commands": [
+        "dotnet-outdated"
+      ]
+    }
+  }
+}