remove extra packages references.

Rest of package cleanup is in the Packages PR
jinek · Dec 7, 2024 · e965957 · e965957
1 parent 51dc2fb
commit e965957
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -766,3 +766,4 @@ fabric.properties
 .idea/
 *.sln.iml
 
+/src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
         <Nullable>disable</Nullable>
     </PropertyGroup>
     <PropertyGroup>
-        <VersionPrefix>11.2</VersionPrefix>
+        <VersionPrefix>11.2.1</VersionPrefix>
         <Authors>https://github.com/jinek/Consolonia/graphs/contributors</Authors>
         <Description>Text User Interface implementation of Avalonia UI (GUI Framework)</Description>
         <Copyright>Copyright © Evgeny Gorbovoy 2021 - 2022</Copyright>

diff --git a/src/Consolonia.Blazor/Consolonia.Blazor.csproj b/src/Consolonia.Blazor/Consolonia.Blazor.csproj
@@ -10,6 +10,5 @@
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="BlazorBindingsAvalonia" Version="0.1.2" />
-        <PackageReference Include="Consolonia.Core" Version="11.2" />
     </ItemGroup>
 </Project>
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaNotSupportedException.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaNotSupportedException.cs
@@ -2,7 +2,6 @@
 
 namespace Consolonia.Core.Infrastructure
 {
-    [Serializable]
     public class ConsoloniaNotSupportedException : Exception
     {
         internal ConsoloniaNotSupportedException(NotSupportedRequest request)

diff --git a/src/Consolonia.Designer/ConsolePreview.cs b/src/Consolonia.Designer/ConsolePreview.cs
@@ -2,7 +2,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-#if DEBUG
 using Consolonia.PreviewHost;
 using System;
 using System.Diagnostics;
@@ -15,7 +14,6 @@
 using Avalonia.Threading;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
 using Newtonsoft.Json;
-#endif
 
 namespace Consolonia.Designer
 {
@@ -45,7 +43,6 @@ public class ConsolePreview : UserControl
 
         public ConsolePreview()
         {
-#if DEBUG
             _process = null;
             FontFamily = FontFamily.Parse("Cascadia Mono");
             Initialized += (_, _) => LoadXaml();
@@ -54,7 +51,6 @@ public ConsolePreview()
             {
                 if (e.Property == FileNameProperty) LoadXaml();
             };
-#endif
         }
 
 
@@ -102,7 +98,6 @@ protected void Dispose(bool disposing)
                 if (disposing)
                 {
                     // TODO: dispose managed state (managed objects)
-#if DEBUG
 #pragma warning disable CA1416 // Validate platform compatibility
                     if (_process != null)
                     {
@@ -111,7 +106,6 @@ protected void Dispose(bool disposing)
                         _process = null;
                     }
 #pragma warning restore CA1416 // Validate platform compatibility
-#endif
                 }
 
                 _disposedValue = true;
@@ -125,14 +119,10 @@ public void Dispose()
             Dispose(true);
         }
 
-#if DEBUG
         private Process? _process;
         private readonly Typeface _typeface = new("Cascadia Mono");
         private double _charWidth;
         private double _charHeight;
-#endif
-
-#if DEBUG
 
         private void LoadXaml()
         {
@@ -451,6 +441,5 @@ public void Flush()
                 _textRunCharWidth = 0;
             }
         }
-#endif
     }
 }
diff --git a/src/Consolonia.Designer/Consolonia.Designer.csproj b/src/Consolonia.Designer/Consolonia.Designer.csproj
@@ -5,16 +5,14 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Consolonia.Core" Version="11.2" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Consolonia.PreviewHost" Version="11.2" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
-      <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
+      <ProjectReference Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Consolonia.Designer/Extensions.cs b/src/Consolonia.Designer/Extensions.cs
@@ -19,13 +19,11 @@ public static class Extensions
         /// </remarks>
         public static AppBuilder UseConsoloniaDesigner(this AppBuilder builder)
         {
-#if DEBUG
-            if (Design.IsDesignMode) //AppDomain.CurrentDomain.FriendlyName == "Avalonia.Designer.HostApp")
+            if (Design.IsDesignMode) 
                 return builder
                     .UsePlatformDetect()
                     .WithInterFont()
                     .LogToTrace();
-#endif
 
             return builder.UseConsolonia();
         }

