Skip to content

Commit

Permalink
fix: incorrect ChartWindow size; trim packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Illusion2-1 committed Nov 20, 2023
1 parent 04ca005 commit 5b9ab72
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
29 changes: 13 additions & 16 deletions AppUsageMonitor/AppUsageMonitor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<None Include="bg\background.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<AvaloniaResource Include="Assets\**"/>
<AvaloniaResource Include="Assets\**" />
<None Update="bg\black.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -24,31 +24,28 @@


<ItemGroup>
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1"/>
<PackageReference Include="Avalonia" Version="11.0.2"/>
<PackageReference Include="Avalonia.Desktop" Version="11.0.2"/>
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.2"/>
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.2"/>
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
<PackageReference Include="Avalonia" Version="11.0.2" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.2" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.2"/>
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2"/>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.0"/>
<PackageReference Include="EPPlus" Version="7.0.0"/>
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc2"/>
<PackageReference Include="Material.Avalonia" Version="3.0.2.44-nightly"/>
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2" />
<PackageReference Include="EPPlus" Version="7.0.0" />
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc2" />
<PackageReference Include="Material.Avalonia" Version="3.0.2.44-nightly" />
<PackageReference Include="NSubsys" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Data.SQLite" Version="1.0.118"/>
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
</ItemGroup>
<UsingTask TaskName="NSubsys.Tasks.NSubsys" AssemblyFile="$(NSubsysTasksPath)"/>
<UsingTask TaskName="NSubsys.Tasks.NSubsys" AssemblyFile="$(NSubsysTasksPath)" />

<Target Name="CustomAfterBuild" AfterTargets="Build" Condition="$(RuntimeIdentifier.StartsWith('win'))">
<NSubsys TargetFile="$(OutputPath)$(AssemblyName)$(_NativeExecutableExtension)"/>
<NSubsys TargetFile="$(OutputPath)$(AssemblyName)$(_NativeExecutableExtension)" />
</Target>

<Target Name="CustomAfterPublish" AfterTargets="Publish" Condition="$(RuntimeIdentifier.StartsWith('win'))">
<NSubsys TargetFile="$(PublishDir)$(AssemblyName)$(_NativeExecutableExtension)"/>
<NSubsys TargetFile="$(PublishDir)$(AssemblyName)$(_NativeExecutableExtension)" />
</Target>
</Project>
5 changes: 4 additions & 1 deletion AppUsageMonitor/Views/ChartWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
xmlns:viewModels="clr-namespace:AppUsageMonitor.ViewModels"
mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="250" SizeToContent="WidthAndHeight" CanResize="False"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Width="800"
Height="450"
CanResize="true"
x:Class="AppUsageMonitor.Views.ChartWindow"
x:DataType="viewModels:ChartWindowViewModel"
Title="ChartWindow">
Expand Down

0 comments on commit 5b9ab72

Please sign in to comment.