-
Notifications
You must be signed in to change notification settings - Fork 420
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
Require a known good version of .NET SDK be installed. #2302
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,7 +72,7 @@ Try updating your MSBuild to version {minimumMSBuildVersion} or higher to enable | |
} | ||
else | ||
{ | ||
logger.LogError("Could not locate MSBuild instance to register with OmniSharp"); | ||
throw new MSBuildNotFoundException("Could not locate MSBuild instance to register with OmniSharp."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Further loading isn't useful and clutters the output. |
||
} | ||
} | ||
|
||
|
19 changes: 19 additions & 0 deletions
19
src/OmniSharp.Host/MSBuild/Discovery/MSBuildNotFoundException.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using System; | ||
|
||
namespace OmniSharp.MSBuild.Discovery | ||
{ | ||
internal class MSBuildNotFoundException : Exception | ||
{ | ||
public MSBuildNotFoundException() | ||
{ | ||
} | ||
|
||
public MSBuildNotFoundException(string message) : base(message) | ||
{ | ||
} | ||
|
||
public MSBuildNotFoundException(string message, Exception innerException) : base(message, innerException) | ||
{ | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,9 +22,17 @@ public override ImmutableArray<MSBuildInstance> GetInstances() | |
{ | ||
|
||
#if NETCOREAPP | ||
const string DotNetSdkVersion = "6.0.100"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be easy to find and replace this version string. |
||
|
||
// Restrict instances to NET 6 SDK | ||
var instances = MicrosoftBuildLocator.QueryVisualStudioInstances() | ||
.Where(instance => instance.Version.Major == 6); | ||
.Where(instance => instance.Version.ToString() == DotNetSdkVersion) | ||
.ToImmutableArray(); | ||
|
||
if (instances.Length == 0) | ||
{ | ||
Logger.LogError($"OmniSharp requires .NET SDK version '{DotNetSdkVersion}' be installed. Please visit https://dotnet.microsoft.com/download/dotnet/6.0 to download the .NET SDK."); | ||
} | ||
#else | ||
if (!PlatformHelper.IsWindows) | ||
{ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can make this a unique exit code.