diff --git a/src/Consolonia.Gallery/Consolonia.Gallery.csproj b/src/Consolonia.Gallery/Consolonia.Gallery.csproj
@@ -13,7 +13,6 @@
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
         <ProjectReference Include="..\Consolonia.PlatformSupport\Consolonia.PlatformSupport.csproj" />
         <ProjectReference Include="..\Consolonia.Themes.TurboVision\Consolonia.Themes.TurboVision.csproj" />
-        <ProjectReference Include="..\Consolonia.Designer\Consolonia.Designer.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Consolonia.Gallery/Program.cs b/src/Consolonia.Gallery/Program.cs
@@ -2,7 +2,6 @@
 using Avalonia;
 using Consolonia.Core;
 using Consolonia.Core.Infrastructure;
-using Consolonia.Designer;
 using Consolonia.PlatformSupport;
 
 namespace Consolonia.Gallery
@@ -19,11 +18,7 @@ private static void Main(string[] args)
 
         public static AppBuilder BuildAvaloniaApp()
          => AppBuilder.Configure<App>()
-#if DEBUG
-                .UseConsoloniaDesigner()
-#else
                 .UseConsolonia()
-#endif
                 .UseAutoDetectedConsole()
                 .LogToException();
     }

diff --git a/src/Consolonia.NUnit/Consolonia.NUnit.csproj b/src/Consolonia.NUnit/Consolonia.NUnit.csproj
@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Consolonia.Core" Version="11.2" />
         <PackageReference Include="NUnit" Version="3.13.1" />
     </ItemGroup>
 

diff --git a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
@@ -1,11 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
-    <ItemGroup>
-        <PackageReference Include="Consolonia.Core" Version="11.2" />
-        <PackageReference Include="Consolonia.GuiCS" Version="11.2" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
         <ProjectReference Include="..\Consolonia.GuiCS\Consolonia.GuiCS.csproj" />        

diff --git a/src/Example.Blazor.Components/Example.Blazor.Components.csproj b/src/Example.Blazor.Components/Example.Blazor.Components.csproj
@@ -7,10 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Consolonia.Blazor" Version="11.2" />
-    </ItemGroup>
-
-    <ItemGroup>
+        <ProjectReference Include="..\Consolonia.Blazor\Consolonia.Blazor.csproj" />
+        <ProjectReference Include="..\Consolonia.PlatformSupport\Consolonia.PlatformSupport.csproj" />
+        <ProjectReference Include="..\Consolonia.Themes.TurboVision\Consolonia.Themes.TurboVision.csproj" />
         <ProjectReference Include="..\Consolonia.Blazor\Consolonia.Blazor.csproj" />
     </ItemGroup>
 

diff --git a/src/Example.Blazor/Example.Blazor.csproj b/src/Example.Blazor/Example.Blazor.csproj
@@ -7,12 +7,6 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Consolonia.Blazor" Version="11.2" />
-        <PackageReference Include="Consolonia.Themes.TurboVision" Version="11.2" />
-        <PackageReference Include="Consolonia.PlatformSupport" Version="11.2" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Consolonia.Blazor\Consolonia.Blazor.csproj" />
         <ProjectReference Include="..\Consolonia.PlatformSupport\Consolonia.PlatformSupport.csproj" />

diff --git a/src/Tools/Consolonia.PreviewHost/App.axaml.cs b/src/Tools/Consolonia.PreviewHost/App.axaml.cs
@@ -37,7 +37,12 @@ public override void OnFrameworkInitializationCompleted()
                 {
                     string folder;
                     if (Path.IsPathFullyQualified(path))
-                        folder = Path.GetDirectoryName(path)!;
+                    {
+                        if (Directory.Exists(path))
+                            folder = path;
+                        else
+                            folder = Path.GetDirectoryName(path)!;
+                    }
                     else
                         folder = Environment.CurrentDirectory;
                     ArgumentNullException.ThrowIfNull(folder);

diff --git a/src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json b/src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -766,3 +766,4 @@ fabric.properties
		.idea/
		*.sln.iml

		/src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json