From 0a3795ddb324a57c6109c0f24539fa9779f1b5e9 Mon Sep 17 00:00:00 2001 From: Dan Quirk Date: Wed, 15 Jun 2016 18:46:56 -0700 Subject: [PATCH 1/3] Upgrade to Roslyn 1.3-beta1 --- src/CodeFormatter/CodeFormatter.csproj | 30 +++++++++---------- src/CodeFormatter/packages.config | 16 +++++----- src/DeadRegions/DeadRegions.csproj | 30 +++++++++---------- src/DeadRegions/packages.config | 16 +++++----- ...otNet.CodeFormatter.Analyzers.Tests.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- ...soft.DotNet.CodeFormatter.Analyzers.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- ...crosoft.DotNet.CodeFormatting.Tests.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- .../Microsoft.DotNet.CodeFormatting.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- ...oft.DotNet.DeadRegionAnalysis.Tests.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- ...Microsoft.DotNet.DeadRegionAnalysis.csproj | 30 +++++++++---------- .../packages.config | 16 +++++----- .../XUnitConverter.Tests.csproj | 30 +++++++++---------- src/XUnitConverter.Tests/packages.config | 16 +++++----- src/XUnitConverter/XUnitConverter.csproj | 30 +++++++++---------- src/XUnitConverter/packages.config | 16 +++++----- 20 files changed, 230 insertions(+), 230 deletions(-) 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/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/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/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 @@ - + From 3f0be8e7bee86fda4df07ae600ed07668651ae2e Mon Sep 17 00:00:00 2001 From: Dan Quirk Date: Wed, 15 Jun 2016 19:26:25 -0700 Subject: [PATCH 2/3] Update usage of Roslyn ErrorLogger for 1.3 API changes --- .../FormattingEngineImplementation.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs b/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs index 205a275d..5358ec0f 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(); From aabc42e224747369a992045f823a2eb2735f693b Mon Sep 17 00:00:00 2001 From: Dan Quirk Date: Wed, 29 Jun 2016 18:46:08 -0700 Subject: [PATCH 3/3] Fix version value logged in LogDiagnostic --- .../FormattingEngineImplementation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs b/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs index 5358ec0f..54cbf892 100644 --- a/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs +++ b/src/Microsoft.DotNet.CodeFormatting/FormattingEngineImplementation.cs @@ -110,7 +110,7 @@ public void LogDiagnostics(string filePath, ImmutableArray diagnosti new object[] { new FileStream(filePath, FileMode.Append, FileAccess.Write), "CodeFormatter", - "0.1", + FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).FileVersion, _loggerAssembly.GetName().Version, Thread.CurrentThread.CurrentCulture });