Browse Source

whoopsie daisy no auto updates

flabbet 8 months ago
parent
commit
2acda656c7

+ 6 - 6
src/Directory.Build.props

@@ -85,27 +85,27 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
-    <DefineConstants>WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-arm64'">
-    <DefineConstants>WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='linux-x64'">
-    <DefineConstants>LINUX</DefineConstants>
+    <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='linux-arm64'">
-    <DefineConstants>LINUX</DefineConstants>
+    <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='osx-x64'">
-    <DefineConstants>MACOS</DefineConstants>
+    <DefineConstants>$(DefineConstants);MACOS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='osx-arm64'">
-    <DefineConstants>MACOS</DefineConstants>
+    <DefineConstants>$(DefineConstants);MACOS</DefineConstants>
   </PropertyGroup>
   
 </Project>

+ 12 - 0
src/PixiEditor.sln

@@ -164,6 +164,8 @@ Global
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Release|x64.Build.0 = Release|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Steam|x64.ActiveCfg = Release|Any CPU
 		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.Steam|x64.Build.0 = Release|Any CPU
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{80BB2920-3DC0-406C-9E2B-30B08D5CC7A8}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|x64.ActiveCfg = Debug|x64
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|x64.Build.0 = Debug|x64
 		{1F97F972-F9E8-4F35-A8B5-3F71408D2230}.Debug|x64.Deploy.0 = Debug|x64
@@ -194,6 +196,8 @@ Global
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Steam|x64.Build.0 = Release|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{6A9DA760-1E47-414C-B8E8-3B4927F18131}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Debug|x64.ActiveCfg = Debug|x64
 		{510ED47C-2455-4DCE-A561-1074725E1236}.Debug|x64.Build.0 = Debug|x64
 		{510ED47C-2455-4DCE-A561-1074725E1236}.DevRelease|x64.ActiveCfg = DevRelease|x64
@@ -248,6 +252,8 @@ Global
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Steam|x64.Build.0 = Release|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{69DD5830-C682-49FB-B1A5-D2A506EEA06B}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
@@ -260,6 +266,8 @@ Global
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Steam|x64.Build.0 = Release|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{1DC5B4C4-6902-4659-AE7E-17FDA0403DEB}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.Debug|x64.Build.0 = Debug|Any CPU
 		{9BCD0764-9C16-4A2A-B153-C676FEF38887}.DevRelease|x64.ActiveCfg = Debug|Any CPU
@@ -573,6 +581,8 @@ Global
 		{F2E992CA-12E3-49F3-B16F-2CEF5B191493}.Debug|ARM64.Build.0 = Debug|arm64
 		{F2E992CA-12E3-49F3-B16F-2CEF5B191493}.Release|x64.ActiveCfg = Release|x64
 		{F2E992CA-12E3-49F3-B16F-2CEF5B191493}.Release|x64.Build.0 = Release|x64
+		{F2E992CA-12E3-49F3-B16F-2CEF5B191493}.DevRelease|x64.ActiveCfg = DevRelease|x64
+		{F2E992CA-12E3-49F3-B16F-2CEF5B191493}.DevRelease|x64.Build.0 = DevRelease|x64
 		{D72E70F3-BF37-432F-B78B-5B247C873852}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{D72E70F3-BF37-432F-B78B-5B247C873852}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{D72E70F3-BF37-432F-B78B-5B247C873852}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -807,6 +817,8 @@ Global
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|x64.Build.0 = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.DevRelease|x64.Build.0 = Debug|Any CPU
 		{786E1F87-4A10-493E-88BD-3F2461DBFCA0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{786E1F87-4A10-493E-88BD-3F2461DBFCA0}.Debug|x64.Build.0 = Debug|Any CPU
 		{786E1F87-4A10-493E-88BD-3F2461DBFCA0}.Debug|ARM64.ActiveCfg = Debug|Any CPU

+ 3 - 4
src/PixiEditor/ViewModels/SubViewModels/UpdateViewModel.cs

@@ -108,7 +108,7 @@ internal class UpdateViewModel : SubViewModel<ViewModelMain>
         return false;
     }
 
-    private void AskToInstall()
+    private async void AskToInstall()
     {
 #if RELEASE || DEVRELEASE
         if (!PixiEditorSettings.Update.CheckUpdatesOnStartup.Value)
@@ -141,10 +141,9 @@ internal class UpdateViewModel : SubViewModel<ViewModelMain>
         }
 
         ViewModelMain.Current.UpdateSubViewModel.UpdateReadyToInstall = true;
-        var result = ConfirmationDialog.Show("UPDATE_READY", "NEW_UPDATE");
-        result.Wait();
+        var result = await ConfirmationDialog.Show("UPDATE_READY", "NEW_UPDATE");
         
-        if (result.Result != ConfirmationType.Yes)
+        if (result != ConfirmationType.Yes)
         {
             return;
         }

+ 1 - 2
src/PixiEditor/Views/Main/ActionDisplayBar.axaml

@@ -57,8 +57,7 @@
             Orientation="Horizontal">
             <Button
                 IsVisible="{Binding DataContext.UpdateSubViewModel.UpdateReadyToInstall, FallbackValue=False, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-                FontSize="14"
-                Height="20"
+                Background="{DynamicResource ThemeAccentBrush}"
                 Command="{xaml:Command PixiEditor.Restart}" ui:Translator.Key="RESTART" />
             <TextBlock
                 VerticalAlignment="Center"

+ 1 - 0
src/PixiEditor/Views/Windows/Settings/SettingsWindow.axaml

@@ -156,6 +156,7 @@
                                           SelectedValue="{Binding SettingsSubViewModel.Update.UpdateChannelName}"/>
                                 <Image Cursor="Help" Source="/Images/Commands/PixiEditor/Links/OpenDocumentation.png"
                                        VerticalAlignment="Center"
+                                       ToolTip.ShowDelay="0"
                                        IsVisible="{Binding !ShowUpdateTab}"
                                        ui:Translator.TooltipKey="UPDATE_CHANNEL_HELP_TOOLTIP"/>
                                 <!-- ToolTipService.InitialShowDelay="0"-->