diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2016-10-05 12:26:49 +0300 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2016-10-06 18:12:44 +0300 |
commit | 5c223a932199dd34da870665ae1c24faf07cc018 (patch) | |
tree | 46abaef21ebbbd223ed245c7d055e540de93d996 /main/src | |
parent | 5bb4bf3c7434b5d0eab1a54fb03b5058c4c9b14e (diff) |
Updated roslyn & switched to roslyn nugets.
Diffstat (limited to 'main/src')
20 files changed, 133 insertions, 118 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index f44e80eb3a..232edd06b4 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -140,27 +140,27 @@ <Private>False</Private> </ProjectReference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj index 1d1f24991c..5ad0afb28f 100644 --- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj +++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj @@ -39,23 +39,23 @@ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 7e33495d05..03255be55b 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -150,31 +150,31 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Composition.AttributedModel.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj index 6efa20747e..d1b368e757 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj @@ -66,15 +66,15 @@ <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <Reference Include="System.Xml" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 83cfe2bd20..0c0a67bcf8 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -92,23 +92,23 @@ <Reference Include="Mono.Cairo" /> <Reference Include="System.Drawing" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj index 330da725d4..26d3751087 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj @@ -64,15 +64,15 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj index 7edb63a48c..ab2cfff01a 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj @@ -45,23 +45,23 @@ <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj index 8bbe34920e..f28071c231 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj @@ -60,15 +60,15 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj index dff5e1af6e..041a355da8 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj @@ -90,23 +90,23 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs index 5d44272f8e..1cc10d3751 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs @@ -103,7 +103,6 @@ namespace MonoDevelop.CodeIssues delegate (Exception exception, DiagnosticAnalyzer analyzer, Diagnostic diag) { LoggingService.LogError ("Exception in diagnostic analyzer " + diag.Id + ":" + diag.GetMessage (), exception); }, - null, false, false ); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index e48abc21e7..f2a9714bda 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -81,35 +81,31 @@ <Private>False</Private> </Reference> <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Composition.AttributedModel.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Features"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Features.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Features"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Features.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Features.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -361,7 +357,7 @@ </ItemGroup> <Target Name="AfterBuild"> - <Copy SourceFiles="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" /> - <Copy SourceFiles="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" /> + <Copy SourceFiles="..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" /> + <Copy SourceFiles="..\..\..\build\bin\Microsoft.CodeAnalysis.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" /> </Target> </Project> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs index 20ab40f884..5ac62f99d3 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs @@ -81,7 +81,6 @@ namespace MonoDevelop.Refactoring delegate (Exception exception, DiagnosticAnalyzer analyzer, Diagnostic diag) { LoggingService.LogError ("Exception in diagnostic analyzer " + diag.Id + ":" + diag.GetMessage (), exception); }, - null, true, false ); diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj index 693ad315a0..653eea50db 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj @@ -63,11 +63,11 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> @@ -75,11 +75,11 @@ <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Composition.AttributedModel.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index c300831fcc..9b18179a88 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -126,15 +126,15 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 8e91b3b806..fc348f89f0 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -64,15 +64,15 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Core" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index f7725166a1..0f55c17cdf 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -78,7 +78,7 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml" /> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj index 94435dac28..f01c1b4975 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -114,15 +114,15 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 8828311b4b..8f921d2764 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -104,20 +104,50 @@ <Reference Include="Newtonsoft.Json"> <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> + <Reference Include="ICSharpCode.SharpZipLib"> + <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> + <HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + </Reference> + <Reference Include="System.Composition.AttributedModel"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath> + </Reference> + <Reference Include="System.Composition.Convention"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath> + </Reference> + <Reference Include="System.Composition.Hosting"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath> + </Reference> + <Reference Include="System.Composition.Runtime"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath> + </Reference> + <Reference Include="System.Composition.TypedParts"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath> + </Reference> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> - <Reference Include="ICSharpCode.SharpZipLib"> - <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.VisualBasic"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.VisualBasic.1.3.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces"> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.3.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -593,26 +623,6 @@ <None Include="MSBuild\CodeSharing.CSharp.targets"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll"> - <Link>Microsoft.CodeAnalysis.CSharp.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Features.dll"> - <Link>Microsoft.CodeAnalysis.CSharp.Features.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll"> - <Link>Microsoft.CodeAnalysis.CSharp.Workspaces.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.Desktop.dll"> - <Link>Microsoft.CodeAnalysis.Workspaces.Desktop.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.VisualBasic.dll"> - <Link>Microsoft.CodeAnalysis.VisualBasic.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.Core.addin.xml"> diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config index f00bba3f44..31d5f11fd8 100644 --- a/main/src/core/MonoDevelop.Core/packages.config +++ b/main/src/core/MonoDevelop.Core/packages.config @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <packages> + <package id="Microsoft.CodeAnalysis" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.3.2" targetFramework="net45" /> + <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="SharpZipLib" version="0.86.0" targetFramework="net45" /> + <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net45" /> + <package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net45" /> </packages>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index 79f55e2764..aa69b4aa5a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -140,24 +140,6 @@ <Reference Include="WindowsBase" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " /> <Reference Include="WindowsFormsIntegration" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " /> <Reference Include="System.Xaml" /> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> - </Reference> - <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath> - </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> - </Reference> - <Reference Include="System.Composition.Runtime"> - <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.Runtime.dll</HintPath> - </Reference> <Reference Include="ICSharpCode.SharpZipLib"> <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath> <Private>False</Private> @@ -169,6 +151,24 @@ <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> + </Reference> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + </Reference> + <Reference Include="System.Composition.AttributedModel"> + <HintPath>..\..\..\build\bin\System.Composition.AttributedModel.dll</HintPath> + </Reference> + <Reference Include="System.Composition.Runtime"> + <HintPath>..\..\..\build\bin\System.Composition.Runtime.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <ProjectReference Include="..\MonoDevelop.Core\MonoDevelop.Core.csproj"> |