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

VSTHRD114: Do not return null from non-async Task method #596

Merged
merged 14 commits into from
Apr 19, 2020
Merged

VSTHRD114: Do not return null from non-async Task method #596

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d97aae5
VSTHRD112: Do not return null from non-async Task method
Evangelink Mar 27, 2020
59b7c8f
Fix broken tests
Evangelink Mar 27, 2020
145d9a1
Merge branch 'master' into task-return-null
Evangelink Apr 2, 2020
4018631
Address review comments
Evangelink Apr 2, 2020
e8e21a7
Rename analyzer + fix styling error
Evangelink Apr 2, 2020
a985e83
Add code fix
Evangelink Apr 2, 2020
b7bed63
Add sharwell's lightup for nullables
Evangelink Apr 2, 2020
7506a3d
Update to roslyn 3.3 to allow nullable enable in tests
Evangelink Apr 2, 2020
ac398e4
Do not report on nullable enable context
Evangelink Apr 2, 2020
3ec3615
Apply suggestions from code review
Evangelink Apr 3, 2020
63f5194
Address review comments
Evangelink Apr 16, 2020
5b8b2b8
Merge branch 'master' into task-return-null
Evangelink Apr 16, 2020
d3f9efc
Fix merge conflicts
Evangelink Apr 16, 2020
d827da7
Remove light-ups to get tests working
AArnott Apr 18, 2020
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
21 changes: 11 additions & 10 deletions src/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/CSharpCodeFixVerifier`2+Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,38 @@ public Test()

this.SolutionTransforms.Add((solution, projectId) =>
{
var parseOptions = (CSharpParseOptions)solution.GetProject(projectId).ParseOptions;
solution = solution.WithProjectParseOptions(projectId, parseOptions.WithLanguageVersion(LanguageVersion.CSharp7_1));
Project? project = solution.GetProject(projectId);

var parseOptions = (CSharpParseOptions)project!.ParseOptions;
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
project = project.WithParseOptions(parseOptions.WithLanguageVersion(LanguageVersion.CSharp7_1));

if (this.HasEntryPoint)
{
var compilationOptions = solution.GetProject(projectId).CompilationOptions;
solution = solution.WithProjectCompilationOptions(projectId, compilationOptions.WithOutputKind(OutputKind.ConsoleApplication));
project = project.WithCompilationOptions(project.CompilationOptions.WithOutputKind(OutputKind.ConsoleApplication));
}

if (this.IncludeMicrosoftVisualStudioThreading)
{
solution = solution.AddMetadataReference(projectId, MetadataReference.CreateFromFile(typeof(JoinableTaskFactory).Assembly.Location));
project = project.AddMetadataReference(MetadataReference.CreateFromFile(typeof(JoinableTaskFactory).Assembly.Location));
}

if (this.IncludeWindowsBase)
{
solution = solution.AddMetadataReference(projectId, MetadataReference.CreateFromFile(typeof(Dispatcher).Assembly.Location));
project = project.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dispatcher).Assembly.Location));
}

if (this.IncludeVisualStudioSdk)
{
solution = solution.AddMetadataReference(projectId, MetadataReference.CreateFromFile(typeof(IOleServiceProvider).Assembly.Location));
project = project.AddMetadataReference(MetadataReference.CreateFromFile(typeof(IOleServiceProvider).Assembly.Location));

var nugetPackagesFolder = Environment.CurrentDirectory;
foreach (var reference in VSSDKPackageReferences)
foreach (var reference in CSharpCodeFixVerifier<TAnalyzer, TCodeFix>.Test.VSSDKPackageReferences)
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
{
solution = solution.AddMetadataReference(projectId, MetadataReference.CreateFromFile(Path.Combine(nugetPackagesFolder, reference)));
project = project.AddMetadataReference(MetadataReference.CreateFromFile(Path.Combine(nugetPackagesFolder, reference)));
}
}

return solution;
return project.Solution;
});

this.TestState.AdditionalFilesFactories.Add(() =>
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.VisualStudio.Threading.Analyzers.Tests/Lightup/LightupHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ ImmutableArray<SymbolDisplayPart> ISymbol.ToMinimalDisplayParts(SemanticModel se

string ISymbol.ToMinimalDisplayString(SemanticModel semanticModel, int position, SymbolDisplayFormat format)
=> throw new NotImplementedException();

public bool Equals(ISymbol other, SymbolEqualityComparer equalityComparer) => throw new NotImplementedException();
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
2 changes: 1 addition & 1 deletion ...lStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20059.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20059.2" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.3.0" />
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6070" />
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" IncludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" IncludeAssets="runtime" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD003UseJtfRunAsyncAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ static Task<bool> MyMethodAsync()
{
var projectA = solution.AddProject("ProjectA", "ProjectA", LanguageNames.CSharp)
.WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
.WithMetadataReferences(solution.GetProject(projectId).MetadataReferences.Concat(test!.TestState.AdditionalReferences))
.WithMetadataReferences(solution.GetProject(projectId)!.MetadataReferences.Concat(test!.TestState.AdditionalReferences))
.AddDocument("SpecialTasks.cs", specialTasksCs).Project;
solution = projectA.Solution;
solution = solution.AddProjectReference(projectId, new ProjectReference(projectA.Id));
Expand Down