Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Hylke Bons
171b18edd2
Merge pull request #1873 from markusstoll/fix-2.0.1
Fix version check on macOS Mojave
2018-09-29 20:39:51 +01:00
Markus Stoll
7abb6efa2a Fix startup with osx 10.14 / Mojave 2018-09-29 20:37:21 +02:00
Markus Stoll
a6daf0d925 Fix compiling 2018-09-29 20:37:07 +02:00
2 changed files with 5 additions and 12 deletions

View file

@ -157,17 +157,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
<ImageAsset Include="Assets.xcassets\Contents.json" />
</ItemGroup>
<ItemGroup>

View file

@ -71,7 +71,10 @@ namespace Sparkles {
// Parse the version number between the periods (e.g. "10.12.1" -> 12)
output = output.Substring (output.IndexOf (".") + 1);
output = output.Substring (0, output.LastIndexOf ("."));
if(output.IndexOf(".") >= 0)
{
output = output.Substring (0, output.LastIndexOf ("."));
}
string release = "Unreleased Version";
@ -83,6 +86,7 @@ namespace Sparkles {
case 11: release = "El Capitan"; break;
case 12: release = "Sierra"; break;
case 13: release = "High Sierra"; break;
case 14: release = "Mojave"; break;
}
return string.Format ("macOS {0} ({1})", version, release);