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.

Sign up for GitHub

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

Jump to bottom

Sdk element improvements #225

Merged
merged 6 commits into from
May 9, 2024
Merged

Sdk element improvements #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf51407
Support MinimumVersion attribute on Sdk element
mhutch May 3, 2024
fe1b5c8
Add tests for Import version attribute validation
mhutch May 3, 2024
7c29bd6
Add diagnostic for redundant MinimumVersion
mhutch May 3, 2024
7f50c21
Add diagnostic for misleading Sdk element ordering
mhutch May 3, 2024
571d861
Support Sdk elements and improve SDK imports
mhutch May 9, 2024
2884f6c
Refactoring and nullability
mhutch May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MonoDevelop.MSBuild.Editor/Completion/MSBuildCompletionSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Task<List<CompletionItem>> GetSdkCompletions (MSBuildRootDocument doc, Cancellat
AddSdksFromDir (sdksPath);
}

var dotNetSdk = doc.Environment.ResolveSdk (("Microsoft.NET.Sdk", null, null), null, null, Logger);
var dotNetSdk = doc.Environment.ResolveSdk (new ("Microsoft.NET.Sdk", null, null), null, null, Logger);
if (dotNetSdk?.Path is string sdkPath) {
string dotNetSdkPath = Path.GetDirectoryName (Path.GetDirectoryName (sdkPath));
if (sdksPath == null || Path.GetFullPath (dotNetSdkPath) != Path.GetFullPath (sdksPath)) {
Expand Down
3 changes: 1 addition & 2 deletions MonoDevelop.MSBuild.Tests.Editor/Mocks/TestMSBuildEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class TestMSBuildEnvironment (MSBuildEnvironmentLogger environmentLogger) : Curr
// However, suppress resolution of Microsoft.NET.SDK so tests don't use the SDK fallback.
// The SDK fallback substantially slows down the tests and is not necessary for the tests,
// and different versions of the SDK may introduce unexpected values from inference.
public override SdkInfo ResolveSdk ((string name, string version, string minimumVersion) sdk, string projectFile, string solutionPath, ILogger logger = null)
=> null;
public override SdkInfo ResolveSdk (MSBuildSdkReference sdk, string projectFile, string solutionPath, ILogger logger = null) => null;
}
}
2 changes: 1 addition & 1 deletion MonoDevelop.MSBuild.Tests.Editor/Refactorings/MSBuildEditorTestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static async Task<CodeFixesWithContext> GetCodeFixes (
logger ??= TestLoggerFactory.CreateTestMethodLogger ().RethrowExceptions ();

var snapshot = textView.TextBuffer.CurrentSnapshot;
var diagnostics = MSBuildDocumentTest.GetDiagnostics (snapshot.GetText (), out var parsedDocument, analyzers, includeCoreDiagnostics, logger, schema, null, cancellationToken);
var diagnostics = MSBuildDocumentTest.GetDiagnostics (snapshot.GetText (), out var parsedDocument, analyzers, includeCoreDiagnostics, logger, schema, cancellationToken: cancellationToken);

var codeFixService = new MSBuildCodeFixService (codeFixes.ToArray ());
var fixes = await codeFixService.GetFixes (textView.TextBuffer, parsedDocument, diagnostics, range, requestedSeverities, cancellationToken);
Expand Down
Loading
Loading