Skip to content

Commit 19345bf

Browse files
authored
🧹 chore: [MegaLinter] Apply [1] automatic fixes (#115)
Co-authored-by: TylerCarrol <25536704+TylerCarrol@users.noreply.github.com>
1 parent 760904d commit 19345bf

4 files changed

Lines changed: 143 additions & 130 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
9898

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Lines changed: 116 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,121 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<!-- DETAILS -->
3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<Nullable>enable</Nullable>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<AssemblyTitle>Sample GUI Application</AssemblyTitle>
9-
<Copyright>
10-
Copyright © 2024 Tyler Carrol - All rights reserved.
11-
This software is proprietary and confidential. Unauthorized use, reproduction, or distribution is prohibited.
2+
<!-- DETAILS -->
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<AssemblyTitle>Sample GUI Application</AssemblyTitle>
9+
<Copyright>
10+
Copyright © 2024 Tyler Carrol - All rights reserved.
11+
This software is proprietary and confidential. Unauthorized use, reproduction, or distribution is prohibited.
1212
</Copyright>
13-
<AssemblyVersion>1.2.3.4</AssemblyVersion>
14-
</PropertyGroup>
15-
<!-- INCLUDED FILES -->
16-
<ItemGroup>
17-
<None Include="..\README.md">
18-
<Pack>True</Pack>
19-
<PackagePath>\</PackagePath>
20-
</None>
21-
<None Include="..\CHANGELOG.md">
22-
<Pack>True</Pack>
23-
<PackagePath>\</PackagePath>
24-
</None>
25-
<EmbeddedResource Include="..\CHANGELOG.md" />
26-
<None Include="..\LICENSE">
27-
<Pack>True</Pack>
28-
<PackagePath>\</PackagePath>
29-
</None>
30-
<EmbeddedResource Include="..\LICENSE" />
31-
<None Include="..\THIRD-PARTY-LICENSES">
32-
<Pack>True</Pack>
33-
<PackagePath>\</PackagePath>
34-
</None>
35-
<EmbeddedResource Include="..\THIRD-PARTY-LICENSES" />
36-
</ItemGroup>
37-
<ItemGroup>
38-
<PackageReference Include="Avalonia" Version="11.2.2" />
39-
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
40-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
41-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
42-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
43-
<PackageReference Include="Material.Avalonia" Version="3.7.4" />
44-
<PackageReference Include="TJC.ConsoleApplication" Version="0.14.3" />
45-
</ItemGroup>
46-
<!-- DEPENDENCIES -->
47-
<ItemGroup>
48-
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
49-
</ItemGroup>
50-
<!-- TASKS -->
51-
<UsingTask TaskName="ReadFileContent" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
52-
<ParameterGroup>
53-
<FilePath ParameterType="System.String" Required="true" />
54-
<Content Output="true" ParameterType="System.String" />
55-
</ParameterGroup>
56-
<Task>
57-
<Using Namespace="System.IO" />
58-
<Code Type="Fragment" Language="cs">
59-
<![CDATA[
60-
Content = File.ReadAllText(FilePath);
13+
<AssemblyVersion>1.2.3.4</AssemblyVersion>
14+
</PropertyGroup>
15+
<!-- INCLUDED FILES -->
16+
<ItemGroup>
17+
<None Include="..\README.md">
18+
<Pack>True</Pack>
19+
<PackagePath>\</PackagePath>
20+
</None>
21+
<None Include="..\CHANGELOG.md">
22+
<Pack>True</Pack>
23+
<PackagePath>\</PackagePath>
24+
</None>
25+
<EmbeddedResource Include="..\CHANGELOG.md" />
26+
<None Include="..\LICENSE">
27+
<Pack>True</Pack>
28+
<PackagePath>\</PackagePath>
29+
</None>
30+
<EmbeddedResource Include="..\LICENSE" />
31+
<None Include="..\THIRD-PARTY-LICENSES">
32+
<Pack>True</Pack>
33+
<PackagePath>\</PackagePath>
34+
</None>
35+
<EmbeddedResource Include="..\THIRD-PARTY-LICENSES" />
36+
</ItemGroup>
37+
<ItemGroup>
38+
<PackageReference Include="Avalonia" Version="11.2.2" />
39+
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
40+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
41+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
42+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
43+
<PackageReference Include="Material.Avalonia" Version="3.7.4" />
44+
<PackageReference Include="TJC.ConsoleApplication" Version="0.14.3" />
45+
</ItemGroup>
46+
<!-- DEPENDENCIES -->
47+
<ItemGroup>
48+
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
49+
</ItemGroup>
50+
<!-- TASKS -->
51+
<UsingTask
52+
TaskName="ReadFileContent"
53+
TaskFactory="RoslynCodeTaskFactory"
54+
AssemblyName="Microsoft.Build.Tasks.Core"
55+
>
56+
<ParameterGroup>
57+
<FilePath ParameterType="System.String" Required="true" />
58+
<Content Output="true" ParameterType="System.String" />
59+
</ParameterGroup>
60+
<Task>
61+
<Using Namespace="System.IO" />
62+
<Code Type="Fragment" Language="cs">
63+
<![CDATA[
64+
Content = File.ReadAllText(FilePath);
6165
]]>
62-
</Code>
63-
</Task>
64-
</UsingTask>
65-
<UsingTask TaskName="AppendNewLineAndFile" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
66-
<ParameterGroup>
67-
<File1 ParameterType="System.String" Required="true" />
68-
<File2 ParameterType="System.String" Required="true" />
69-
</ParameterGroup>
70-
<Task>
71-
<Using Namespace="System.IO" />
72-
<Code Type="Fragment" Language="cs">
73-
<![CDATA[
74-
var text = Environment.NewLine;
75-
text += "===========================================================";
76-
text += Environment.NewLine;
77-
text += Environment.NewLine;
78-
text += File.ReadAllText(File2);
79-
text += Environment.NewLine;
80-
File.AppendAllText(File1, text);
66+
</Code>
67+
</Task>
68+
</UsingTask>
69+
<UsingTask
70+
TaskName="AppendNewLineAndFile"
71+
TaskFactory="RoslynCodeTaskFactory"
72+
AssemblyName="Microsoft.Build.Tasks.Core"
73+
>
74+
<ParameterGroup>
75+
<File1 ParameterType="System.String" Required="true" />
76+
<File2 ParameterType="System.String" Required="true" />
77+
</ParameterGroup>
78+
<Task>
79+
<Using Namespace="System.IO" />
80+
<Code Type="Fragment" Language="cs">
81+
<![CDATA[
82+
var text = Environment.NewLine;
83+
text += "===========================================================";
84+
text += Environment.NewLine;
85+
text += Environment.NewLine;
86+
text += File.ReadAllText(File2);
87+
text += Environment.NewLine;
88+
File.AppendAllText(File1, text);
8189
]]>
82-
</Code>
83-
</Task>
84-
</UsingTask>
85-
<!-- PRE-PACK -->
86-
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
87-
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
88-
<!-- Store the original contents of the license file -->
89-
<ReadFileContent FilePath="..\LICENSE">
90-
<Output TaskParameter="Content" PropertyName="OriginalLicenseLines" />
91-
</ReadFileContent>
92-
<CallTarget Targets="AppendThirdPartyLicensesToLicenseFile" />
93-
</Target>
94-
<Target Name="AppendThirdPartyLicensesToLicenseFile">
95-
<Message Text="Append Third-Party Licenses to License File" Importance="high" />
96-
<AppendNewLineAndFile File1="..\LICENSE" File2="..\THIRD-PARTY-LICENSES" />
97-
</Target>
98-
<!-- POST-PACK -->
99-
<Target Name="CustomCleanup" AfterTargets="Pack">
100-
<Message Text="=== CUSTOM CLEANUP ===" Importance="high" />
101-
<CallTarget Targets="RestoreLicenseFile" />
102-
</Target>
103-
<!-- Cleanup License File -->
104-
<Target Name="RestoreLicenseFile">
105-
<Message Text="Restore License File Contents" Importance="high" />
106-
<WriteLinesToFile File="..\LICENSE" Lines="$(OriginalLicenseLines)" Overwrite="true" Encoding="UTF-8" />
107-
</Target>
90+
</Code>
91+
</Task>
92+
</UsingTask>
93+
<!-- PRE-PACK -->
94+
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
95+
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
96+
<!-- Store the original contents of the license file -->
97+
<ReadFileContent FilePath="..\LICENSE">
98+
<Output TaskParameter="Content" PropertyName="OriginalLicenseLines" />
99+
</ReadFileContent>
100+
<CallTarget Targets="AppendThirdPartyLicensesToLicenseFile" />
101+
</Target>
102+
<Target Name="AppendThirdPartyLicensesToLicenseFile">
103+
<Message Text="Append Third-Party Licenses to License File" Importance="high" />
104+
<AppendNewLineAndFile File1="..\LICENSE" File2="..\THIRD-PARTY-LICENSES" />
105+
</Target>
106+
<!-- POST-PACK -->
107+
<Target Name="CustomCleanup" AfterTargets="Pack">
108+
<Message Text="=== CUSTOM CLEANUP ===" Importance="high" />
109+
<CallTarget Targets="RestoreLicenseFile" />
110+
</Target>
111+
<!-- Cleanup License File -->
112+
<Target Name="RestoreLicenseFile">
113+
<Message Text="Restore License File Contents" Importance="high" />
114+
<WriteLinesToFile
115+
File="..\LICENSE"
116+
Lines="$(OriginalLicenseLines)"
117+
Overwrite="true"
118+
Encoding="UTF-8"
119+
/>
120+
</Target>
108121
</Project>
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
65
<Nullable>enable</Nullable>
76
<IsPackable>false</IsPackable>
87
<IsTestProject>true</IsTestProject>
98
</PropertyGroup>
10-
119
<ItemGroup>
1210
<PackageReference Include="coverlet.collector" Version="6.0.2">
1311
<PrivateAssets>all</PrivateAssets>
@@ -17,13 +15,10 @@
1715
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
1816
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
1917
</ItemGroup>
20-
2118
<ItemGroup>
2219
<ProjectReference Include="..\TJC.GUI\TJC.GUI.csproj" />
2320
</ItemGroup>
24-
2521
<ItemGroup>
2622
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
2723
</ItemGroup>
28-
2924
</Project>

‎TJC.GUI/TJC.GUI.csproj‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,40 +56,48 @@
5656
</Compile>
5757
</ItemGroup>
5858
<!-- TASKS -->
59-
<UsingTask TaskName="ReadFileContent" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
59+
<UsingTask
60+
TaskName="ReadFileContent"
61+
TaskFactory="RoslynCodeTaskFactory"
62+
AssemblyName="Microsoft.Build.Tasks.Core"
63+
>
6064
<ParameterGroup>
6165
<FilePath ParameterType="System.String" Required="true" />
6266
<Content Output="true" ParameterType="System.String" />
6367
</ParameterGroup>
6468
<Task>
6569
<Using Namespace="System.IO" />
6670
<Code Type="Fragment" Language="cs">
67-
<![CDATA[
68-
Content = File.ReadAllText(FilePath);
71+
<![CDATA[
72+
Content = File.ReadAllText(FilePath);
6973
]]>
7074
</Code>
7175
</Task>
7276
</UsingTask>
73-
<UsingTask TaskName="AppendNewLineAndFile" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
77+
<UsingTask
78+
TaskName="AppendNewLineAndFile"
79+
TaskFactory="RoslynCodeTaskFactory"
80+
AssemblyName="Microsoft.Build.Tasks.Core"
81+
>
7482
<ParameterGroup>
7583
<File1 ParameterType="System.String" Required="true" />
7684
<File2 ParameterType="System.String" Required="true" />
7785
</ParameterGroup>
7886
<Task>
7987
<Using Namespace="System.IO" />
8088
<Code Type="Fragment" Language="cs">
81-
<![CDATA[
82-
var text = Environment.NewLine;
83-
text += "===========================================================";
84-
text += Environment.NewLine;
85-
text += Environment.NewLine;
86-
text += File.ReadAllText(File2);
87-
text += Environment.NewLine;
88-
File.AppendAllText(File1, text);
89+
<![CDATA[
90+
var text = Environment.NewLine;
91+
text += "===========================================================";
92+
text += Environment.NewLine;
93+
text += Environment.NewLine;
94+
text += File.ReadAllText(File2);
95+
text += Environment.NewLine;
96+
File.AppendAllText(File1, text);
8997
]]>
9098
</Code>
9199
</Task>
92-
</UsingTask>
100+
</UsingTask>
93101
<!-- PRE-PACK -->
94102
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
95103
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
@@ -111,6 +119,11 @@
111119
<!-- Cleanup License File -->
112120
<Target Name="RestoreLicenseFile">
113121
<Message Text="Restore License File Contents" Importance="high" />
114-
<WriteLinesToFile File="..\LICENSE" Lines="$(OriginalLicenseLines)" Overwrite="true" Encoding="UTF-8" />
122+
<WriteLinesToFile
123+
File="..\LICENSE"
124+
Lines="$(OriginalLicenseLines)"
125+
Overwrite="true"
126+
Encoding="UTF-8"
127+
/>
115128
</Target>
116129
</Project>

0 commit comments

Comments
 (0)