diff --git a/.vscode/launch.json b/.vscode/launch.json index 085bc8e..db4dfb3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/Sample/bin/Debug/netcoreapp3.0/Sample.dll", + "program": "${workspaceFolder}/Sample/bin/Debug/net6.0/Sample.dll", "args": [], "cwd": "${workspaceFolder}", "console": "internalConsole", @@ -23,4 +23,4 @@ "processId": "${command:pickProcess}" } ] -} \ No newline at end of file +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..fd2cc76 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "cmake.configureOnOpen": false, + "dotnet.defaultSolution": "GroupBox.sln" +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 644c6be..9144231 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,13 +5,39 @@ "tasks": [ { "label": "build", - "command": "dotnet build /p:GenerateFullPaths=true", - "type": "shell", - "group": "build", - "presentation": { - "reveal": "silent" - }, + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/GroupBox.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/GroupBox.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/Sample/Sample.csproj" + ], "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..5e155db --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,55 @@ +# Change Log + +All notable changes to this project will be documented in this file. See [versionize](https://github.com/versionize/versionize) for commit guidelines. + + +## [2.0.0-rc2.2](https://www.github.com/BinToss/teast.GroupBox.Avalonia/releases/tag/v2.0.0-rc2.2) (2023-7-5) + +### Bug Fixes + +* **groupbox:** add missing 'partial' modifier to GroupBox ([c9e3ef6](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/c9e3ef6d620936dc8e68f262bf7e1ec394832a2e)) +* **groupbox, sample:** remove handwritten IntializeComponent() ([13c1121](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/13c1121abfb459aaa47ffd83e51fc95e2e377dd1)) +* **sample:** add missing 'partial' modifier to MainWindow ([48b385f](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/48b385f554fa2f52ee14b43b6d194f272cc61f30)) +* **sample:** add missing 'partial' modifier to Sample.App ([9ccf331](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/9ccf331236cba8d2d04312cb00c3cae59667fcc1)) +* **sample:** update App for Avalonia 11 changes ([d6c744c](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/d6c744c955be30fdde081f0339737f08bbf14c85)) + +### Breaking Changes + +* **groupbox, deps, sample, vscode:** upgrade Avalonia to 11.0.0-rc2.2 ([8ff736c](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/8ff736c1edf3809d9a807e4941e3b05e65013214)) + +### Other + +* **deps-dev:** add Microsoft.SourceLink.GitHub ([93a0200](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/93a02006e2d2f49035ba4ddd3adf092cbcf1cccf)) +* **groupbox:** change Default style to AXAML ([ec978b0](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ec978b0a734f27439ef3976a9dd055aa2d36a5aa)) +* **groupbox:** change GroupBox to AXAML ([ced8b9b](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ced8b9bc6c70146027d604f2841d4a78221ecacc)) +* **groupbox:** format GroupBox.axaml ([75759b2](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/75759b28f6a0e45732539305c51e041b6e7b8cd9)) +* **groupbox:** improve Description; fix type in PackageTags ([d1e32ed](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/d1e32ed9a74a59239e1597bd738eccbc58b7ef72)) +* **groupbox:** remove deprecated interface 'IStyleable' ([ff642f8](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ff642f863f4538549310e4039cfb1018593bc6ed)) +* **groupbox:** remove unnecessary Using ([e69ab4a](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/e69ab4ad09dc6471cea910d54b44a65ed62f4ef1)) +* **groupbox:** update Copyright to 2018-2023 ([19af994](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/19af994ff320d50e50437263599411c09527c0f7)) +* **sample:** change MainWindow to AXAML ([c31999d](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/c31999d89bf3c9bb41e53b5fa8c27b115500fa96)) +* **vscode:** add tasks created by ms-dotnettools.csdevkit ([7da8fb6](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/7da8fb6101b91455aff90843d43aaa4d26a4639e)) +* **vscode:** set dotnet.defaultSolution; disable cmake.configureOnOpen ([775a59e](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/775a59ea75e960edbb7bf1978a693d1074500055)) +* **vscode:** sort settings ([708c0fb](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/708c0fbeb4553462c64d3737668303822c2334b1)) + + +## 1.2.1-preview5 + +### Bug Fixes + +* move styling into its own file +* add support for border and content margin + + +## 1.2.0.0-preview5 + +### Features + +* bump Avalonia to 0.10.0-preview5 + + +## 1.1.1.0 + +### Features + +* bump Avalonia to 0.9.12 diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..2bcc6b9 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,10 @@ + + + 11.0.0-rc2.2 + + + + + + + diff --git a/GroupBox.sln b/GroupBox.sln index d563667..0c3cead 100644 --- a/GroupBox.sln +++ b/GroupBox.sln @@ -1,48 +1,47 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupBox", "GroupBox\GroupBox.csproj", "{1E2912DE-0D83-420C-968D-77CD3E9F766A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{B3B77768-332A-4F7D-87EB-CB66150E1B1B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.ActiveCfg = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.Build.0 = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.ActiveCfg = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.Build.0 = Debug|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.Build.0 = Release|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.ActiveCfg = Release|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.Build.0 = Release|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.ActiveCfg = Release|Any CPU - {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.Build.0 = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.ActiveCfg = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.Build.0 = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.ActiveCfg = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.Build.0 = Debug|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.ActiveCfg = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.Build.0 = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.ActiveCfg = Release|Any CPU - {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 17.0.31903.59 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupBox", "GroupBox\GroupBox.csproj", "{1E2912DE-0D83-420C-968D-77CD3E9F766A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{B3B77768-332A-4F7D-87EB-CB66150E1B1B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.ActiveCfg = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.Build.0 = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.Build.0 = Debug|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.Build.0 = Release|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.ActiveCfg = Release|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.Build.0 = Release|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.ActiveCfg = Release|Any CPU + {1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.Build.0 = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.ActiveCfg = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.Build.0 = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.Build.0 = Debug|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.Build.0 = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.ActiveCfg = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.Build.0 = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.ActiveCfg = Release|Any CPU + {B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/GroupBox/GroupBox.axaml b/GroupBox/GroupBox.axaml new file mode 100644 index 0000000..1f9af10 --- /dev/null +++ b/GroupBox/GroupBox.axaml @@ -0,0 +1,37 @@ + + + + + diff --git a/GroupBox/GroupBox.xaml.cs b/GroupBox/GroupBox.axaml.cs similarity index 87% rename from GroupBox/GroupBox.xaml.cs rename to GroupBox/GroupBox.axaml.cs index e8f0c89..0a9aa4f 100644 --- a/GroupBox/GroupBox.xaml.cs +++ b/GroupBox/GroupBox.axaml.cs @@ -1,105 +1,94 @@ -using System; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.Media; -using Avalonia.Metadata; -using Avalonia.Styling; - -namespace Teast.Controls -{ - public class GroupBox: UserControl, IStyleable - { - /// - /// Defines the property. - /// - public static readonly DirectProperty HeaderProperty = - AvaloniaProperty.RegisterDirect( - nameof(Header), - o => o.Header, - (o, v) => o.Header = o.HeaderUpperCase ? v?.ToUpperInvariant() : v ); - - /// - /// Defines the property. - /// - public static readonly StyledProperty HeaderBackgroundProperty = - AvaloniaProperty.Register(nameof(HeaderBackground)); - - /// - /// Defines the property. - /// - public static readonly StyledProperty HeaderForegroundProperty = - AvaloniaProperty.Register(nameof(HeaderForeground)); - - /// - /// Defines the property. - /// - public static readonly StyledProperty HeaderMarginProperty = - AvaloniaProperty.Register(nameof(HeaderMargin)); - - /// - /// Defines the property. - /// - public static readonly StyledProperty HeaderUpperCaseProperty = - AvaloniaProperty.Register(nameof(HeaderUpperCase)); - - private string _header; - - /// - /// Gets or sets a brush with which to paint the Header background. - /// - public IBrush HeaderBackground - { - get { return GetValue(HeaderBackgroundProperty); } - set { SetValue(HeaderBackgroundProperty, value); } - } - - /// - /// Gets or sets a brush with which to paint the Header text. - /// - public IBrush HeaderForeground - { - get { return GetValue(HeaderForegroundProperty); } - set { SetValue(HeaderForegroundProperty, value); } - } - - /// - /// Gets or sets a margin for the header text. - /// - public Thickness HeaderMargin - { - get { return GetValue(HeaderMarginProperty); } - set { SetValue(HeaderMarginProperty, value); } - } - - /// - /// Gets or sets if the header text should be converted to upper-case - /// - public bool HeaderUpperCase - { - get { return GetValue(HeaderUpperCaseProperty); } - set { SetValue(HeaderUpperCaseProperty, value); } - } - - /// - /// Gets or sets header text - /// - public string Header - { - get { return _header; } - set { SetAndRaise(HeaderProperty, ref _header, value); } - } - - Type IStyleable.StyleKey => typeof(GroupBox); - - public GroupBox() - { - InitializeComponent(); - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - } -} +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; + +namespace Teast.Controls +{ + public partial class GroupBox : UserControl + { + /// + /// Defines the property. + /// + public static readonly DirectProperty HeaderProperty = + AvaloniaProperty.RegisterDirect( + nameof(Header), + o => o.Header, + (o, v) => o.Header = o.HeaderUpperCase ? v?.ToUpperInvariant() : v); + + /// + /// Defines the property. + /// + public static readonly StyledProperty HeaderBackgroundProperty = + AvaloniaProperty.Register(nameof(HeaderBackground)); + + /// + /// Defines the property. + /// + public static readonly StyledProperty HeaderForegroundProperty = + AvaloniaProperty.Register(nameof(HeaderForeground)); + + /// + /// Defines the property. + /// + public static readonly StyledProperty HeaderMarginProperty = + AvaloniaProperty.Register(nameof(HeaderMargin)); + + /// + /// Defines the property. + /// + public static readonly StyledProperty HeaderUpperCaseProperty = + AvaloniaProperty.Register(nameof(HeaderUpperCase)); + + private string _header; + + /// + /// Gets or sets a brush with which to paint the Header background. + /// + public IBrush HeaderBackground + { + get { return GetValue(HeaderBackgroundProperty); } + set { SetValue(HeaderBackgroundProperty, value); } + } + + /// + /// Gets or sets a brush with which to paint the Header text. + /// + public IBrush HeaderForeground + { + get { return GetValue(HeaderForegroundProperty); } + set { SetValue(HeaderForegroundProperty, value); } + } + + /// + /// Gets or sets a margin for the header text. + /// + public Thickness HeaderMargin + { + get { return GetValue(HeaderMarginProperty); } + set { SetValue(HeaderMarginProperty, value); } + } + + /// + /// Gets or sets if the header text should be converted to upper-case + /// + public bool HeaderUpperCase + { + get { return GetValue(HeaderUpperCaseProperty); } + set { SetValue(HeaderUpperCaseProperty, value); } + } + + /// + /// Gets or sets header text + /// + public string Header + { + get { return _header; } + set { SetAndRaise(HeaderProperty, ref _header, value); } + } + + public GroupBox() + { + InitializeComponent(); + } + } +} diff --git a/GroupBox/GroupBox.csproj b/GroupBox/GroupBox.csproj index 210cbf5..bb3c38d 100644 --- a/GroupBox/GroupBox.csproj +++ b/GroupBox/GroupBox.csproj @@ -7,21 +7,25 @@ Teast.Controls.GroupBox Niklas Jansson Niklas Jansson - Copyright © 2018-2020 + Copyright © 2018-2023 https://github.com/teast/Avalonia.GroupBox - Implements an GroupBox-like component for AvalonioUI - Avalonia AvalonioUI GroupBox control - 1.2.1-preview5 + https://github.com/teast/Avalonia.GroupBox + true + true + snupkg + ..\README.md + Implements a GroupBox-like control for AvaloniaUI + Avalonia AvaloniaUI GroupBox control + 2.0.0-rc2.2 - - %(Filename) - - + + Designer - + + - \ No newline at end of file + diff --git a/GroupBox/GroupBox.xaml b/GroupBox/GroupBox.xaml deleted file mode 100644 index c9baf0c..0000000 --- a/GroupBox/GroupBox.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/GroupBox/Themes/Default.xaml b/GroupBox/Themes/Default.axaml similarity index 64% rename from GroupBox/Themes/Default.xaml rename to GroupBox/Themes/Default.axaml index ce5ef7f..db2806e 100644 --- a/GroupBox/Themes/Default.xaml +++ b/GroupBox/Themes/Default.axaml @@ -4,13 +4,13 @@ xmlns:teast="clr-namespace:Teast.Controls"> - \ No newline at end of file + diff --git a/Sample/App.xaml b/Sample/App.axaml similarity index 79% rename from Sample/App.xaml rename to Sample/App.axaml index 005da4f..28ace5f 100644 --- a/Sample/App.xaml +++ b/Sample/App.axaml @@ -3,11 +3,11 @@ xmlns:teast="clr-namespace:Teast.Controls;assembly=Teast.Controls.GroupBox" x:Class="Sample.App"> - - + + diff --git a/Sample/App.xaml.cs b/Sample/App.axaml.cs similarity index 91% rename from Sample/App.xaml.cs rename to Sample/App.axaml.cs index 54e275a..c2b4405 100644 --- a/Sample/App.xaml.cs +++ b/Sample/App.axaml.cs @@ -4,13 +4,13 @@ namespace Sample { - public class App : Application + public partial class App : Application { public override void Initialize() { AvaloniaXamlLoader.Load(this); } - + public override void OnFrameworkInitializationCompleted() { if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) @@ -20,5 +20,5 @@ public override void OnFrameworkInitializationCompleted() base.OnFrameworkInitializationCompleted(); } - } -} \ No newline at end of file + } +} diff --git a/Sample/MainWindow.xaml b/Sample/MainWindow.axaml similarity index 100% rename from Sample/MainWindow.xaml rename to Sample/MainWindow.axaml diff --git a/Sample/MainWindow.axaml.cs b/Sample/MainWindow.axaml.cs new file mode 100644 index 0000000..56c0797 --- /dev/null +++ b/Sample/MainWindow.axaml.cs @@ -0,0 +1,12 @@ +using Avalonia.Controls; + +namespace Sample +{ + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/Sample/MainWindow.xaml.cs b/Sample/MainWindow.xaml.cs deleted file mode 100644 index 770d1a5..0000000 --- a/Sample/MainWindow.xaml.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace Sample -{ - public class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } - } -} \ No newline at end of file diff --git a/Sample/Program.cs b/Sample/Program.cs index 479269c..1241d53 100644 --- a/Sample/Program.cs +++ b/Sample/Program.cs @@ -1,4 +1,4 @@ -using Avalonia; +using Avalonia; namespace Sample { @@ -10,6 +10,6 @@ static void Main(string[] args) => BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() - .LogToDebug(); + .LogToTrace(); } } diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj index 5ac3ecc..081489a 100644 --- a/Sample/Sample.csproj +++ b/Sample/Sample.csproj @@ -1,21 +1,14 @@ - + WinExe - netcoreapp3.0 + net6.0 - - %(Filename) - - - Designer - - - - - + + + - \ No newline at end of file + diff --git a/Sample/nuget.config b/Sample/nuget.config deleted file mode 100644 index 7c07e22..0000000 --- a/Sample/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file