Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .NET 6 #29

Merged
merged 23 commits into from
Feb 9, 2022
Merged

Conversation

wiggleforlife
Copy link
Contributor

@wiggleforlife wiggleforlife commented Jan 11, 2022

See Nikolai558/NASR2SCT#127
Pretty much the same as my previous PR, except:

  • Updated to .NET 6 instead of 5 (requires VS2022 or another IDE that supports it)
  • Includes a Squirrel fork

Microsoft aims for a .NET MAUI RC in Q1 and a final release in Q2.

Changes

  • Ran the .NET Conversion Assistant
  • Removed old imports and the App.config
  • Added an application manifest to the UI for the Squirrel packing system
  • Replaced Squirrel.Windows with Clowd.Squirrel
  • Added a function to create the desktop and Start Menu shortcuts
  • Rewrote instructions to publish a release

@Nikolai558 Nikolai558 self-requested a review January 11, 2022 22:29
Copy link
Owner

@Nikolai558 Nikolai558 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good!

I would be willing to pull this into the dev branch as soon as you mark it completed. The only thing I would want to test and verify is the Updater (from framework to core) as well as (core to core)

@wiggleforlife
Copy link
Contributor Author

wiggleforlife commented Jan 11, 2022 via email

@caesay
Copy link
Contributor

caesay commented Jan 12, 2022

Just a note about Clowd.Squirrel and updating from Framework to Core, this should work from a Squirrel.Windows->Clowd.Squirrel perspective, but there is additional consideration about managing the new runtime dependency.

You can publish your app as self-contained if that's suitable (thus bundling all your required dependencies) or alternatively, take care to install .net 6 yourself (using the new Squirrel runtime API's) before updating to a version that requires it. If you choose to do the latter, you should ship a release on Framework using Clowd.Squirrel as described in the issue you linked before updating to net6.

@caesay
Copy link
Contributor

caesay commented Jan 12, 2022

Regarding the missing shortcuts, at the top of Program.cs, you need to add SquirrelAwareApp.HandleEvents(() => new UpdateManager(null).CreateShortcutForThisExe()) or similar.

Another note about Program.cs:StartNewVersion() is that you can use UpdateManager.RestartApp() to automatically restart the latest version of the currently executing binary.

@wiggleforlife wiggleforlife marked this pull request as ready for review January 12, 2022 19:58
Copy link
Owner

@Nikolai558 Nikolai558 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments.

PublishReleaseInstructions.md Outdated Show resolved Hide resolved
PublishReleaseInstructions.md Outdated Show resolved Hide resolved
FeBuddyWinFormUI/Program.cs Outdated Show resolved Hide resolved
@caesay
Copy link
Contributor

caesay commented Feb 2, 2022

@wiggleforlife I have taken a stab at making some improvements in my branch here https://github.com/caesay/FE-BUDDY/commits/dotnet6 - there is only two things todo yet, which is to write a build script that trims the publish assemblies (eg. WPF) so that FE-BUDDY releases can be smaller, and get delta updates working. I'll have a look at this soon.

@wiggleforlife
Copy link
Contributor Author

@caesay Thanks for all of this, you're being an absolutely massive help. I was going to look into replacing this with Squirrel's GitHub update system as well in the future, but since you're already doing it this makes everything a lot easier. Thanks again!

Copy link
Owner

@Nikolai558 Nikolai558 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are amazing changes, thank you both for your help with this. I have created pull requests to move it into the dotnet6 branch on my repo. I will probably merge that branch into dev then release a new version here soon.

@Nikolai558 Nikolai558 merged commit bc952e4 into Nikolai558:development Feb 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants