Skip to content

Commit

Permalink
Rename Shared to SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
HendrikMennen committed Nov 22, 2023
1 parent 7b65230 commit 9c56928
Show file tree
Hide file tree
Showing 332 changed files with 641 additions and 643 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
dotnet-version: 8.0.x

# Create the NuGet packages in the folder from the environment variable NuGetDirectory
- run: dotnet pack ./src/OneWare.Shared/OneWare.Shared.csproj --configuration Release --output ${{ env.NuGetDirectory }}
- run: dotnet pack ./src/OneWare.SDK/OneWare.SDK.csproj --configuration Release --output ${{ env.NuGetDirectory }}
- run: dotnet pack ./src/OneWare.Settings/OneWare.Settings.csproj --configuration Release --output ${{ env.NuGetDirectory }}
- run: dotnet pack ./src/OneWare.ProjectSystem/OneWare.ProjectSystem.csproj --configuration Release --output ${{ env.NuGetDirectory }}
- run: dotnet pack ./src/OneWare.UniversalFpgaProjectSystem/OneWare.UniversalFpgaProjectSystem.csproj --configuration Release --output ${{ env.NuGetDirectory }}
Expand Down
4 changes: 2 additions & 2 deletions OneWare.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Core", "src\OneWare.Core\OneWare.Core.csproj", "{142377AB-78D8-429E-8403-C89CC8988C09}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Shared", "src\OneWare.Shared\OneWare.Shared.csproj", "{94FD4E60-346F-4B14-AB6D-A1B78DD39501}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.SDK", "src\OneWare.SDK\OneWare.SDK.csproj", "{94FD4E60-346F-4B14-AB6D-A1B78DD39501}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{3782EFDF-2990-4B2C-907F-12739A839A3C}"
EndProject
Expand Down Expand Up @@ -131,7 +131,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{BD761CED
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.OssCadSuiteIntegration", "src\OneWare.OssCadSuiteIntegration\OneWare.OssCadSuiteIntegration.csproj", "{4E2FD886-862B-4DE9-A69E-AE82E52979B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.Shared.UnitTests", "tests\OneWare.Shared.UnitTests\OneWare.Shared.UnitTests.csproj", "{5C6FFAFA-590C-400D-8F90-89C9880864AF}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.SDK.UnitTests", "tests\OneWare.SDK.UnitTests\OneWare.SDK.UnitTests.csproj", "{5C6FFAFA-590C-400D-8F90-89C9880864AF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion build/props/Base.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>0.12.0.8</Version>
<Version>0.12.0.9</Version>
<Authors>Hendrik Mennen</Authors>
<Company>Protop Solutions UG</Company>
<Description>The FPGA Programming Revolution</Description>
Expand Down
5 changes: 1 addition & 4 deletions demo/OneWare.Demo.Browser/WebDemoApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
using System.Linq;
using System.Threading.Tasks;
using Avalonia.Platform;
using Dock.Model.Core;
using OneWare.FolderProjectSystem.Models;
using OneWare.Shared.Services;
using OneWare.SDK.Services;
using OneWare.UniversalFpgaProjectSystem;
using OneWare.UniversalFpgaProjectSystem.Models;
using OneWare.Vcd.Viewer.ViewModels;
using Prism.Ioc;

Expand Down
6 changes: 3 additions & 3 deletions demo/OneWare.Demo.Desktop/DesktopDemoApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
using OneWare.Core.Views.Windows;
using OneWare.Cpp;
using OneWare.Demo.Desktop.ViewModels;
using OneWare.Demo.Desktop.Views;
using OneWare.OssCadSuiteIntegration;
using OneWare.PackageManager;
using OneWare.SerialMonitor;
using OneWare.Shared.Enums;
using OneWare.Shared.Services;
using OneWare.SDK.Enums;
using OneWare.SDK.Services;
using OneWare.SourceControl;
using OneWare.TerminalManager;
using Prism.Ioc;
using Prism.Modularity;
using SplashWindow = OneWare.Demo.Desktop.Views.SplashWindow;

namespace OneWare.Demo.Desktop;

Expand Down
4 changes: 2 additions & 2 deletions demo/OneWare.Demo.Desktop/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using Avalonia;
using Avalonia.Dialogs;
using Avalonia.Media;
using OneWare.Shared.Helpers;
using OneWare.Shared.Services;
using OneWare.SDK.Helpers;
using OneWare.SDK.Services;
using Prism.Ioc;

namespace OneWare.Demo.Desktop;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using OneWare.Shared.Services;
using OneWare.SDK.Services;

namespace OneWare.Demo.Desktop.ViewModels;

Expand Down
2 changes: 1 addition & 1 deletion demo/OneWare.Demo/DemoApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using OneWare.IceBreaker;
using OneWare.Json;
using OneWare.Settings;
using OneWare.Shared.Services;
using OneWare.SDK.Services;
using OneWare.Toml;
using OneWare.UniversalFpgaProjectSystem;
using OneWare.Vcd.Viewer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<Import Project="..\..\build\props\Prism.Avalonia.props" />

<ItemGroup>
<ProjectReference Include="..\OneWare.Shared\OneWare.Shared.csproj" />
<ProjectReference Include="..\OneWare.SDK\OneWare.SDK.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/OneWare.Core/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<StyleInclude Source="avares://NodeEditorAvalonia/Themes/NodeEditorTheme.axaml" />
<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml" />
<StyleInclude Source="avares://OneWare.Core/Styles/IdeStyles.axaml"/>
<StyleInclude Source="avares://OneWare.Shared/Controls/SharedControls.axaml"/>
<StyleInclude Source="avares://OneWare.SDK/Controls/SharedControls.axaml"/>
</Application.Styles>

<NativeMenu.Menu>
Expand Down
12 changes: 6 additions & 6 deletions src/OneWare.Core/App.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
using Prism.DryIoc;
using Prism.Ioc;
using Prism.Modularity;
using OneWare.Shared;
using OneWare.Shared.Helpers;
using OneWare.Shared.LanguageService;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.Shared.ViewModels;
using OneWare.SDK;
using OneWare.SDK.Helpers;
using OneWare.SDK.LanguageService;
using OneWare.SDK.Models;
using OneWare.SDK.Services;
using OneWare.SDK.ViewModels;
using TextMateSharp.Grammars;

namespace OneWare.Core
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Data/ProcessOutputCollector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Avalonia.Threading;
using OneWare.Core.Events;
using Prism.Ioc;
using OneWare.Shared.Services;
using OneWare.SDK.Services;

namespace OneWare.Core.Data
{
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Dock/DefaultLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using OneWare.Core.Services;
using OneWare.Core.ViewModels.DockViews;
using Prism.Ioc;
using OneWare.Shared.Enums;
using OneWare.SDK.Enums;

namespace OneWare.Core.Dock
{
Expand Down
6 changes: 3 additions & 3 deletions src/OneWare.Core/Helpers/WindowHelper.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Avalonia.Controls;
using OneWare.Shared.Enums;
using OneWare.Shared.Services;
using OneWare.Shared.ViewModels;
using OneWare.SDK.Enums;
using OneWare.SDK.Services;
using OneWare.SDK.ViewModels;
using Prism.Ioc;

namespace OneWare.Core.Helpers;
Expand Down
4 changes: 2 additions & 2 deletions src/OneWare.Core/Models/VirtualDialogModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using OneWare.Shared.Controls;
using OneWare.Shared.ViewModels;
using OneWare.SDK.Controls;
using OneWare.SDK.ViewModels;

namespace OneWare.Core.Models;

Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/ModuleLogic/AggregateModuleCatalog.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Collections.ObjectModel;
using OneWare.Shared.Services;
using OneWare.SDK.Services;
using Prism.Ioc;
using Prism.Modularity;

Expand Down
4 changes: 2 additions & 2 deletions src/OneWare.Core/ModuleLogic/ModuleTracker.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;
using OneWare.Shared.Enums;
using OneWare.Shared.Services;
using OneWare.SDK.Enums;
using OneWare.SDK.Services;
using Prism.Modularity;

namespace OneWare.Core.ModuleLogic;
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/ModuleLogic/ModuleTrackingState.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Prism.Modularity;
using Prism.Mvvm;
using OneWare.Shared.Enums;
using OneWare.SDK.Enums;

namespace OneWare.Core.ModuleLogic;

Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/OneWare.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ProjectReference Include="..\OneWare.ProjectSystem\OneWare.ProjectSystem.csproj" />
<ProjectReference Include="..\OneWare.SearchList\OneWare.SearchList.csproj" />
<ProjectReference Include="..\OneWare.Settings\OneWare.Settings.csproj" />
<ProjectReference Include="..\OneWare.Shared\OneWare.Shared.csproj" />
<ProjectReference Include="..\OneWare.SDK\OneWare.SDK.csproj" />
</ItemGroup>

</Project>
Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/Active.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Collections.ObjectModel;
using System.Diagnostics;
using CommunityToolkit.Mvvm.ComponentModel;
using OneWare.Shared.Enums;
using OneWare.Shared.Extensions;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.SDK.Enums;
using OneWare.SDK.Extensions;
using OneWare.SDK.Models;
using OneWare.SDK.Services;

namespace OneWare.Core.Services;

Expand Down
12 changes: 6 additions & 6 deletions src/OneWare.Core/Services/BackupService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
using Avalonia.Threading;
using OneWare.Core.ViewModels.DockViews;
using Prism.Ioc;
using OneWare.Shared;
using OneWare.Shared.Enums;
using OneWare.Shared.Extensions;
using OneWare.Shared.Helpers;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.SDK;
using OneWare.SDK.Enums;
using OneWare.SDK.Extensions;
using OneWare.SDK.Helpers;
using OneWare.SDK.Models;
using OneWare.SDK.Services;

namespace OneWare.Core.Services
{
Expand Down
4 changes: 2 additions & 2 deletions src/OneWare.Core/Services/ChildProcessService.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Diagnostics;
using Avalonia.Media;
using OneWare.Shared.Enums;
using OneWare.Shared.Services;
using OneWare.SDK.Enums;
using OneWare.SDK.Services;

namespace OneWare.Core.Services;

Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/DockService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
using OneWare.Core.ViewModels.DockViews;
using OneWare.Core.Views.Windows;
using Prism.Ioc;
using OneWare.Shared.Enums;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.Shared.ViewModels;
using OneWare.SDK.Enums;
using OneWare.SDK.Models;
using OneWare.SDK.Services;
using OneWare.SDK.ViewModels;

namespace OneWare.Core.Services
{
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Services/HotkeyService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OneWare.Shared.Services;
using OneWare.SDK.Services;

namespace OneWare.Core.Services;

Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Services/HttpService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Avalonia.Media.Imaging;
using OneWare.Core.Extensions;
using OneWare.Shared.Services;
using OneWare.SDK.Services;
using SharpCompress.Common;
using SharpCompress.Readers;

Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/LanguageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Markdown.Avalonia.SyntaxHigh;
using OneWare.Core.Extensions.TextMate;
using OneWare.Shared.LanguageService;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.Shared.ViewModels;
using OneWare.SDK.LanguageService;
using OneWare.SDK.Models;
using OneWare.SDK.Services;
using OneWare.SDK.ViewModels;
using Prism.Ioc;
using TextMateSharp.Grammars;
using TextMateSharp.Registry;
Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using Avalonia.Controls;
using Avalonia.Media;
using Prism.Ioc;
using OneWare.Shared;
using OneWare.Shared.Enums;
using OneWare.Shared.Helpers;
using OneWare.Shared.Services;
using OneWare.SDK;
using OneWare.SDK.Enums;
using OneWare.SDK.Helpers;
using OneWare.SDK.Services;

namespace OneWare.Core.Services;

Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Services/PackageService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OneWare.Shared.Services;
using OneWare.SDK.Services;

namespace OneWare.Core.Services;

Expand Down
4 changes: 2 additions & 2 deletions src/OneWare.Core/Services/Paths.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Diagnostics;
using System.Runtime.InteropServices;
using OneWare.Shared.Extensions;
using OneWare.Shared.Services;
using OneWare.SDK.Extensions;
using OneWare.SDK.Services;
using Prism.Ioc;

namespace OneWare.Core.Services;
Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/PluginService.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using OneWare.Shared.Extensions;
using OneWare.Shared.Helpers;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.SDK.Extensions;
using OneWare.SDK.Helpers;
using OneWare.SDK.Models;
using OneWare.SDK.Services;
using Prism.Ioc;
using Prism.Modularity;

Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Services/ThemeManager.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Avalonia;
using Avalonia.Styling;
using CommunityToolkit.Mvvm.ComponentModel;
using OneWare.Shared.Services;
using OneWare.SDK.Services;

namespace OneWare.Core.Services
{
Expand Down
8 changes: 4 additions & 4 deletions src/OneWare.Core/Services/WindowService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
using OneWare.Core.ViewModels.Controls;
using OneWare.Core.ViewModels.Windows;
using OneWare.Core.Views.Windows;
using OneWare.Shared.Controls;
using OneWare.Shared.Enums;
using OneWare.SDK.Controls;
using OneWare.SDK.Enums;
using Prism.Ioc;
using OneWare.Shared.Models;
using OneWare.Shared.Services;
using OneWare.SDK.Models;
using OneWare.SDK.Services;
using MessageBoxWindow = OneWare.Core.Views.Windows.MessageBoxWindow;

namespace OneWare.Core.Services;
Expand Down
12 changes: 6 additions & 6 deletions src/OneWare.Core/Styles/AdvancedWindow.axaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:layout="clr-namespace:Avalonia.Layout;assembly=Avalonia.Base"
xmlns:shared="clr-namespace:OneWare.Shared;assembly=OneWare.Shared"
xmlns:converters="clr-namespace:OneWare.Shared.Converters;assembly=OneWare.Shared"
xmlns:shared="clr-namespace:OneWare.SDK;assembly=OneWare.SDK"
xmlns:converters="clr-namespace:OneWare.SDK.Converters;assembly=OneWare.SDK"
xmlns:windows="clr-namespace:OneWare.Core.Views.Windows"
xmlns:controls="clr-namespace:OneWare.Shared.Controls;assembly=OneWare.Shared">
xmlns:helpers="clr-namespace:OneWare.SDK.Helpers;assembly=OneWare.SDK">

<Style Selector="windows|AdvancedWindow">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
<Setter Property="ExtendClientAreaToDecorationsHint" Value="True"/>
<Setter Property="ExtendClientAreaTitleBarHeightHint" Value="30"/>
<Setter Property="Padding" Value="{TemplateBinding Padding}"/>
<Setter Property="CornerRadius" Value="{x:Static shared:Shared.WindowsCornerRadius}"/>
<Setter Property="CornerRadius" Value="{x:Static helpers:PlatformHelper.WindowsCornerRadius}"/>
<Setter Property="UseLayoutRounding" Value="False"/>
<Setter Property="Template">
<ControlTemplate>
<Panel>
<Border Name="PART_TransparencyFallback"
IsHitTestVisible="False" />
<Border Background="{TemplateBinding Background}" BorderBrush="{DynamicResource ThemeBorderLowBrush}" BorderThickness="{x:Static shared:Shared.WindowsOnlyBorder}"
<Border Background="{TemplateBinding Background}" BorderBrush="{DynamicResource ThemeBorderLowBrush}" BorderThickness="{x:Static helpers:PlatformHelper.WindowsOnlyBorder}"
IsHitTestVisible="False" CornerRadius="{TemplateBinding CornerRadius}" />
<Panel Margin="{TemplateBinding WindowDecorationMargin}"
Background="Transparent" />
Expand All @@ -29,7 +29,7 @@
</VisualLayerManager.ChromeOverlayLayer>
<Panel Margin="{TemplateBinding OffScreenMargin}">
<Panel Margin="{TemplateBinding WindowDecorationMargin}">
<Panel Margin="{x:Static shared:Shared.WindowsOnlyBorder}">
<Panel Margin="{x:Static helpers:PlatformHelper.WindowsOnlyBorder}">
<Grid RowDefinitions="Auto,*, Auto">
<Border IsVisible="{TemplateBinding IsExtendedIntoWindowDecorations, Converter={x:Static BoolConverters.Not}}"
Height="{Binding #TitleBarContent.Bounds.Height}" Background="Transparent" Width="1"/>
Expand Down
Loading

0 comments on commit 9c56928

Please sign in to comment.