diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj b/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj
index 51fa026fe1e..a3a27c56b09 100644
--- a/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj
+++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj
@@ -19,6 +19,9 @@
+
+ PreserveNewest
+
diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs
index 4a82bed3d48..ca37d954819 100644
--- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs
+++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs
@@ -16,6 +16,8 @@ public class Test : CSharpAnalyzerTest
public List Analyzers => analyzers;
public Test ()
{
+ ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies;
+
SolutionTransforms.Add ((solution, projectId) => {
var project = solution.GetProject (projectId);
var compilationOptions = project.CompilationOptions;
diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs
index 310409b7090..141f5934b28 100644
--- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs
+++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs
@@ -11,6 +11,8 @@ public class Test : CSharpCodeFixTest
{
public Test ()
{
+ ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies;
+
SolutionTransforms.Add ((solution, projectId) => {
var compilationOptions = solution.GetProject (projectId).CompilationOptions;
compilationOptions = compilationOptions.WithSpecificDiagnosticOptions (
@@ -22,4 +24,3 @@ public Test ()
}
}
}
-
diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs
index 7beb164e48f..5e1db64cb44 100644
--- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs
+++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs
@@ -8,6 +8,8 @@ public class Test : CSharpCodeRefactoringTest
{
public Test ()
{
+ ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies;
+
SolutionTransforms.Add ((solution, projectId) => {
var compilationOptions = solution.GetProject (projectId).CompilationOptions;
compilationOptions = compilationOptions.WithSpecificDiagnosticOptions (
diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs
index bdeb56f1724..3a2b1eae3ac 100644
--- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs
+++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs
@@ -1,10 +1,15 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Testing;
using System;
using System.Collections.Immutable;
+using System.IO;
internal static class CSharpVerifierHelper
{
+ internal static ReferenceAssemblies DefaultReferenceAssemblies { get; } =
+ ReferenceAssemblies.Default.WithNuGetConfigFilePath (Path.Combine (AppContext.BaseDirectory, "NuGet.config"));
+
///
/// By default, the compiler reports diagnostics for nullable reference types at
/// , and the analyzer test framework defaults to only validating