diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 33d2a5382..772adf7d2 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,4 +1,6 @@  + + net7.0 false @@ -43,14 +45,14 @@ - - - + + + - + diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 6ccd74e0d..fcb97b0c5 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,4 +1,6 @@  + + net7.0 false diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj index 21c5abd88..cb282136f 100644 --- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj +++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj @@ -1,4 +1,6 @@ + + WinExe net7.0 @@ -16,11 +18,11 @@ - - + + - - + + diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index 9e2fc0938..57649624f 100644 --- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj +++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj @@ -1,4 +1,6 @@  + + WinExe net7.0 @@ -15,11 +17,11 @@ - - + + - - + + diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 3b69f3087..15b723fd5 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -1,4 +1,6 @@  + + Library net7.0 @@ -10,18 +12,18 @@ - + - - - + + + - + - - + + diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs index eb8ab30a4..742e64458 100644 --- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs +++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs @@ -225,7 +225,7 @@ public class DataModelPickerButton : TemplatedControl private void PathValidationChanged(object? sender, EventArgs e) { - Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.DataBind); + Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.Background); } private void UpdateValueDisplay() diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs index 2b16bb769..6908fadd3 100644 --- a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs +++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs @@ -197,9 +197,12 @@ public class DeviceVisualizer : Control private void DevicePropertyChanged(object? sender, PropertyChangedEventArgs e) { - if (Device != null) - BitmapCache.Remove(Device); - Dispatcher.UIThread.Invoke(SetupForDevice, DispatcherPriority.Background); + Dispatcher.UIThread.Invoke(async () => + { + if (Device != null) + BitmapCache.Remove(Device); + await SetupForDevice(); + }, DispatcherPriority.Background); } private void DeviceUpdated(object? sender, EventArgs e) diff --git a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs index de2964464..67ed37900 100644 --- a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs +++ b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs @@ -1,11 +1,12 @@ using System; +using Avalonia; using Avalonia.Controls; using Avalonia.Input; using Avalonia.Styling; namespace Artemis.UI.Shared; -internal class NoInputTextBox : TextBox, IStyleable +internal class NoInputTextBox : TextBox { /// protected override void OnKeyDown(KeyEventArgs e) @@ -19,5 +20,6 @@ internal class NoInputTextBox : TextBox, IStyleable // Don't call the base method on purpose } - Type IStyleable.StyleKey => typeof(TextBox); + /// + protected override Type StyleKeyOverride => typeof(TextBox); } \ No newline at end of file diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 0110ec37e..bd7210217 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -1,4 +1,6 @@ + + WinExe net7.0-windows10.0.17763.0 @@ -21,18 +23,18 @@ - - + + - - - + + + - + diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs index 37a113fc2..f9fc5e1f6 100644 --- a/src/Artemis.UI.Windows/Program.cs +++ b/src/Artemis.UI.Windows/Program.cs @@ -36,11 +36,6 @@ internal class Program return AppBuilder.Configure() .UsePlatformDetect() .LogToTrace() - .With(new Win32PlatformOptions - { - UseWindowsUIComposition = true, - CompositionBackdropCornerRadius = 8f - }) .UseReactiveUI(); } diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index ecd1c4c9f..4e71ac252 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,4 +1,6 @@ + + Library net7.0 @@ -16,28 +18,26 @@ - - - + + + - - - + + + - + - - + - - - + + + - diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs index 87e7b3b2e..3fb88d5c5 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs @@ -63,12 +63,7 @@ public partial class VisualEditorView : ReactiveUserControl + net7.0 @@ -8,14 +9,14 @@ - - - + + + - + diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index 0b6943ddc..515d3bb6c 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -1,4 +1,5 @@ + net7.0 diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index 653d780a8..1ba5f26ae 100644 --- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj +++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj @@ -1,5 +1,6 @@ - + + net7.0 enable diff --git a/src/Artemis.props b/src/Artemis.props new file mode 100644 index 000000000..121967a89 --- /dev/null +++ b/src/Artemis.props @@ -0,0 +1,8 @@ + + + 11.0.0 + 2.0.0 + 2.0.0-prerelease.83 + 2.88.3 + + \ No newline at end of file diff --git a/src/Artemis.sln b/src/Artemis.sln index 8c5b6ee51..7f25476e6 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 @@ -23,6 +23,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.WebClient.Updating" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.WebClient.Workshop", "Artemis.WebClient.Workshop\Artemis.WebClient.Workshop.csproj", "{2B982C2E-3CBC-4DAB-9167-CCCA4C78E92B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{44482312-142F-44A4-992C-0AF0F26BAE54}" + ProjectSection(SolutionItems) = preProject + Artemis.props = Artemis.props + Artemis.sln.DotSettings = Artemis.sln.DotSettings + Artemis.sln.DotSettings.user = Artemis.sln.DotSettings.user + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64