Skip to content

Conversation

@scphantm
Copy link
Contributor

I added recursion breakout if it goes 50 levels deep

@scphantm
Copy link
Contributor Author

addresses #2864

@scphantm
Copy link
Contributor Author

My dev machine is a Mac so I'm unable to run .net6 in either rider or VStudioMac yet. Since the code was already refactored for net6, i had to checkout the 5.7.0 tag and apply my changes there. Thats the latest version i was able to run on my machine. Someone with Windows is going to have to resolve the merge conflicts as i can't run that code at all.

@arturcic arturcic closed this Oct 19, 2021
@arturcic arturcic reopened this Oct 19, 2021
@asbjornu
Copy link
Member

Seems like you've made this PR off a fairly old revision of main. Can you please rebase to HEAD of main so we get rid of the merge conflicts?

@scphantm
Copy link
Contributor Author

My dev machine is a Mac so I'm unable to run .net6 in either rider or VStudioMac yet. Since the code was already refactored for net6, i had to checkout the 5.7.0 tag and apply my changes there. Thats the latest version i was able to run on my machine. Someone with Windows is going to have to resolve the merge conflicts as i can't run that code at all.

@scphantm
Copy link
Contributor Author

i can try, but no promises. net6 really fubar'd rider

@asbjornu
Copy link
Member

Is it possible to temporarily disable .NET 6 to be able to build the project?

# Conflicts:
#	src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
#	src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
#	src/GitVersion.Core/Core/GitVersionContextFactory.cs
@scphantm
Copy link
Contributor Author

no, you refactored the code. 100% not backward compatible. I just had rider merge, anyones guess if it builds because i can't build it on my local anymore

@scphantm
Copy link
Contributor Author

you are going to have to fix whatever is wrong. its well beyond me until rider releases .net6 support which they said they won't until .net6 goes GA

@arturcic
Copy link
Member

@scphantm you can install the latest EAP of the Rider, that one does support the .net 6.0 (that's how I did the .net 6 PR).

@scphantm
Copy link
Contributor Author

@arturcic , sorry, not happening. I can't afford to risk blowing up the other 30 or so other projects i work on any given day for net6 when i don't have to worry about net6 for at least another 6 months. Above is the code. Pull it and tweak it, copy/paste it, ignore it. do as you like. I've spent as much time on this as i can afford.

@arturcic
Copy link
Member

@scphantm I can understand that. I will see if we can find some time to check the changes you've done.
One thing to note though is you can have multiple .net sdk installed on a PC, and you can control which one is used for a specific project using global.json -> that means you can have .net 6 rc2 installed side by side with those sdk you already have for the other projects. Second thing. I use Jetrains ToolBox and am able to install the Rider version that I work for other projects that does not support .net6 (same as you have), and side by side I installed the EAP version that does support .net 6. So it's possible

@hymccord
Copy link
Contributor

You don't have to run with rider. This repo is quite simple to use with dotnet build on the command line.

{
using (this.log.IndentLog("Attempting to inherit branch configuration from parent branch"))
{
recursiveLevel += 1;
Copy link

Choose a reason for hiding this comment

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

check i tinker that we should take an approach view about the margin right in the issue

@asbjornu asbjornu mentioned this pull request Mar 2, 2022
5 tasks
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.

5 participants