Update Godot's .NET version from 6.0 to 8.0

[AR-DEV-1]

I have updated Godot's .NET version from 6.0 to 8.0 as my security software which I use for scanning repos, Aikido Security was warning me that this was "critical" & needed to be done right away.
The files which needed to be updated were:
/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj
/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj

All of them were updated to .NET 8.0 with lang version 12

[AR-DEV-1]

If you need any changes, feel free to ping me

[AR-DEV-1]

I'm contacting the security team at Godot for another issue

[AR-DEV-1]

I have sent a message to the security team, please check it out. It's critical according to Akikido, won't provide any details here.

[AR-DEV-1]

@AThousandShips

[AR-DEV-1]

Please check out the mail I've sent, I don't know the security team

[AThousandShips]

I'm not on any such team, please join the contributor chat instead and ask there

Also please edit previous comments instead of making several comments in a row, it creates a lot of unnecessary pings

[paulloz]

I seem to have missed these projects in #92131. Good catch.

[AR-DEV-1]

Will this be merged soon then?

[AR-DEV-1]

@paulloz When can these changes be merged then? Also, what do you think of the message I sent regarding OS.cs?

[AThousandShips]

Before anything can be merged you need to squash your commits into one, see the interactive rebase for details, if this is time critical that would be good to do now

[AR-DEV-1]

Okay! Thanks for the tip

[AR-DEV-1]

Hey! I wanted to say that I ACCIDENTLY did these changes via the web editor. Do I need to do it now or should I just redo the process locally?

[AR-DEV-1]

Rebased it @AThousandShips

[AThousandShips]

You need to squash the commits still, there should be exactly one

[AR-DEV-1]

So, what else do I do now?

[AThousandShips]

You should probably reset your branch and do the changes over, with a new clean commit, do:

git reset --hard upstream master

Then make your changes again, commit with a new commit with a short message, and then force push with

git push --force

[AThousandShips]

You should rebase onto the upstream master instead, you can fix by:

git reset --hard HEAD~
git rebase upstream/master

[AR-DEV-1]

Everything that I changed?

[AThousandShips]

No you should do git reset --hard HEAD~ which drops the Merge branch 'godotengine:master' into master commit, and then rebase onto master instead of creating a merge commit

But that's probably not necessary if your branch isn't too behind

[AR-DEV-1]

Did it, though now it's saying:

[AR-DEV-1]

@AThousandShips Any thoughts on what to do now? Also, I'm sorry for being a bit annoying & pinging you again & again. I haven't actually worked with such large-scale projects (my only large-scale projects were Assimp & PhysX)

[AThousandShips]

It's fine it doesn't have to be perfectly synced, it's fine now, but to make it sync properly you probably just need to do git fetch upstream to update your version of the upstream branch

[AR-DEV-1]

I guess I should just do it from the web editor, I get this from git;

fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

[AR-DEV-1]

Did it now, feel free to merge! Also, thanks a lot for your help AThousandShips

[AThousandShips]

You merged again, you should remove the last commit again and just leave it as it was before, use:

git reset --hard HEAD~
git push --force

[AR-DEV-1]

Now I hope it's good

[paulloz]

This is probably fine to merge, and cherry-pick to 4.5 (and 4.4?), but I currently don't have a VS install on hand to test it.

[AR-DEV-1]

I tested it locally & seemed to work. Still, we need the user's opinion. If it'll work, they might not create an issue. If it won't, they'll make an issue. If you already added 8.0 in some parts of the mono backend, doesn't this mean that this shouldn't create any issues? Also, I think you should cherry-pick to both 4.5 & 4.4

[AR-DEV-1]

@paulloz Requesting your review

[AR-DEV-1]

Can I get any info to when this'll be merged? I also want to try & tackle something else

[AR-DEV-1]

@paulloz Please tell me when this'll be merged, my branch is becoming outdated

[AR-DEV-1]

Can I get a review on this? My branch is becoming outdated & the .NET team maintainers aren't responding. My main worry is that my branch may have conflicts with the main branch & git is a confusing thing.

[akien-mga]

@AR-DEV-1 Please stop spamming contributors, this is not acceptable behavior.

PRs are merged once approved by maintainers and handled by the production team. This can take a while.

You don't need this PR merged to start new work, you can make a new branch on your fork. In the future, please avoid making PRs from your fork's master branch.

[AR-DEV-1]

I'm sorry, shouldn't have done that.