Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge hotfix/7.0.3 into master #959

Merged
merged 6 commits into from
Dec 17, 2024
Merged

Merge hotfix/7.0.3 into master #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97735cb
reduce usage of Catel.IO.Path.GetApplicationDataDirectory()
mkhomutov Dec 16, 2024
3f27141
remove net6.0
mkhomutov Dec 16, 2024
dd3e684
update Orc.Controls
mkhomutov Dec 16, 2024
1cb635d
fix build error
mkhomutov Dec 16, 2024
c23d2da
use ResolveRequiredType for IAppDataService
mkhomutov Dec 17, 2024
c03b461
update stable cotfixed components
mkhomutov Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Orchestra.Core/Behaviors/RememberWindowSize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
{
using System;
using System.Windows;
using Catel.IoC;
using Catel.Logging;
using Catel.Services;
using Catel.Windows.Interactivity;
using Orc.Controls;

Expand Down Expand Up @@ -44,7 +46,8 @@ protected override void OnAssociatedObjectLoaded()
window.SetCurrentValue(Window.ResizeModeProperty, ResizeMode.CanResize);
}

window.LoadWindowSize(RememberWindowState);
var appDataService = ServiceLocator.Default.ResolveRequiredType<IAppDataService>();
appDataService.LoadWindowSize(window, RememberWindowState);

switch (window.WindowStartupLocation)
{
Expand Down Expand Up @@ -77,7 +80,9 @@ protected override void OnAssociatedObjectUnloaded()

private void OnWindowClosed(object? sender, EventArgs e)
{
AssociatedObject.SaveWindowSize();
var window = AssociatedObject;
var appDataService = ServiceLocator.Default.ResolveRequiredType<IAppDataService>();
appDataService.SaveWindowSize(window);
}
}
}
6 changes: 3 additions & 3 deletions src/Orchestra.Core/Orchestra.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<AssemblyName>Orchestra.Core</AssemblyName>
<RootNamespace>Orchestra</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
Expand Down Expand Up @@ -35,9 +35,9 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
<PackageReference Include="Orc.Automation" Version="5.0.5" />
<PackageReference Include="Orc.Controls" Version="5.0.7" />
<PackageReference Include="Orc.Controls" Version="5.1.1" />
<PackageReference Include="Orc.SystemInfo" Version="5.0.1" />
<PackageReference Include="Orc.Theming" Version="5.1.1" />
<PackageReference Include="Orc.Theming" Version="5.1.2" />
</ItemGroup>

<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.nullable.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.nullable.props')" />
Expand Down
2 changes: 1 addition & 1 deletion src/Orchestra.Shell.MahApps/Orchestra.Shell.MahApps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<AssemblyName>Orchestra.Shell.MahApps</AssemblyName>
<RootNamespace>Orchestra</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
Expand Down
2 changes: 1 addition & 1 deletion src/Orchestra.Shell.Ribbon.Fluent/Orchestra.Shell.Ribbon.Fluent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<AssemblyName>Orchestra.Shell.Ribbon.Fluent</AssemblyName>
<RootNamespace>Orchestra</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
Expand Down
2 changes: 1 addition & 1 deletion src/Orchestra.Shell.TaskRunner/Orchestra.Shell.TaskRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<AssemblyName>Orchestra.Shell.TaskRunner</AssemblyName>
<RootNamespace>Orchestra</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
Expand Down
7 changes: 5 additions & 2 deletions src/Orchestra.Shell.TaskRunner/TaskRunnerEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
namespace Orchestra
{
using System.IO;
using Catel.IO;
using Catel.IoC;
using Catel.Services;
using Path = System.IO.Path;

public static class TaskRunnerEnvironment
{
public static readonly string CurrentLogFileName = Path.Combine(Catel.IO.Path.GetApplicationDataDirectory(), "current.log");
public static readonly string CurrentLogFileName = Path.Combine(ServiceLocator.Default.ResolveRequiredType<IAppDataService>().GetApplicationDataDirectory(ApplicationDataTarget.UserRoaming), "current.log");
}
}