diff options
42 files changed, 196 insertions, 523 deletions
diff --git a/.gitmodules b/.gitmodules index f176225e29..2cca62b1a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,7 @@ [submodule "main/external/RefactoringEssentials"] path = main/external/RefactoringEssentials url = git://github.com/icsharpcode/RefactoringEssentials.git +[submodule "main/external/roslyn"] + path = main/external/roslyn + url = git://github.com/mono/roslyn.git + branch = monodevelop diff --git a/main/external/RefactoringEssentials b/main/external/RefactoringEssentials -Subproject b33f5e68749daa53cd70779d2b0c26dd6a504ac +Subproject d48165824831f4115dfbb546952b309d4975b9e diff --git a/main/external/roslyn b/main/external/roslyn new file mode 160000 +Subproject c284ca5e3f8b2f2d7257576190c628fa186c5e0 diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index 16eb240d8e..6b300a2c92 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -133,6 +133,30 @@ <Name>ICSharpCode.NRefactory</Name> <Private>False</Private> </ProjectReference> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Private>False</Private> + </Reference> </ItemGroup> <ItemGroup> <Reference Include="System" /> @@ -162,46 +186,6 @@ <Reference Include="Mono.Posix" /> <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\MonoDevelop.AspNet.addin.xml"> diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj index 647ef79704..0cc3c9bca2 100644 --- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj +++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj @@ -38,28 +38,24 @@ <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <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.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -148,7 +144,4 @@ </Properties> </MonoDevelop> </ProjectExtensions> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> </Project> diff --git a/main/src/addins/AspNet/Tests/packages.config b/main/src/addins/AspNet/Tests/packages.config deleted file mode 100644 index 47685422f8..0000000000 --- a/main/src/addins/AspNet/Tests/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config index db6fa29120..57dddbe061 100644 --- a/main/src/addins/AspNet/packages.config +++ b/main/src/addins/AspNet/packages.config @@ -1,14 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
- <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
- <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
- <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
+<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" /> + <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" /> + <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" /> + <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" /> + <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> +</packages> diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj index 026c80ad3f..fec747b06a 100644 --- a/main/src/addins/CBinding/CBinding.csproj +++ b/main/src/addins/CBinding/CBinding.csproj @@ -61,20 +61,16 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Core" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -138,7 +134,6 @@ <ItemGroup> <None Include="Makefile.am" /> <None Include="README" /> - <None Include="packages.config" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="CBinding.addin.xml"> diff --git a/main/src/addins/CBinding/packages.config b/main/src/addins/CBinding/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/CBinding/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 56085c185a..a845f5010c 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -149,48 +149,36 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <Reference Include="System.Composition.AttributedModel"> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </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 Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -802,7 +790,6 @@ <None Include="MonoDevelop.CSharp.Completion\ConstructorParameterDataProvider.cs" /> <None Include="MonoDevelop.CSharp.Completion\ArrayTypeParameterDataProvider.cs" /> <None Include="MonoDevelop.CSharp.Completion\AbstractParameterDataProvider.cs" /> - <None Include="packages.config" /> <None Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\ConvertToEnumCodeRefactoringProvider.cs" /> <None Include="MonoDevelop.CSharp.Features\EncapsulateField\AbstractEncapsulateFieldRefactoringProvider.cs" /> <None Include="MonoDevelop.CSharp.Features\EncapsulateField\AbstractEncapsulateFieldService.cs" /> diff --git a/main/src/addins/CSharpBinding/packages.config b/main/src/addins/CSharpBinding/packages.config deleted file mode 100644 index 0d5434746f..0000000000 --- a/main/src/addins/CSharpBinding/packages.config +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj index f96e950782..c8b18f7435 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj @@ -102,22 +102,6 @@ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="ChangeLogAddIn.cs" /> @@ -146,7 +130,6 @@ </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> - <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/ChangeLogAddIn/packages.config b/main/src/addins/ChangeLogAddIn/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/ChangeLogAddIn/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj index cf4b9204ba..6d77ad8b2a 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj @@ -63,24 +63,20 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> + <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> + <Reference Include="System.Xml" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> - <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> @@ -197,7 +193,4 @@ <Folder Include="MonoDevelop.AssemblyBrowser\TreeNodes\" /> <Folder Include="XmlDocIdLib\" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config b/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index c31712a276..018bd10817 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -90,57 +90,25 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> + <Reference Include="System.Drawing" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Drawing" /> - <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.Convention"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.Hosting"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.Runtime"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.TypedParts"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -439,7 +407,4 @@ <Folder Include="MonoDevelop.Debugger.Converters\" /> <Folder Include="icons\mac\" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.Debugger/packages.config b/main/src/addins/MonoDevelop.Debugger/packages.config deleted file mode 100644 index 27a905b565..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/packages.config +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj index 28432a877f..30aaad37dc 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj @@ -63,20 +63,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -197,7 +193,6 @@ </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> - <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/packages.config b/main/src/addins/MonoDevelop.DesignerSupport/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/MonoDevelop.DesignerSupport/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj index 11889d50f1..96ae7118ed 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj @@ -49,32 +49,24 @@ <Reference Include="Mono.Posix" /> <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.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -173,7 +165,4 @@ <Private>False</Private> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.DocFood/packages.config b/main/src/addins/MonoDevelop.DocFood/packages.config deleted file mode 100644 index b8e64e0806..0000000000 --- a/main/src/addins/MonoDevelop.DocFood/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj index dc1ea49911..736cbcafcd 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj @@ -59,20 +59,16 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Core" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -214,7 +210,6 @@ </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> - <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> diff --git a/main/src/addins/MonoDevelop.Gettext/packages.config b/main/src/addins/MonoDevelop.Gettext/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj index c95b2ac6e4..3d4e46abd4 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj @@ -61,36 +61,24 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Core" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -165,7 +153,6 @@ <None Include="Makefile.am" /> <None Include="icons\window.png" /> <None Include="icons\dialog.png" /> - <None Include="packages.config" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.GtkCore.addin.xml"> diff --git a/main/src/addins/MonoDevelop.GtkCore/packages.config b/main/src/addins/MonoDevelop.GtkCore/packages.config deleted file mode 100644 index b8e64e0806..0000000000 --- a/main/src/addins/MonoDevelop.GtkCore/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs index 376c1467eb..ea9d3f69cb 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs @@ -79,8 +79,9 @@ namespace MonoDevelop.CodeIssues ); CompilationWithAnalyzers compilationWithAnalyzer; + var analyzers = System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange (providers); try { - compilationWithAnalyzer = localCompilation.WithAnalyzers (System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange (providers), null, cancellationToken); + compilationWithAnalyzer = localCompilation.WithAnalyzers (analyzers, null, cancellationToken); } catch (Exception) { return Enumerable.Empty<Result> (); } @@ -89,6 +90,8 @@ namespace MonoDevelop.CodeIssues return Enumerable.Empty<Result> (); var diagnosticList = new List<Diagnostic> (); diagnosticList.AddRange (compilationWithAnalyzer.GetAnalyzerDiagnosticsAsync ().Result); + CompilationWithAnalyzers.ClearAnalyzerState (analyzers); + return diagnosticList .Where (d => !d.Id.StartsWith("CS", StringComparison.Ordinal)) .Select (diagnostic => { diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 0e8289db66..3bb45d6073 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -75,68 +75,35 @@ <Reference Include="System.Xml" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> - <Private>False</Private> + <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> + <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Reference Include="System.Composition.AttributedModel"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Composition.AttributedModel.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.AttributedModel"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.Convention"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="System.Composition.Hosting"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Composition.Runtime"> - <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath> - <Private>False</Private> - </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 Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> - <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -318,6 +285,5 @@ <None Include="MonoDevelop.CodeIssues\Pad\AnalysisState.cs" /> <None Include="MonoDevelop.CodeIssues\Pad\AnalysisStateChangeEventArgs.cs" /> <None Include="MonoDevelop.CodeIssues\Pad\CategoryGroupingProvider.cs" /> - <None Include="packages.config" /> </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.Refactoring/packages.config b/main/src/addins/MonoDevelop.Refactoring/packages.config index 46efb6b2e2..3299dfcf07 100644 --- a/main/src/addins/MonoDevelop.Refactoring/packages.config +++ b/main/src/addins/MonoDevelop.Refactoring/packages.config @@ -1,10 +1,2 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file +<?xml version="1.0" encoding="utf-8"?> +<packages />
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index 9efd1f0ffb..96441a0971 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -120,20 +120,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -319,7 +315,4 @@ <Folder Include="MonoDevelop.SourceEditor.Wrappers\" /> <Folder Include="MonoDevelop.SourceEditor\TextMarker\" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> </Project> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/packages.config b/main/src/addins/MonoDevelop.SourceEditor2/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj index 68f67ef8eb..589c1756f0 100644 --- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj +++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj @@ -75,20 +75,16 @@ <Reference Include="nunit.util"> <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath> </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -185,10 +181,12 @@ <!-- <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png"> <LogicalName>project-nunit-overlay-light-32.png</LogicalName> - </EmbeddedResource> --> <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) --> + </EmbeddedResource> --> + <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) --> <!--<EmbeddedResource Include="Gui\icons\project-nunit-overlay-32@2x.png"> <LogicalName>project-nunit-overlay-light-32@2x.png</LogicalName> - </EmbeddedResource> --> <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) --> + </EmbeddedResource> --> + <!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) --> <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> diff --git a/main/src/addins/NUnit/packages.config b/main/src/addins/NUnit/packages.config index f2d63f7ff5..9c802a3164 100644 --- a/main/src/addins/NUnit/packages.config +++ b/main/src/addins/NUnit/packages.config @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="NUnit" version="2.6.4" targetFramework="net40" />
- <package id="NUnit.Runners" version="2.6.4" targetFramework="net40" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
+<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="NUnit" version="2.6.4" targetFramework="net40" /> + <package id="NUnit.Runners" version="2.6.4" targetFramework="net40" /> +</packages> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index 7bcc71200a..cacbb7c450 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -76,23 +76,11 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Core" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - <Private>False</Private> - </Reference> + <Reference Include="System.Xml" /> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Folder Include="Parser\" /> @@ -141,6 +129,5 @@ <None Include="Templates\T4PreprocessedTemplateCSharp.xft.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="packages.config" /> </ItemGroup> </Project> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj index 83dc409354..8804bd2885 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -112,20 +112,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -428,7 +424,6 @@ </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> - <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config b/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config deleted file mode 100644 index da5082381a..0000000000 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 2855b956d4..660b994408 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -98,18 +98,6 @@ </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Web" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - </Reference> <Reference Include="System.ServiceModel" /> <Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.Build.Engine" /> @@ -117,6 +105,19 @@ <Reference Include="Microsoft.Build.Utilities.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="Newtonsoft.Json"> <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> + <Private>False</Private> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config index 5ef4dda39d..f96fb6d64f 100644 --- a/main/src/core/MonoDevelop.Core/packages.config +++ b/main/src/core/MonoDevelop.Core/packages.config @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="6.0.8" 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 677572ab88..5dad66ba39 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -100,56 +100,37 @@ <Reference Include="System.Web" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Design" /> - <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - </Reference> <Reference Include="System.Windows.Forms" /> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> - </Reference> <Reference Include="System.Runtime.Serialization" /> <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.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> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\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 Include="System.Collections.Immutable"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.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 Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> </Reference> - <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + </Reference> + <Reference Include="System.Composition.Runtime"> + <HintPath>..\..\..\external\roslyn\Binaries\Debug\System.Composition.Runtime.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -3514,7 +3495,6 @@ <None Include="MonoDevelop.Ide.dll.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Target Name="AfterBuild"> diff --git a/main/src/core/MonoDevelop.Ide/packages.config b/main/src/core/MonoDevelop.Ide/packages.config deleted file mode 100644 index 9e7d94bdd5..0000000000 --- a/main/src/core/MonoDevelop.Ide/packages.config +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net45" /> - <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" /> - <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" /> - <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net45" /> - <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" /> - <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" /> - <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" /> - <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" /> -</packages>
\ No newline at end of file diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj index 00ecc11b92..d1bd3807e8 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -62,23 +62,33 @@ <HintPath>..\..\external\guiunit\bin\net_4_0\GuiUnit.exe</HintPath> </Reference> <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Reflection.Metadata"> + <HintPath>..\..\external\roslyn\Binaries\Debug\System.Reflection.Metadata.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\external\roslyn\Binaries\Debug\System.Collections.Immutable.dll</HintPath> + <Private>False</Private> </Reference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces"> + <HintPath>..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.dll</HintPath> + <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> + <HintPath>..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> + <HintPath>..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <Private>False</Private> </Reference> - <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <Reference Include="Microsoft.CodeAnalysis.CSharp"> + <HintPath>..\..\external\roslyn\Binaries\Debug\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <Private>False</Private> </Reference> </ItemGroup> <ItemGroup> @@ -286,7 +296,6 @@ <None Include="MonoDevelop.Refactoring\SimpleAnalysisJobTests.cs" /> <None Include="MonoDevelop.Refactoring\ProjectGroupingProviderTests.cs" /> <None Include="MonoDevelop.Refactoring\FileGroupingProviderTests.cs" /> - <None Include="packages.config" /> </ItemGroup> <ItemGroup /> <ItemGroup> diff --git a/main/tests/UnitTests/packages.config b/main/tests/UnitTests/packages.config deleted file mode 100644 index 68b89e64cb..0000000000 --- a/main/tests/UnitTests/packages.config +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
-</packages>
|