Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[0.11.7]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.6...v0.11.7

[0.11.6]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.5...v0.11.6

[0.11.5]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.4...v0.11.5

[0.11.4]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.3...v0.11.4

[0.11.3]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.2...v0.11.3

[0.11.2]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.1...v0.11.2

[0.11.1]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.11.0...v0.11.1

[0.11.0]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.10.0...v0.11.0

[0.10.0]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.9.6...v0.10.0

[0.9.6]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.9.5...v0.9.6

[0.9.5]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.9.4...v0.9.5

Expand All @@ -128,7 +121,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[0.9.0]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.8.0...v0.9.0

[0.8.0]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.7.0...v0.8.0

[0.7.0]: https://github.com/TJC-Tools/TJC.GUI/compare/v0.6.0...v0.7.0

Expand Down
219 changes: 116 additions & 103 deletions SampleGUIApplication/SampleGUIApplication.csproj
Original file line number Diff line number Diff line change
@@ -1,108 +1,121 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- DETAILS -->
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyTitle>Sample GUI Application</AssemblyTitle>
<Copyright>
Copyright © 2024 Tyler Carrol - All rights reserved.
This software is proprietary and confidential. Unauthorized use, reproduction, or distribution is prohibited.
<!-- DETAILS -->
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyTitle>Sample GUI Application</AssemblyTitle>
<Copyright>
Copyright © 2024 Tyler Carrol - All rights reserved.
This software is proprietary and confidential. Unauthorized use, reproduction, or distribution is prohibited.
</Copyright>
<AssemblyVersion>1.2.3.4</AssemblyVersion>
</PropertyGroup>
<!-- INCLUDED FILES -->
<ItemGroup>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\CHANGELOG.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\CHANGELOG.md" />
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\LICENSE" />
<None Include="..\THIRD-PARTY-LICENSES">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\THIRD-PARTY-LICENSES" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.2" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
<PackageReference Include="Material.Avalonia" Version="3.7.4" />
<PackageReference Include="TJC.ConsoleApplication" Version="0.14.3" />
</ItemGroup>
<!-- DEPENDENCIES -->
<ItemGroup>
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
</ItemGroup>
<!-- TASKS -->
<UsingTask TaskName="ReadFileContent" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<ParameterGroup>
<FilePath ParameterType="System.String" Required="true" />
<Content Output="true" ParameterType="System.String" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Content = File.ReadAllText(FilePath);
<AssemblyVersion>1.2.3.4</AssemblyVersion>
</PropertyGroup>
<!-- INCLUDED FILES -->
<ItemGroup>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\CHANGELOG.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\CHANGELOG.md" />
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\LICENSE" />
<None Include="..\THIRD-PARTY-LICENSES">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<EmbeddedResource Include="..\THIRD-PARTY-LICENSES" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.2" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
<PackageReference Include="Material.Avalonia" Version="3.7.4" />
<PackageReference Include="TJC.ConsoleApplication" Version="0.14.3" />
</ItemGroup>
<!-- DEPENDENCIES -->
<ItemGroup>
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
</ItemGroup>
<!-- TASKS -->
<UsingTask
TaskName="ReadFileContent"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<FilePath ParameterType="System.String" Required="true" />
<Content Output="true" ParameterType="System.String" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Content = File.ReadAllText(FilePath);
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="AppendNewLineAndFile" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<ParameterGroup>
<File1 ParameterType="System.String" Required="true" />
<File2 ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
</Code>
</Task>
</UsingTask>
<UsingTask
TaskName="AppendNewLineAndFile"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<File1 ParameterType="System.String" Required="true" />
<File2 ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
]]>
</Code>
</Task>
</UsingTask>
<!-- PRE-PACK -->
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
<!-- Store the original contents of the license file -->
<ReadFileContent FilePath="..\LICENSE">
<Output TaskParameter="Content" PropertyName="OriginalLicenseLines" />
</ReadFileContent>
<CallTarget Targets="AppendThirdPartyLicensesToLicenseFile" />
</Target>
<Target Name="AppendThirdPartyLicensesToLicenseFile">
<Message Text="Append Third-Party Licenses to License File" Importance="high" />
<AppendNewLineAndFile File1="..\LICENSE" File2="..\THIRD-PARTY-LICENSES" />
</Target>
<!-- POST-PACK -->
<Target Name="CustomCleanup" AfterTargets="Pack">
<Message Text="=== CUSTOM CLEANUP ===" Importance="high" />
<CallTarget Targets="RestoreLicenseFile" />
</Target>
<!-- Cleanup License File -->
<Target Name="RestoreLicenseFile">
<Message Text="Restore License File Contents" Importance="high" />
<WriteLinesToFile File="..\LICENSE" Lines="$(OriginalLicenseLines)" Overwrite="true" Encoding="UTF-8" />
</Target>
</Code>
</Task>
</UsingTask>
<!-- PRE-PACK -->
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
<!-- Store the original contents of the license file -->
<ReadFileContent FilePath="..\LICENSE">
<Output TaskParameter="Content" PropertyName="OriginalLicenseLines" />
</ReadFileContent>
<CallTarget Targets="AppendThirdPartyLicensesToLicenseFile" />
</Target>
<Target Name="AppendThirdPartyLicensesToLicenseFile">
<Message Text="Append Third-Party Licenses to License File" Importance="high" />
<AppendNewLineAndFile File1="..\LICENSE" File2="..\THIRD-PARTY-LICENSES" />
</Target>
<!-- POST-PACK -->
<Target Name="CustomCleanup" AfterTargets="Pack">
<Message Text="=== CUSTOM CLEANUP ===" Importance="high" />
<CallTarget Targets="RestoreLicenseFile" />
</Target>
<!-- Cleanup License File -->
<Target Name="RestoreLicenseFile">
<Message Text="Restore License File Contents" Importance="high" />
<WriteLinesToFile
File="..\LICENSE"
Lines="$(OriginalLicenseLines)"
Overwrite="true"
Encoding="UTF-8"
/>
</Target>
</Project>
5 changes: 0 additions & 5 deletions TJC.GUI.Tests/TJC.GUI.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -17,13 +15,10 @@
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
</ItemGroup>

</Project>
41 changes: 27 additions & 14 deletions TJC.GUI/TJC.GUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,40 +56,48 @@
</Compile>
</ItemGroup>
<!-- TASKS -->
<UsingTask TaskName="ReadFileContent" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<UsingTask
TaskName="ReadFileContent"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<FilePath ParameterType="System.String" Required="true" />
<Content Output="true" ParameterType="System.String" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Content = File.ReadAllText(FilePath);
<![CDATA[
Content = File.ReadAllText(FilePath);
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="AppendNewLineAndFile" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<UsingTask
TaskName="AppendNewLineAndFile"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<File1 ParameterType="System.String" Required="true" />
<File2 ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
]]>
</Code>
</Task>
</UsingTask>
</UsingTask>
<!-- PRE-PACK -->
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
Expand All @@ -111,6 +119,11 @@
<!-- Cleanup License File -->
<Target Name="RestoreLicenseFile">
<Message Text="Restore License File Contents" Importance="high" />
<WriteLinesToFile File="..\LICENSE" Lines="$(OriginalLicenseLines)" Overwrite="true" Encoding="UTF-8" />
<WriteLinesToFile
File="..\LICENSE"
Lines="$(OriginalLicenseLines)"
Overwrite="true"
Encoding="UTF-8"
/>
</Target>
</Project>
Loading