Skip to content

Commit a48d13c

Browse files
committed
Add suffix to each platform output so it is clear which to use
- Update to latest sharpcompress and Mono.Nat packages
1 parent e7fcb88 commit a48d13c

File tree

6 files changed

+44
-9
lines changed

6 files changed

+44
-9
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
run: dotnet publish Source/PabloDraw/PabloDraw.csproj ${{ env.BuildParameters }} /bl:artifacts/log/pablodraw-linux.binlog
6565

6666
- name: Create gzip
67-
run: tar -czvf pablodraw.tar.gz -C artifacts/publish/${{ env.BuildConfiguration }}/Linux .
67+
run: tar -czvf pablodraw-linux-x64.tar.gz -C artifacts/publish/${{ env.BuildConfiguration }}/Linux .
6868

6969
- uses: actions/upload-artifact@v2
7070
with:
7171
name: pablodraw-linux-binaries-x64
72-
path: pablodraw.tar.gz
72+
path: pablodraw-linux-x64.tar.gz
7373

7474
- name: Upload log files
7575
if: ${{ failure() }}
@@ -114,7 +114,7 @@ jobs:
114114
- uses: actions/upload-artifact@v2
115115
with:
116116
name: pablodraw-mac
117-
path: artifacts/bin/PabloDraw/${{ env.BuildConfiguration }}/net6.0/PabloDraw.dmg
117+
path: artifacts/publish/${{ env.BuildConfiguration }}/Mac/*.dmg
118118

119119
- name: Upload log files
120120
if: ${{ failure() }}

.vscode/tasks.json

+18-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,18 @@
106106
"clear": true
107107
},
108108
"problemMatcher": "$msCompile"
109-
}
109+
},
110+
{
111+
"label": "check-outdated-dependencies",
112+
"type": "shell",
113+
"command": "dotnet tool restore && dotnet outdated \"${workspaceFolder}/Source/Pablo Desktop.sln\" ${input:outdated}",
114+
"problemMatcher": [],
115+
"presentation": {
116+
"clear": true,
117+
"focus": true
118+
}
119+
}
120+
110121
],
111122
"inputs": [
112123
{
@@ -117,6 +128,11 @@
117128
"command": "\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -version \"[16,18)\" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe",
118129
"useFirstResult": "true"
119130
}
120-
}
131+
},
132+
{
133+
"type": "promptString",
134+
"id": "outdated",
135+
"description": "Options for dotnet outdated. --help to see options, -u -inc <MyPackage> to update a single package, or leave blank to check for updates."
136+
}
121137
]
122138
}

Source/Pablo/Pablo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<ProjectReference Include="$(EtoBasePath)src\Eto\Eto.csproj" Condition="$(EtoBasePath) != ''" />
2525
<PackageReference Include="Eto.Forms" Version="2.7.1" Condition="$(EtoBasePath) == ''" />
2626
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
27-
<PackageReference Include="sharpcompress" Version="0.30.1" />
28-
<PackageReference Include="Mono.Nat" Version="3.0.2" />
27+
<PackageReference Include="sharpcompress" Version="0.32.2" />
28+
<PackageReference Include="Mono.Nat" Version="3.0.3" />
2929
<PackageReference Include="Lidgren.Network" Version="1.0.2" />
3030
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
3131
</ItemGroup>

Source/PabloDraw.WindowsInstaller/PabloDraw.WindowsInstaller.wixproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ProductVersion>3.10</ProductVersion>
99
<ProjectGuid>38a42f6d-a417-45b0-8ec8-a700f31cbe26</ProjectGuid>
1010
<SchemaVersion>2.0</SchemaVersion>
11-
<OutputName>PabloDraw</OutputName>
11+
<OutputName>PabloDraw-Windows-x64</OutputName>
1212
<OutputType>Package</OutputType>
1313
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1414
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

Source/PabloDraw/PabloDraw.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<EnableDmgBuild>True</EnableDmgBuild>
4242
<TrimMode>Link</TrimMode>
4343
<PublishTrimmed>True</PublishTrimmed>
44+
<DmgName>PabloDraw-Mac</DmgName>
45+
<DmgVolumeName>PabloDraw</DmgVolumeName>
46+
<DmgOutputPath>$(PublishDir)</DmgOutputPath> <!-- Eto will use this by default if specified in 2.7.2 -->
4447
</PropertyGroup>
4548

4649
<PropertyGroup>
@@ -73,7 +76,7 @@
7376
</ItemGroup>
7477

7578
<ItemGroup>
76-
<PackageReference Include="Mono.Nat" Version="3.0.2" />
79+
<PackageReference Include="Mono.Nat" Version="3.0.3" />
7780
<PackageReference Include="Lidgren.Network" Version="1.0.2" />
7881
</ItemGroup>
7982

@@ -100,5 +103,9 @@
100103

101104
<Import Project="$(EtoBasePath)\build\Common.Mac.targets" Condition="$(BuildTarget) == 'Mac' and $(EtoBasePath) != ''" />
102105

106+
<Target Name="_CreateDmgOutputPath" BeforeTargets="MacCreateDmg" Condition="$(DmgOutputPath) != ''">
107+
<!-- Should go into Eto 2.7.2 -->
108+
<MakeDir Directories="$(DmgOutputPath)" />
109+
</Target>
103110

104111
</Project>

dotnet-tools.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-outdated-tool": {
6+
"version": "4.1.0",
7+
"commands": [
8+
"dotnet-outdated"
9+
]
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)