diff --git a/Weingartner.Json.Migration.Build/Weingartner.Json.Migration.Build.fsproj b/Weingartner.Json.Migration.Build/Weingartner.Json.Migration.Build.fsproj index 1b9a83b..32df292 100644 --- a/Weingartner.Json.Migration.Build/Weingartner.Json.Migration.Build.fsproj +++ b/Weingartner.Json.Migration.Build/Weingartner.Json.Migration.Build.fsproj @@ -13,7 +13,7 @@ - + diff --git a/Weingartner.Json.Migration.Roslyn.Spec/Helpers/CodeFixVerifier.cs b/Weingartner.Json.Migration.Roslyn.Spec/Helpers/CodeFixVerifier.cs index ebc6813..931fe14 100644 --- a/Weingartner.Json.Migration.Roslyn.Spec/Helpers/CodeFixVerifier.cs +++ b/Weingartner.Json.Migration.Roslyn.Spec/Helpers/CodeFixVerifier.cs @@ -176,7 +176,7 @@ private void VerifyFix(string language, DiagnosticAnalyzer analyzer, CodeFixProv document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace)); newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document)); - Assert.True(false, + Assert.Fail( string.Format("Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n", string.Join("\r\n", newCompilerDiagnostics.Select(d => d.ToString())), document.GetSyntaxRootAsync().Result.ToFullString())); diff --git a/Weingartner.Json.Migration.Roslyn.Spec/Helpers/DiagnosticVerifier.cs b/Weingartner.Json.Migration.Roslyn.Spec/Helpers/DiagnosticVerifier.cs index 4048f30..517e3af 100644 --- a/Weingartner.Json.Migration.Roslyn.Spec/Helpers/DiagnosticVerifier.cs +++ b/Weingartner.Json.Migration.Roslyn.Spec/Helpers/DiagnosticVerifier.cs @@ -307,7 +307,7 @@ private static void VerifyDiagnosticResults(IEnumerable actualResult { string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : " NONE."; - Assert.True(false, + Assert.Fail( string.Format("Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput)); } @@ -320,7 +320,7 @@ private static void VerifyDiagnosticResults(IEnumerable actualResult { if (actual.Location != Location.None) { - Assert.True(false, + Assert.Fail( string.Format("Expected:\nA project diagnostic with No location\nActual:\n{0}", FormatDiagnostics(analyzer, actual))); } @@ -332,7 +332,7 @@ private static void VerifyDiagnosticResults(IEnumerable actualResult if (additionalLocations.Length != expected.Locations.Length - 1) { - Assert.True(false, + Assert.Fail( string.Format("Expected {0} additional locations but got {1} for Diagnostic:\r\n {2}\r\n", expected.Locations.Length - 1, additionalLocations.Length, FormatDiagnostics(analyzer, actual))); @@ -346,21 +346,21 @@ private static void VerifyDiagnosticResults(IEnumerable actualResult if (actual.Id != expected.Id) { - Assert.True(false, + Assert.Fail( string.Format("Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Id, actual.Id, FormatDiagnostics(analyzer, actual))); } if (actual.Severity != expected.Severity) { - Assert.True(false, + Assert.Fail( string.Format("Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Severity, actual.Severity, FormatDiagnostics(analyzer, actual))); } if (actual.GetMessage() != expected.Message) { - Assert.True(false, + Assert.Fail( string.Format("Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Message, actual.GetMessage(), FormatDiagnostics(analyzer, actual))); } @@ -389,7 +389,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno { if (actualLinePosition.Line + 1 != expected.Line) { - Assert.True(false, + Assert.Fail( string.Format("Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Line, actualLinePosition.Line + 1, FormatDiagnostics(analyzer, diagnostic))); } @@ -400,7 +400,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno { if (actualLinePosition.Character + 1 != expected.Column) { - Assert.True(false, + Assert.Fail( string.Format("Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Column, actualLinePosition.Character + 1, FormatDiagnostics(analyzer, diagnostic))); } diff --git a/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj b/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj index ed2970c..d4a8c37 100644 --- a/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj +++ b/Weingartner.Json.Migration.Roslyn.Spec/Weingartner.Json.Migration.Roslyn.Spec.csproj @@ -8,12 +8,12 @@ False - - + + - + - + all runtime; build; native; contentfiles; analyzers diff --git a/Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj b/Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj index 6decea9..36ed508 100644 --- a/Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj +++ b/Weingartner.Json.Migration.Roslyn/Weingartner.Json.Migration.Roslyn.csproj @@ -11,8 +11,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj b/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj index 97a1046..41beb80 100644 --- a/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj +++ b/Weingartner.Json.Migration.Spec/Weingartner.Json.Migration.Spec.csproj @@ -8,20 +8,20 @@ False - - - + + + - + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers