Skip to content

Commit

Permalink
Systemic Cleanup (mattpannella#231)
Browse files Browse the repository at this point in the history
* Refactor and Restructure

- Cleaned up dead code
- Standardized namespaces
- Organized file structure
- Split up Program.cs to make it easier to read
- Refactored the code removing redundancies
- Renamed some files for consistency
- Standardized code format
- Updated to .net 7.0
- Moved the command line options classes into separate files
- Allowed reference types to be null & updated code accordingly (Disabled the new "feature" .NET added that throws warnings when reference types are set to null. The intent of the feature is to reduce the null reference exceptions. Turning this off removed about 200 warnings and annoying messages and visual cues in the editors.)

I think that's it?
The diff is going to be hard to read and follow on this unfortunately.

* Removed async/await from methods where it would be synchronous anyway

* Manually merged in latest changes from Upstream Main

* Suppressed the JSON de/serialization warning as they aren't relevant

* fixed bad logic

* sponsor links are in arrays for some

* tweaked sponsor link helper

* formatting

* String->string

* Moved SponsorLinksHelper logic to ToString overload on model

* Little bit more clean up

* skip nulls
removed unnecessary extra line break

* not sure how this got added..

---------

Co-authored-by: Matt Pannella <[email protected]>
  • Loading branch information
hallem and mattpannella authored Feb 5, 2024
1 parent f0abb1f commit d5d753c
Show file tree
Hide file tree
Showing 83 changed files with 3,012 additions and 2,666 deletions.
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/bin/Debug/net6.0/pupdate.dll",
"program": "${workspaceFolder}/bin/Debug/net7.0/pupdate.dll",
"args": ["-p", "/Users/mattpannella/pocket-test"],
"cwd": "${workspaceFolder}",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
Expand Down
5 changes: 3 additions & 2 deletions pupdate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
<PublishTrimmed>true</PublishTrimmed>
<OutputType>Exe</OutputType>
<PublishSingleFile>true</PublishSingleFile>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Nullable>disable</Nullable>
<Version>3.2.1</Version>
<Description>Keep your Analogue Pocket up to date</Description>
<Copyright>2024 Matt Pannella</Copyright>
<Authors>Matt Pannella</Authors>
<Product>Pupdate</Product>
<RepositoryUrl>https://github.com/mattpannella/pocket-updater-utility</RepositoryUrl>
<RootNamespace>Pannella</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
Expand Down
14 changes: 0 additions & 14 deletions src/Factory.cs

This file was deleted.

Loading

0 comments on commit d5d753c

Please sign in to comment.