diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d49861d..c59900d 100644 --- 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 index a7e20bb..89621ec 100644 --- 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 to update a single package, or leave blank to check for updates." + } ] } \ No newline at end of file diff --git a/Source/Pablo/Pablo.csproj b/Source/Pablo/Pablo.csproj index c752d68..bbf135b 100644 --- a/Source/Pablo/Pablo.csproj +++ b/Source/Pablo/Pablo.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj b/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj index 3d3de08..ebd6aaa 100644 --- a/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj +++ b/Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj @@ -8,7 +8,7 @@ 3.10 38a42f6d-a417-45b0-8ec8-a700f31cbe26 2.0 - PabloDraw + PabloDraw-Windows-x64 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Source/PabloDraw/PabloDraw.csproj b/Source/PabloDraw/PabloDraw.csproj index fd4537b..a9e33a2 100644 --- a/Source/PabloDraw/PabloDraw.csproj +++ b/Source/PabloDraw/PabloDraw.csproj @@ -41,6 +41,9 @@ True Link True + PabloDraw-Mac + PabloDraw + $(PublishDir) @@ -73,7 +76,7 @@ - + @@ -100,5 +103,9 @@ + + + + \ No newline at end of file diff --git a/dotnet-tools.json b/dotnet-tools.json new file mode 100644 index 0000000..8b180fd --- /dev/null +++ b/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-outdated-tool": { + "version": "4.1.0", + "commands": [ + "dotnet-outdated" + ] + } + } +} \ No newline at end of file