Skip to content

Revert "Pin .NET to 6.0.302 and 3.1.27 (#1878)" #1884

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

Merged
merged 2 commits into from
Aug 18, 2022
Merged

Revert "Pin .NET to 6.0.302 and 3.1.27 (#1878)" #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da55e8f
Revert "Pin .NET to 6.0.302 and 3.1.27 (#1878)"
andyleejordan Aug 12, 2022
e55f54f
Skip failing completion tests on Windows PowerShell
andyleejordan Aug 18, 2022
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
4 changes: 2 additions & 2 deletions .vsts-ci/templates/ci-general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ steps:
displayName: Install .NET 6.0.x SDK
inputs:
packageType: sdk
version: 6.0.302
version: 6.0.x
performMultiLevelLookup: true

- task: UseDotNet@2
displayName: Install .NET 3.1.x runtime
inputs:
packageType: runtime
version: 3.1.27
version: 3.1.x
performMultiLevelLookup: true

- task: PowerShell@2
Expand Down
7 changes: 4 additions & 3 deletions test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ public async Task CompletesCommandFromModule()
Assert.StartsWith(CompleteCommandFromModule.GetRandomDetail, actual.Detail);
}

[Fact]
[SkippableFact]
public async Task CompletesTypeName()
{
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
if (VersionUtils.IsNetCore)
Expand All @@ -91,10 +92,10 @@ public async Task CompletesTypeName()
}
}

[Trait("Category", "Completions")]
[Fact]
[SkippableFact]
public async Task CompletesNamespace()
{
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);
CompletionItem actual = Assert.Single(results);
Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);
Expand Down