diff --git a/src/CodeFormatter/CodeFormatter.csproj b/src/CodeFormatter/CodeFormatter.csproj index 65892f7a..c003ecc6 100644 --- a/src/CodeFormatter/CodeFormatter.csproj +++ b/src/CodeFormatter/CodeFormatter.csproj @@ -22,32 +22,32 @@ True - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -77,7 +77,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/CodeFormatter/FormatOptions.cs b/src/CodeFormatter/FormatOptions.cs index 73bab6af..b3615ef1 100644 --- a/src/CodeFormatter/FormatOptions.cs +++ b/src/CodeFormatter/FormatOptions.cs @@ -37,6 +37,7 @@ internal class CommandLineOptions [Option( 'l', "lang", + Default = "C#", HelpText = "Specifies the language to use when a response file is specified, e.g., 'C#', 'Visual Basic', ... (default: 'C#').")] public string Language { get; set; } diff --git a/src/CodeFormatter/Program.cs b/src/CodeFormatter/Program.cs index db618ea2..ee2fe52e 100644 --- a/src/CodeFormatter/Program.cs +++ b/src/CodeFormatter/Program.cs @@ -138,10 +138,10 @@ private static int RunCommand(CommandLineOptions options, bool applyCodeFixes) { } } - private static ImmutableArray LoadAnalyzersFromAssembly(string path, bool throwIfNoAnalyzersFound) + private static ImmutableArray LoadAnalyzersFromAssembly(string path, string language, bool throwIfNoAnalyzersFound) { var analyzerRef = new AnalyzerFileReference(path, new BasicAnalyzerAssemblyLoader()); - var newAnalyzers = analyzerRef.GetAnalyzersForAllLanguages(); + var newAnalyzers = analyzerRef.GetAnalyzers(language); if (newAnalyzers.Count() == 0 && throwIfNoAnalyzersFound) { throw new Exception(String.Format("Specified analyzer assembly {0} contained no analyzers", analyzerRef.GetAssembly().FullName)); @@ -150,29 +150,32 @@ private static ImmutableArray LoadAnalyzersFromAssembly(stri } // Expects a list of paths to files or directories of DLLs containing analyzers and adds them to the engine - internal static ImmutableArray AddCustomAnalyzers(IFormattingEngine engine, ImmutableArray analyzerList) + internal static ImmutableArray AddCustomAnalyzers(IFormattingEngine engine, ImmutableArray analyzerList, string language) { foreach (var analyzerPath in analyzerList) { if (File.Exists(analyzerPath)) { - var newAnalyzers = LoadAnalyzersFromAssembly(analyzerPath, true); + var newAnalyzers = LoadAnalyzersFromAssembly(analyzerPath, language, true); engine.AddAnalyzers(newAnalyzers); return newAnalyzers; } else if (Directory.Exists(analyzerPath)) { var DLLs = Directory.GetFiles(analyzerPath, "*.dll"); + var allAnalyzers = ImmutableArray.CreateBuilder(); foreach (var dll in DLLs) { // allows specifying a folder that contains analyzers as well as non-analyzer DLLs without throwing - var newAnalyzers = LoadAnalyzersFromAssembly(dll, false); + var newAnalyzers = LoadAnalyzersFromAssembly(dll, language, false); if (newAnalyzers.Count() > 0) { engine.AddAnalyzers(newAnalyzers); + allAnalyzers.AddRange(newAnalyzers); } - return newAnalyzers; } + + return allAnalyzers.ToImmutable(); } } @@ -198,7 +201,7 @@ private static async Task RunAsync(CommandLineOptions options, Cancellation if (options.TargetAnalyzers != null && options.TargetAnalyzerText != null && options.TargetAnalyzerText.Count() > 0) { - AddCustomAnalyzers(engine, options.TargetAnalyzerText); + AddCustomAnalyzers(engine, options.TargetAnalyzerText, options.Language); } // Analyzers will hydrate rule enabled/disabled settings diff --git a/src/CodeFormatter/packages.config b/src/CodeFormatter/packages.config index 8a79098e..4497a65e 100644 --- a/src/CodeFormatter/packages.config +++ b/src/CodeFormatter/packages.config @@ -1,14 +1,14 @@  - + - - - - - - + + + + + + @@ -18,7 +18,7 @@ - + diff --git a/src/DeadRegions/DeadRegions.csproj b/src/DeadRegions/DeadRegions.csproj index 13dc3a12..ac3d01a3 100644 --- a/src/DeadRegions/DeadRegions.csproj +++ b/src/DeadRegions/DeadRegions.csproj @@ -12,32 +12,32 @@ - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -68,7 +68,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/DeadRegions/packages.config b/src/DeadRegions/packages.config index fabdbe28..70714a70 100644 --- a/src/DeadRegions/packages.config +++ b/src/DeadRegions/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/Microsoft.DotNet.CodeFormatter.Analyzers.Tests.csproj b/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/Microsoft.DotNet.CodeFormatter.Analyzers.Tests.csproj index 743d9f7b..e3e8f43b 100644 --- a/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/Microsoft.DotNet.CodeFormatter.Analyzers.Tests.csproj +++ b/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/Microsoft.DotNet.CodeFormatter.Analyzers.Tests.csproj @@ -15,32 +15,32 @@ ..\packages\CommandLineParser.2.0.273-beta\lib\net45\CommandLine.dll True - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -71,7 +71,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/packages.config b/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/packages.config index 8a79098e..4497a65e 100644 --- a/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/packages.config +++ b/src/Microsoft.DotNet.CodeFormatter.Analyzers.Tests/packages.config @@ -1,14 +1,14 @@  - + - - - - - - + + + + + + @@ -18,7 +18,7 @@ - + diff --git a/src/Microsoft.DotNet.CodeFormatter.Analyzers/Microsoft.DotNet.CodeFormatter.Analyzers.csproj b/src/Microsoft.DotNet.CodeFormatter.Analyzers/Microsoft.DotNet.CodeFormatter.Analyzers.csproj index c4d5c899..2ff7fcc9 100644 --- a/src/Microsoft.DotNet.CodeFormatter.Analyzers/Microsoft.DotNet.CodeFormatter.Analyzers.csproj +++ b/src/Microsoft.DotNet.CodeFormatter.Analyzers/Microsoft.DotNet.CodeFormatter.Analyzers.csproj @@ -17,32 +17,32 @@ ..\packages\CommandLineParser.2.0.273-beta\lib\net45\CommandLine.dll True - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -72,7 +72,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.CodeFormatter.Analyzers/packages.config b/src/Microsoft.DotNet.CodeFormatter.Analyzers/packages.config index 8a79098e..4497a65e 100644 --- a/src/Microsoft.DotNet.CodeFormatter.Analyzers/packages.config +++ b/src/Microsoft.DotNet.CodeFormatter.Analyzers/packages.config @@ -1,14 +1,14 @@  - + - - - - - - + + + + + + @@ -18,7 +18,7 @@ - + diff --git a/src/Microsoft.DotNet.CodeFormatting.Tests/FormattingEngineCreationTests.cs b/src/Microsoft.DotNet.CodeFormatting.Tests/FormattingEngineCreationTests.cs index daa0be99..afb6a535 100644 --- a/src/Microsoft.DotNet.CodeFormatting.Tests/FormattingEngineCreationTests.cs +++ b/src/Microsoft.DotNet.CodeFormatting.Tests/FormattingEngineCreationTests.cs @@ -34,7 +34,7 @@ public void AnalyzersBuiltAgainstRoslynV100() { IFormattingEngine engine = FormattingEngine.Create(DefaultCompositionAssemblies); Assert.DoesNotThrow(() => { - var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV100Analyzer)); + var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV100Analyzer), "C#"); Assert.Equal(1, analyzers.Count()); }); } @@ -44,7 +44,7 @@ public void AnalyzersBuiltAgainstRoslynV110() { IFormattingEngine engine = FormattingEngine.Create(DefaultCompositionAssemblies); Assert.DoesNotThrow(() => { - var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV110Analyzer)); + var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV110Analyzer), "C#"); Assert.Equal(1, analyzers.Count()); }); } @@ -54,7 +54,7 @@ public void AnalyzersBuiltAgainstRoslynV111() { IFormattingEngine engine = FormattingEngine.Create(DefaultCompositionAssemblies); Assert.DoesNotThrow(() => { - var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV111Analyzer)); + var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV111Analyzer), "C#"); Assert.Equal(1, analyzers.Count()); }); } @@ -64,7 +64,7 @@ public void AnalyzersBuiltAgainstRoslynV120Beta1() { IFormattingEngine engine = FormattingEngine.Create(DefaultCompositionAssemblies); Assert.DoesNotThrow(() => { - var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV120Beta1Analyzer)); + var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV120Beta1Analyzer), "C#"); Assert.Equal(1, analyzers.Count()); }); } @@ -74,7 +74,7 @@ public void AnalyzersBuiltAgainstRoslynV120() { IFormattingEngine engine = FormattingEngine.Create(DefaultCompositionAssemblies); Assert.DoesNotThrow(() => { - var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV120VBAnalyzer)); + var analyzers = Program.AddCustomAnalyzers(engine, ImmutableArray.Create(RoslynV120VBAnalyzer), "VB"); Assert.Equal(1, analyzers.Count()); }); } diff --git a/src/Microsoft.DotNet.CodeFormatting.Tests/Microsoft.DotNet.CodeFormatting.Tests.csproj b/src/Microsoft.DotNet.CodeFormatting.Tests/Microsoft.DotNet.CodeFormatting.Tests.csproj index a99fbfb1..40fe57c2 100644 --- a/src/Microsoft.DotNet.CodeFormatting.Tests/Microsoft.DotNet.CodeFormatting.Tests.csproj +++ b/src/Microsoft.DotNet.CodeFormatting.Tests/Microsoft.DotNet.CodeFormatting.Tests.csproj @@ -18,32 +18,32 @@ ..\packages\CommandLineParser.2.0.273-beta\lib\net45\CommandLine.dll True - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -74,7 +74,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.CodeFormatting.Tests/packages.config b/src/Microsoft.DotNet.CodeFormatting.Tests/packages.config index 6ba47189..8d0b97df 100644 --- a/src/Microsoft.DotNet.CodeFormatting.Tests/packages.config +++ b/src/Microsoft.DotNet.CodeFormatting.Tests/packages.config @@ -1,14 +1,14 @@  - + - - - - - - + + + + + + @@ -18,7 +18,7 @@ - + diff --git a/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs b/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs index 205a275d..4d89a559 100644 --- a/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs +++ b/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs @@ -107,12 +107,17 @@ public void LogDiagnostics(string filePath, ImmutableArray diagnosti _outputLogger = Activator.CreateInstance( _loggerAssembly.GetType("Microsoft.CodeAnalysis.ErrorLogger"), - new object[] { new FileStream(filePath, FileMode.Append, FileAccess.Write), "CodeFormatter", "0.1", _loggerAssembly.GetName().Version }); - - var logDiagMethodInfo = _outputLogger.GetType().GetMethod("LogDiagnostic", BindingFlags.NonPublic | BindingFlags.Instance); + new object[] { + new FileStream(filePath, FileMode.Append, FileAccess.Write), + "CodeFormatter", + "0.1", + _loggerAssembly.GetName().Version, + Thread.CurrentThread.CurrentCulture }); + + var logDiagMethodInfo = _outputLogger.GetType().GetMethod("LogDiagnostic", BindingFlags.Public | BindingFlags.Instance); foreach (var diagnostic in diagnostics) { - logDiagMethodInfo.Invoke(_outputLogger, new object[] { diagnostic, System.Globalization.CultureInfo.DefaultThreadCurrentCulture }); + logDiagMethodInfo.Invoke(_outputLogger, new object[] { diagnostic, }); } ((IDisposable)_outputLogger).Dispose(); @@ -238,63 +243,73 @@ public async Task FormatProjectWithAnalyzersAsync(Project project, CancellationT var workspace = project.Solution.Workspace; - await FormatProjectWithSyntaxAnalyzersAsync(workspace, project.Id, cancellationToken); - await FormatProjectWithLocalAnalyzersAsync(workspace, project.Id, cancellationToken); - await FormatProjectWithGlobalAnalyzersAsync(workspace, project.Id, cancellationToken); - await FormatProjectWithUnspecifiedAnalyzersAsync(workspace, project.Id, cancellationToken); - + var syntaxDiagnostics = await FormatProjectWithSyntaxAnalyzersAsync(workspace, project.Id, cancellationToken); + var localDiagnostics = await FormatProjectWithLocalAnalyzersAsync(workspace, project.Id, cancellationToken); + var globalDiagnostics = await FormatProjectWithGlobalAnalyzersAsync(workspace, project.Id, cancellationToken); + var unspecifiedDiagnostics = await FormatProjectWithUnspecifiedAnalyzersAsync(workspace, project.Id, cancellationToken); + var projectDiagnostics = syntaxDiagnostics.Concat(localDiagnostics).Concat(globalDiagnostics).Concat(unspecifiedDiagnostics); + + var extension = StringComparer.OrdinalIgnoreCase.Equals(project.Language, "C#") ? ".csproj" : ".vbproj"; + var resultFile = project.FilePath.Substring(project.FilePath.LastIndexOf(Path.DirectorySeparatorChar)).Replace(extension, "_CodeFormatterResults.txt"); + var resultPath = Path.ChangeExtension(LogOutputPath + resultFile, "json"); + LogDiagnostics(resultPath, projectDiagnostics.ToImmutableArray()); + watch.Stop(); FormatLogger.WriteLine("Total time for formatting {0} - {1}", project.Name, watch.Elapsed); } - private async Task FormatProjectWithSyntaxAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) + private async Task> FormatProjectWithSyntaxAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) { var analyzers = _analyzers.Where(a => a.SupportedDiagnostics.All(d => d.CustomTags.Contains(RuleType.Syntactic))); - await FormatWithAnalyzersCoreAsync(workspace, projectId, analyzers, cancellationToken); + return await FormatWithAnalyzersCoreAsync(workspace, projectId, analyzers, cancellationToken); } - private async Task FormatProjectWithLocalAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) + private async Task> FormatProjectWithLocalAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) { var analyzers = _analyzers.Where(a => a.SupportedDiagnostics.All(d => d.CustomTags.Contains(RuleType.LocalSemantic))); - await FormatWithAnalyzersCoreAsync(workspace, projectId, analyzers, cancellationToken); + return await FormatWithAnalyzersCoreAsync(workspace, projectId, analyzers, cancellationToken); } - private async Task FormatProjectWithGlobalAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) + private async Task> FormatProjectWithGlobalAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) { var analyzers = _analyzers.Where(a => a.SupportedDiagnostics.All(d => d.CustomTags.Contains(RuleType.GlobalSemantic))); + var diagnostics = ImmutableArray.CreateBuilder(); // Since global analyzers can potentially conflict with each other, run them one by one. foreach (var analyzer in analyzers) { - await FormatWithAnalyzersCoreAsync(workspace, projectId, new[] { analyzer }, cancellationToken); + var analyzerDiagnostics = await FormatWithAnalyzersCoreAsync(workspace, projectId, new[] { analyzer }, cancellationToken); + diagnostics.AddRange(analyzerDiagnostics); } + return diagnostics.ToImmutableArray(); } - private async Task FormatProjectWithUnspecifiedAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) + private async Task> FormatProjectWithUnspecifiedAnalyzersAsync(Workspace workspace, ProjectId projectId, CancellationToken cancellationToken) { var analyzers = _analyzers.Where(a => a.SupportedDiagnostics.All(d => { return !(d.CustomTags.Contains(RuleType.Syntactic) || d.CustomTags.Contains(RuleType.LocalSemantic) || d.CustomTags.Contains(RuleType.GlobalSemantic)); })); + var diagnostics = ImmutableArray.CreateBuilder(); // Treat analyzers with unknown rule types as if they were global in case they might conflict with each other foreach (var analyzer in analyzers) { - await FormatWithAnalyzersCoreAsync(workspace, projectId, new[] { analyzer }, cancellationToken); + var analyzerDiagnostics = await FormatWithAnalyzersCoreAsync(workspace, projectId, new[] { analyzer }, cancellationToken); + diagnostics.AddRange(analyzerDiagnostics); } + return diagnostics.ToImmutableArray(); } - private async Task FormatWithAnalyzersCoreAsync(Workspace workspace, ProjectId projectId, IEnumerable analyzers, CancellationToken cancellationToken) + private async Task> FormatWithAnalyzersCoreAsync(Workspace workspace, ProjectId projectId, IEnumerable analyzers, CancellationToken cancellationToken) { if (analyzers != null && analyzers.Count() != 0) { var project = workspace.CurrentSolution.GetProject(projectId); var diagnostics = await GetDiagnostics(project, analyzers, cancellationToken).ConfigureAwait(false); + var diagnosticsToLog = ImmutableArray.CreateBuilder(); // Ensure at least 1 analyzer supporting the current project's language ran if (_compilationWithAnalyzers != null) { - var extension = StringComparer.OrdinalIgnoreCase.Equals(project.Language, "C#") ? ".csproj" : ".vbproj"; - var resultFile = project.FilePath.Substring(project.FilePath.LastIndexOf(Path.DirectorySeparatorChar)).Replace(extension, "_CodeFormatterResults.txt"); - foreach (var analyzer in analyzers) { var diags = await _compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync(ImmutableArray.Create(analyzer), cancellationToken); @@ -303,8 +318,11 @@ private async Task FormatWithAnalyzersCoreAsync(Workspace workspace, ProjectId p { var analyzerTelemetryInfo = await _compilationWithAnalyzers.GetAnalyzerTelemetryInfoAsync(analyzer, cancellationToken); FormatLogger.WriteLine("{0}\t{1}\t{2}\t{3}", project.Name, analyzer.ToString(), diags.Count(), analyzerTelemetryInfo.ExecutionTime); - var resultPath = Path.ChangeExtension(LogOutputPath + resultFile, "json"); - LogDiagnostics(resultPath, diags); + // LogDiagnostic doesn't write anything useful for the 0 errors case so just skip it + if (diags.Count() > 0) + { + diagnosticsToLog.AddRange(diags.ToList()); + } } } } @@ -330,7 +348,11 @@ private async Task FormatWithAnalyzersCoreAsync(Workspace workspace, ProjectId p } } } + + return diagnosticsToLog.ToImmutableArray(); } + + return ImmutableArray.Create(); } public void ToggleRuleEnabled(IRuleMetadata ruleMetaData, bool enabled) diff --git a/src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj b/src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj index 19378cf8..0c1319c8 100644 --- a/src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj +++ b/src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj @@ -9,32 +9,32 @@ Microsoft.DotNet.CodeFormatting - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -64,7 +64,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.CodeFormatting/packages.config b/src/Microsoft.DotNet.CodeFormatting/packages.config index fabdbe28..70714a70 100644 --- a/src/Microsoft.DotNet.CodeFormatting/packages.config +++ b/src/Microsoft.DotNet.CodeFormatting/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/Microsoft.DotNet.DeadRegionAnalysis.Tests.csproj b/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/Microsoft.DotNet.DeadRegionAnalysis.Tests.csproj index 600c001f..49a4df16 100644 --- a/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/Microsoft.DotNet.DeadRegionAnalysis.Tests.csproj +++ b/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/Microsoft.DotNet.DeadRegionAnalysis.Tests.csproj @@ -13,32 +13,32 @@ - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -69,7 +69,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/packages.config b/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/packages.config index 201ccef8..5bcd9094 100644 --- a/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/packages.config +++ b/src/Microsoft.DotNet.DeadRegionAnalysis.Tests/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.DotNet.DeadRegionAnalysis/Microsoft.DotNet.DeadRegionAnalysis.csproj b/src/Microsoft.DotNet.DeadRegionAnalysis/Microsoft.DotNet.DeadRegionAnalysis.csproj index 0f55e28c..5e6757e9 100644 --- a/src/Microsoft.DotNet.DeadRegionAnalysis/Microsoft.DotNet.DeadRegionAnalysis.csproj +++ b/src/Microsoft.DotNet.DeadRegionAnalysis/Microsoft.DotNet.DeadRegionAnalysis.csproj @@ -12,32 +12,32 @@ - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -68,7 +68,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/Microsoft.DotNet.DeadRegionAnalysis/packages.config b/src/Microsoft.DotNet.DeadRegionAnalysis/packages.config index fabdbe28..70714a70 100644 --- a/src/Microsoft.DotNet.DeadRegionAnalysis/packages.config +++ b/src/Microsoft.DotNet.DeadRegionAnalysis/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - + diff --git a/src/XUnitConverter.Tests/XUnitConverter.Tests.csproj b/src/XUnitConverter.Tests/XUnitConverter.Tests.csproj index edbdeff3..d2c06286 100644 --- a/src/XUnitConverter.Tests/XUnitConverter.Tests.csproj +++ b/src/XUnitConverter.Tests/XUnitConverter.Tests.csproj @@ -14,32 +14,32 @@ - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -70,7 +70,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/XUnitConverter.Tests/packages.config b/src/XUnitConverter.Tests/packages.config index 201ccef8..5bcd9094 100644 --- a/src/XUnitConverter.Tests/packages.config +++ b/src/XUnitConverter.Tests/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - + diff --git a/src/XUnitConverter/XUnitConverter.csproj b/src/XUnitConverter/XUnitConverter.csproj index 662bf083..ed56ee05 100644 --- a/src/XUnitConverter/XUnitConverter.csproj +++ b/src/XUnitConverter/XUnitConverter.csproj @@ -12,32 +12,32 @@ - - ..\packages\Microsoft.CodeAnalysis.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll True - - ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll True - - ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.0-beta1-20160226-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.0-beta1-20160602-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll True @@ -67,7 +67,7 @@ - ..\packages\System.Reflection.Metadata.1.2.0-rc3-23811\lib\dotnet5.2\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll True diff --git a/src/XUnitConverter/packages.config b/src/XUnitConverter/packages.config index fabdbe28..70714a70 100644 --- a/src/XUnitConverter/packages.config +++ b/src/XUnitConverter/packages.config @@ -1,13 +1,13 @@  - + - - - - - - + + + + + + @@ -17,7 +17,7 @@ - +