Skip to content

Commit

Permalink
Beutl.FrameworkをBeutl.Extensibilityに変更
Browse files Browse the repository at this point in the history
  • Loading branch information
yuto-trd committed Aug 4, 2023
1 parent 83f9dbc commit 2b94995
Show file tree
Hide file tree
Showing 150 changed files with 134 additions and 228 deletions.
2 changes: 1 addition & 1 deletion Beutl.sln
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beutl.Configiration.UnitTes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumerateFontFamilies", "tests\EnumerateFontFamilies\EnumerateFontFamilies.csproj", "{C009364B-6190-47E9-A902-6A17EC6FE4D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beutl.Framework", "src\Beutl.Framework\Beutl.Framework.csproj", "{87A937E5-F122-43E0-8D7F-0A3D635432FA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Beutl.Extensibility", "src\Beutl.Extensibility\Beutl.Extensibility.csproj", "{87A937E5-F122-43E0-8D7F-0A3D635432FA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{80264A90-CB12-4C61-A5A2-983650511ACE}"
ProjectSection(SolutionItems) = preProject
Expand Down
2 changes: 1 addition & 1 deletion build/props/CoreLibraries.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Configuration/Beutl.Configuration.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Core/Beutl.Core.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Framework/Beutl.Framework.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Extensibility/Beutl.Extensibility.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Engine/Beutl.Engine.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Operators/Beutl.Operators.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.ProjectSystem/Beutl.ProjectSystem.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion packages/Beutl.Sdk/Beutl.Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Configuration/Beutl.Configuration.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Core/Beutl.Core.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Framework/Beutl.Framework.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Extensibility/Beutl.Extensibility.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Engine/Beutl.Engine.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Language/Beutl.Language.csproj" PrivateAssets="All" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../../src/Beutl.Operators/Beutl.Operators.csproj" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Api/Beutl.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<ProjectReference Include="..\Beutl.Core\Beutl.Core.csproj" />
<ProjectReference Include="..\Beutl.Configuration\Beutl.Configuration.csproj" />
<ProjectReference Include="..\Beutl.Framework\Beutl.Framework.csproj" />
<ProjectReference Include="..\Beutl.Extensibility\Beutl.Extensibility.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Beutl.Api/Services/ExtensionProvider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Beutl.Collections;
using Beutl.Configuration;
using Beutl.Framework;
using Beutl.Extensibility;

using static Beutl.Configuration.ExtensionConfig;

Expand Down
4 changes: 2 additions & 2 deletions src/Beutl.Api/Services/PackageInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public partial class PackageInstaller : IBeutlApiResource
new PackageIdentity("Beutl.Configuration", s_beutlVersion),
new PackageIdentity("Beutl.Controls", s_beutlVersion),
new PackageIdentity("Beutl.Core", s_beutlVersion),
new PackageIdentity("Beutl.Framework", s_beutlVersion),
new PackageIdentity("Beutl.Graphics", s_beutlVersion),
new PackageIdentity("Beutl.Extensibility", s_beutlVersion),
new PackageIdentity("Beutl.Engine", s_beutlVersion),
new PackageIdentity("Beutl.Language", s_beutlVersion),
new PackageIdentity("Beutl.Operators", s_beutlVersion),
new PackageIdentity("Beutl.ProjectSystem", s_beutlVersion),
Expand Down
3 changes: 1 addition & 2 deletions src/Beutl.Api/Services/PackageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
using System.Reflection;

using Beutl.Api.Objects;

using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Reactive;

using NuGet.Packaging;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Controls/Beutl.Controls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Beutl.Framework\Beutl.Framework.csproj" />
<ProjectReference Include="..\Beutl.Extensibility\Beutl.Extensibility.csproj" />
<ProjectReference Include="..\Beutl.Language\Beutl.Language.csproj" />
<ProjectReference Include="..\Beutl.Engine\Beutl.Engine.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Controls/PropertyEditors/PropertyEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Avalonia.Interactivity;
using Avalonia.LogicalTree;

using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Reactive;

namespace Beutl.Controls.PropertyEditors;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
[assembly: InternalsVisibleTo("Beutl")]
[assembly: InternalsVisibleTo("Beutl.Core.UnitTests")]
[assembly: InternalsVisibleTo("Beutl.Configuration")]
[assembly: InternalsVisibleTo("Beutl.Graphics")]
[assembly: InternalsVisibleTo("Beutl.Engine")]
[assembly: InternalsVisibleTo("Beutl.ProjectSystem")]
2 changes: 1 addition & 1 deletion src/Beutl.Engine/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

[assembly: InternalsVisibleTo("Beutl")]
[assembly: InternalsVisibleTo("Beutl.ProjectSystem")]
[assembly: InternalsVisibleTo("Beutl.Graphics.UnitTests")]
[assembly: InternalsVisibleTo("Beutl.Engine.UnitTests")]
[assembly: InternalsVisibleTo("Beutl.Benchmarks")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<ProjectReference Include="..\Beutl.Core\Beutl.Core.csproj" />
<ProjectReference Include="..\Beutl.Graphics\Beutl.Graphics.csproj" />
<ProjectReference Include="..\Beutl.Engine\Beutl.Engine.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Beutl.Media.Decoding;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public abstract class DecodingExtension : Extension
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
using Avalonia.Media;
using Avalonia.Platform.Storage;

using Beutl.Framework.Services;
using Beutl.Extensibility.Services;

using FluentAvalonia.UI.Controls;

using Microsoft.Extensions.DependencyInjection;

using Reactive.Bindings;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IEditorContext : IDisposable, IServiceProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Beutl.Media.Encoding;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public abstract class EncodingExtension : Extension
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public sealed class ExportAttribute : Attribute
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

// 拡張機能の基本クラス
public abstract class Extension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Beutl.Animation;
using Beutl.Animation.Easings;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IAbstractProperty
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IKnownEditorCommands
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using Avalonia.Controls;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IListItemEditor : INotifyPropertyChanged
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

public abstract class LayerExtension : Extension
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using Reactive.Bindings;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IOutputContext : IDisposable, IJsonSerializable
{
Expand All @@ -16,7 +16,7 @@ public interface IOutputContext : IDisposable, IJsonSerializable
string TargetFile { get; }

IReadOnlyReactiveProperty<bool> IsIndeterminate { get; }

IReadOnlyReactiveProperty<bool> IsEncoding { get; }

IReadOnlyReactiveProperty<double> Progress { get; }
Expand All @@ -33,7 +33,7 @@ public abstract class OutputExtension : Extension
public abstract IconSource? GetIcon();

public abstract bool TryCreateControl(string file, [NotNullWhen(true)] out Control? control);

public abstract bool TryCreateContext(string file, [NotNullWhen(true)] out IOutputContext? context);

public virtual bool IsSupported(string file)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

using FluentAvalonia.UI.Controls;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public abstract class PageExtension : Extension
{
public abstract Control CreateControl();

public abstract IPageContext CreateContext();

public abstract IconSource GetFilledIcon();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
internal sealed class PrimitiveImplAttribute : Attribute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using FluentAvalonia.UI.Controls;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public abstract class ProjectItemExtension : Extension
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.DependencyInjection;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

internal interface IPropertyEditorExtensionImpl
{
Expand All @@ -13,7 +13,7 @@ internal interface IPropertyEditorExtensionImpl
bool TryCreateContext(PropertyEditorExtension extension, IReadOnlyList<IAbstractProperty> properties, [NotNullWhen(true)] out IPropertyEditorContext? context);

bool TryCreateContextForNode(PropertyEditorExtension extension, IReadOnlyList<IAbstractProperty> properties, [NotNullWhen(true)] out IPropertyEditorContext? context);

bool TryCreateContextForListItem(PropertyEditorExtension extension, IAbstractProperty property, [NotNullWhen(true)] out IPropertyEditorContext? context);

bool TryCreateControl(IPropertyEditorContext context, [NotNullWhen(true)] out Control? control);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Reactive.Bindings;

namespace Beutl.Framework;
namespace Beutl.Extensibility;

public interface IToolContext : IDisposable, IJsonSerializable, IServiceProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework.Service;
namespace Beutl.Extensibility.Services;

public interface INotificationService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Reactive.Bindings;

namespace Beutl.Framework.Services;
namespace Beutl.Extensibility.Services;

public interface IProjectService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Beutl.Framework;
namespace Beutl.Extensibility;

// UIの拡張機能の基本クラス
public abstract class ViewExtension : Extension
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Extensions.FFmpeg/Beutl.Extensions.FFmpeg.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<ProjectReference Include="..\..\src\Beutl.Controls\Beutl.Controls.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Configuration\Beutl.Configuration.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Core\Beutl.Core.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Framework\Beutl.Framework.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Extensibility\Beutl.Extensibility.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Engine\Beutl.Engine.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Language\Beutl.Language.csproj" Private="false" ExcludeAssets="runtime" />
<ProjectReference Include="..\..\src\Beutl.Operators\Beutl.Operators.csproj" Private="false" ExcludeAssets="runtime" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Media.Decoding;

namespace Beutl.Extensions.FFmpeg.Decoding;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Text.Json.Nodes;

using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Media;
using Beutl.Media.Encoding;

Expand Down
19 changes: 0 additions & 19 deletions src/Beutl.Framework/KnownLicense.cs

This file was deleted.

2 changes: 1 addition & 1 deletion src/Beutl.Operators/Beutl.Operators.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Beutl.ProjectSystem\Beutl.ProjectSystem.csproj" />
<ProjectReference Include="..\Beutl.Framework\Beutl.Framework.csproj" />
<ProjectReference Include="..\Beutl.Extensibility\Beutl.Extensibility.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Beutl.Animation;
using Beutl.Collections;
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Reactive;

namespace Beutl.Operators.Configure;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.Operators/Configure/CorePropertyImpl.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Beutl.Framework;
using Beutl.Extensibility;

namespace Beutl.Operators.Configure;

Expand Down
4 changes: 2 additions & 2 deletions src/Beutl.ProjectSystem/Beutl.ProjectSystem.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<RootNameSpace>Beutl</RootNameSpace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Beutl.Graphics\Beutl.Graphics.csproj" />
<ProjectReference Include="..\Beutl.Engine\Beutl.Engine.csproj" />
<ProjectReference Include="..\Beutl.Language\Beutl.Language.csproj" />
<ProjectReference Include="..\Beutl.Framework\Beutl.Framework.csproj" />
<ProjectReference Include="..\Beutl.Extensibility\Beutl.Extensibility.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.ProjectSystem/NodeTree/INodeItem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Media;

namespace Beutl.NodeTree;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.ProjectSystem/NodeTree/NodeItem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Beutl.Animation;
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Media;

namespace Beutl.NodeTree;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.ProjectSystem/NodeTree/Nodes/LayerInputNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Text.Json.Nodes;

using Beutl.Animation;
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Media;
using Beutl.NodeTree.Nodes.Group;
using Beutl.Styling;
Expand Down
2 changes: 1 addition & 1 deletion src/Beutl.ProjectSystem/NodeTree/SetterPropertyImpl.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Text.Json.Nodes;

using Beutl.Animation;
using Beutl.Framework;
using Beutl.Extensibility;
using Beutl.Reactive;
using Beutl.Styling;

Expand Down
Loading

0 comments on commit 2b94995

Please sign in to comment.