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 a38c1b34c..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 72a221df4..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 824cd9624..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.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 1b839e4bf..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/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index e6294906e..02127d187 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,4 +1,6 @@ + + Library net7.0 @@ -15,28 +17,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 { try { - // Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel)); + Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel)); } catch (Exception) { diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs index 73b747355..797cad4d5 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs @@ -48,11 +48,6 @@ public partial class SurfaceEditorView : 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 c31da3c25..056aa9531 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.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 2e53b5d9a..1e74be560 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -21,6 +21,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.VisualScripting", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.WebClient.Updating", "Artemis.WebClient.Updating\Artemis.WebClient.Updating.csproj", "{7C8C6F50-0CC8-45B3-B608-A7218C005E4B}" 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