diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2015-02-24 13:30:28 +0300 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2015-02-24 13:30:28 +0300 |
commit | 004ef771b75957d37cfcb3d37d712e04d64ffe41 (patch) | |
tree | 6613669685d99dad82ea552f2c3d9fee14406c8a /main | |
parent | cdd57a984d9afa376ae54ac6748d216883bc3b73 (diff) |
Bump Roslyn & NR6 / Track API changes.
Note: Code fixes & diagnostics broke.
Diffstat (limited to 'main')
54 files changed, 337 insertions, 335 deletions
diff --git a/main/external/NRefactory6 b/main/external/NRefactory6 -Subproject 10b225adb307262e58c876c9535ec3109eb28a1 +Subproject 72ac05cfae241d5ca642a9fc701f1f57d4141e0 diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index 83657db61a..424692a270 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -166,34 +166,34 @@ <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config index bae868e778..d0f2e392f6 100644 --- a/main/src/addins/AspNet/packages.config +++ b/main/src/addins/AspNet/packages.config @@ -4,11 +4,11 @@ <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.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.Composition" version="1.0.30" 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>
diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj index 5fe31b44c2..6ff490dc9f 100644 --- a/main/src/addins/CBinding/CBinding.csproj +++ b/main/src/addins/CBinding/CBinding.csproj @@ -62,16 +62,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/CBinding/packages.config b/main/src/addins/CBinding/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/CBinding/packages.config +++ b/main/src/addins/CBinding/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 9660abe888..63107a13d8 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -155,34 +155,34 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs index 677f332d38..351c4b2df4 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs @@ -351,7 +351,7 @@ namespace MonoDevelop.CSharp.ClassOutline public override void VisitTrivia (SyntaxTrivia trivia) { - switch (trivia.CSharpKind ()) { + switch (trivia.Kind ()) { case SyntaxKind.RegionDirectiveTrivia: curIter = Append (trivia); break; @@ -374,7 +374,7 @@ namespace MonoDevelop.CSharp.ClassOutline Visit (syntaxNode); } else { var syntaxToken = syntaxNodeOrToken.AsToken (); - if (syntaxToken.CSharpKind () == SyntaxKind.OpenBraceToken) + if (syntaxToken.Kind () == SyntaxKind.OpenBraceToken) curIter = Append (node); VisitToken (syntaxToken); } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ResolveCommandHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ResolveCommandHandler.cs index 51916c79f5..040d848f17 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ResolveCommandHandler.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ResolveCommandHandler.cs @@ -47,6 +47,7 @@ using MonoDevelop.Core.Text; using System.Threading.Tasks; using MonoDevelop.Refactoring; using MonoDevelop.CSharp.Formatting; +using Microsoft.CodeAnalysis.CSharp; namespace MonoDevelop.CSharp.Refactoring { @@ -368,9 +369,9 @@ namespace MonoDevelop.CSharp.Refactoring SyntaxToken identifier; int tc = GetTypeParameterCount (node, out identifier); - bool isInsideAttributeType = identifier.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.IdentifierToken && - identifier.Parent.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.IdentifierName && - identifier.Parent.Parent.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.Attribute; + bool isInsideAttributeType = identifier.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.IdentifierToken && + identifier.Parent.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.IdentifierName && + identifier.Parent.Parent.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.Attribute; var compilations = new List<Tuple<Compilation, MonoDevelop.Projects.ProjectReference>> (); compilations.Add (Tuple.Create (semanticModel.Compilation, (MonoDevelop.Projects.ProjectReference)null)); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs index fa1b2452bd..352271a9e9 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs @@ -139,7 +139,7 @@ namespace MonoDevelop.SourceEditor if (typeOfExpression != null && data.Symbol is ITypeSymbol) return sig.GetTypeOfTooltip (typeOfExpression, (ITypeSymbol)data.Symbol); -// var parentKind = data.Token.Parent != null ? data.Token.Parent.CSharpKind () : SyntaxKind.None; +// var parentKind = data.Token.Parent != null ? data.Token.Parent.Kind () : SyntaxKind.None; // switch (parentKind) { // case SyntaxKind.ConstructorConstraint: // case SyntaxKind.ClassConstraint: @@ -181,8 +181,8 @@ namespace MonoDevelop.SourceEditor // if (result == null && parentKind == SyntaxKind.IdentifierName) { // if (data.SymbolInfo.CandidateReason == CandidateReason.None) { -// if (data.Token.Parent.Parent.CSharpKind () == SyntaxKind.SimpleMemberAccessExpression || -// data.Token.Parent.Parent.CSharpKind () == SyntaxKind.PointerMemberAccessExpression) { +// if (data.Token.Parent.Parent.Kind () == SyntaxKind.SimpleMemberAccessExpression || +// data.Token.Parent.Parent.Kind () == SyntaxKind.PointerMemberAccessExpression) { // var ma = (MemberAccessExpressionSyntax)data.Token.Parent.Parent; // return new TooltipInformation { // SignatureMarkup = string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", ma.Expression, ma.Name) diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs index b76225b3f7..34a02f2a3a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs @@ -155,13 +155,13 @@ namespace MonoDevelop.CSharp AppendTypeParameter (sb, del.TypeParameterList); AppendParameter (sb, del.ParameterList); } else if (e is AccessorDeclarationSyntax) { - if (e.CSharpKind () == SyntaxKind.GetAccessorDeclaration) { + if (e.Kind () == SyntaxKind.GetAccessorDeclaration) { sb.Append ("get"); - } else if (e.CSharpKind () == SyntaxKind.SetAccessorDeclaration) { + } else if (e.Kind () == SyntaxKind.SetAccessorDeclaration) { sb.Append ("set"); - } else if (e.CSharpKind () == SyntaxKind.AddAccessorDeclaration) { + } else if (e.Kind () == SyntaxKind.AddAccessorDeclaration) { sb.Append ("add"); - } else if (e.CSharpKind () == SyntaxKind.RemoveAccessorDeclaration) { + } else if (e.Kind () == SyntaxKind.RemoveAccessorDeclaration) { sb.Append ("remove"); } } else if (e is OperatorDeclarationSyntax) { @@ -178,9 +178,9 @@ namespace MonoDevelop.CSharp AppendParameter (sb, method.ParameterList); if (method.Body != null && !method.Body.IsMissing) { string tag = null; - if (method.Modifiers.Any (m => m.CSharpKind () == SyntaxKind.AbstractKeyword)) + if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.AbstractKeyword)) tag = GettextCatalog.GetString ("(abstract)"); - if (method.Modifiers.Any (m => m.CSharpKind () == SyntaxKind.PartialKeyword)) + if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.PartialKeyword)) tag = GettextCatalog.GetString ("(partial)"); if (tag != null) sb.Append (" <small>" + tag + "</small>"); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs index ddfe0bfc84..d8b09e4689 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs @@ -120,30 +120,30 @@ namespace MonoDevelop.CSharp static void AdjustAccessibility (SyntaxTokenList modifiers, ref Accessibility acc, ref bool result) { - if (modifiers.Any (mod => mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) && - modifiers.Any (mod => mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword)) { + if (modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) && + modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword)) { acc = Accessibility.ProtectedOrInternal; result = true; return; } foreach (var mod in modifiers) { - if (mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PublicKeyword) { + if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PublicKeyword) { acc = Accessibility.Public; result = true; return; } - if (mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PrivateKeyword) { + if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PrivateKeyword) { acc = Accessibility.Private; result = true; return; } - if (mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) { + if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) { acc = Accessibility.Protected; result = true; return; } - if (mod.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword) { + if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword) { acc = Accessibility.Internal; result = true; return; @@ -191,7 +191,7 @@ namespace MonoDevelop.CSharp if (element is TypeDeclarationSyntax) { var type = element as TypeDeclarationSyntax; - switch (type.Keyword.CSharpKind ()) { + switch (type.Keyword.Kind ()) { case SyntaxKind.ClassKeyword: return typeIconTable [0, (int) (acc)]; case SyntaxKind.StructKeyword: diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs index ed3ea4984f..d1b264ae2e 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs @@ -39,7 +39,6 @@ using MonoDevelop.Ide.Editor.Extension; using MonoDevelop.Projects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using ICSharpCode.NRefactory6.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; @@ -272,13 +271,13 @@ namespace MonoDevelop.CSharp var accessor = node as AccessorDeclarationSyntax; if (accessor != null) { - if (accessor.CSharpKind () == SyntaxKind.GetAccessorDeclaration) + if (accessor.Kind () == SyntaxKind.GetAccessorDeclaration) return "get"; - if (accessor.CSharpKind () == SyntaxKind.SetAccessorDeclaration) + if (accessor.Kind () == SyntaxKind.SetAccessorDeclaration) return "set"; - if (accessor.CSharpKind () == SyntaxKind.AddAccessorDeclaration) + if (accessor.Kind () == SyntaxKind.AddAccessorDeclaration) return "add"; - if (accessor.CSharpKind () == SyntaxKind.RemoveAccessorDeclaration) + if (accessor.Kind () == SyntaxKind.RemoveAccessorDeclaration) return "remove"; return node.ToString (); } @@ -579,10 +578,10 @@ namespace MonoDevelop.CSharp if (curMember != null) { result.Add (new PathEntry (ImageService.GetIcon (curMember.GetStockIcon (), Gtk.IconSize.Menu), curMemberMarkup) { Tag = curMember }); - if (curMember.CSharpKind () == SyntaxKind.GetAccessorDeclaration || - curMember.CSharpKind () == SyntaxKind.SetAccessorDeclaration || - curMember.CSharpKind () == SyntaxKind.AddAccessorDeclaration || - curMember.CSharpKind () == SyntaxKind.RemoveAccessorDeclaration) { + if (curMember.Kind () == SyntaxKind.GetAccessorDeclaration || + curMember.Kind () == SyntaxKind.SetAccessorDeclaration || + curMember.Kind () == SyntaxKind.AddAccessorDeclaration || + curMember.Kind () == SyntaxKind.RemoveAccessorDeclaration) { var parent = curMember.Parent; if (parent != null) result.Insert (result.Count - 1, new PathEntry (ImageService.GetIcon (parent.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (parent)) { Tag = parent }); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index dcd113d1d3..6ebd8debbe 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -36,7 +36,6 @@ using System.ComponentModel; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Simplification; -using ICSharpCode.NRefactory6.CSharp; using Microsoft.CodeAnalysis.CSharp.Formatting; using System.Collections.Immutable; using MonoDevelop.NUnit; @@ -45,6 +44,7 @@ using Microsoft.CodeAnalysis.CSharp; using MonoDevelop.Ide.Editor; using MonoDevelop.Components; using MonoDevelop.Ide.Editor.Highlighting; +using ICSharpCode.NRefactory6.CSharp; namespace MonoDevelop.CSharp { @@ -943,7 +943,7 @@ namespace MonoDevelop.CSharp var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>"; - switch (node.CSharpKind ()) { + switch (node.Kind ()) { case SyntaxKind.AbstractKeyword: result.SignatureMarkup = Highlight ("abstract", colorStyle.KeywordModifiers) + keywordSign; result.SummaryMarkup = "The " + Highlight ("abstract", colorStyle.KeywordModifiers) + " modifier can be used with classes, methods, properties, indexers, and events."; @@ -1478,7 +1478,7 @@ namespace MonoDevelop.CSharp result.SignatureMarkup = Highlight (keyword.ToFullString (), colorStyle.KeywordTypes) + keywordSign; - switch (keyword.Parent.CSharpKind ()) { + switch (keyword.Parent.Kind ()) { case SyntaxKind.ClassConstraint: result.AddCategory ("Constraint", "The type argument must be a reference type; this applies also to any class, interface, delegate, or array type."); break; diff --git a/main/src/addins/CSharpBinding/packages.config b/main/src/addins/CSharpBinding/packages.config index ed427642fa..40b4864e8f 100644 --- a/main/src/addins/CSharpBinding/packages.config +++ b/main/src/addins/CSharpBinding/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" 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 5a0e77c42e..883e5e88b6 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj @@ -103,16 +103,16 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/ChangeLogAddIn/packages.config b/main/src/addins/ChangeLogAddIn/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/ChangeLogAddIn/packages.config +++ b/main/src/addins/ChangeLogAddIn/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 3353293040..7f7862ac70 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj @@ -64,16 +64,16 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <Reference Include="System.Xml" /> diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs index 9825bc9856..9d4624c339 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs @@ -179,13 +179,13 @@ namespace MonoDevelop.AssemblyBrowser { switch (typeKind) { case Microsoft.CodeAnalysis.TypeKind.Unknown: - case Microsoft.CodeAnalysis.TypeKind.ArrayType: + case Microsoft.CodeAnalysis.TypeKind.Array: return 0; case Microsoft.CodeAnalysis.TypeKind.Class: return 0; case Microsoft.CodeAnalysis.TypeKind.Delegate: return 4; - case Microsoft.CodeAnalysis.TypeKind.DynamicType: + case Microsoft.CodeAnalysis.TypeKind.Dynamic: return 0; case Microsoft.CodeAnalysis.TypeKind.Enum: return 1; @@ -195,7 +195,7 @@ namespace MonoDevelop.AssemblyBrowser return 2; case Microsoft.CodeAnalysis.TypeKind.Module: return 0; - case Microsoft.CodeAnalysis.TypeKind.PointerType: + case Microsoft.CodeAnalysis.TypeKind.Pointer: return 0; case Microsoft.CodeAnalysis.TypeKind.Struct: return 3; diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config b/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 0ef32f5583..44b33586eb 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -62,22 +62,22 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> </Reference> <Reference Include="System.Drawing" /> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Debugger/packages.config b/main/src/addins/MonoDevelop.Debugger/packages.config index cb42c8eec4..519393e861 100644 --- a/main/src/addins/MonoDevelop.Debugger/packages.config +++ b/main/src/addins/MonoDevelop.Debugger/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" 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 cbbfade532..4c73cdbe1e 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj @@ -64,16 +64,16 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/packages.config b/main/src/addins/MonoDevelop.DesignerSupport/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/packages.config +++ b/main/src/addins/MonoDevelop.DesignerSupport/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 21fdf57044..a44e67fd49 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj @@ -50,22 +50,22 @@ <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.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.DocFood/packages.config b/main/src/addins/MonoDevelop.DocFood/packages.config index 8ad04cd484..f8f771207f 100644 --- a/main/src/addins/MonoDevelop.DocFood/packages.config +++ b/main/src/addins/MonoDevelop.DocFood/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" 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 93873b67a5..6498ab86e7 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj @@ -60,16 +60,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.Gettext/packages.config b/main/src/addins/MonoDevelop.Gettext/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/MonoDevelop.Gettext/packages.config +++ b/main/src/addins/MonoDevelop.Gettext/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 100563ac03..277b9401b7 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj @@ -62,28 +62,28 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.GtkCore/packages.config b/main/src/addins/MonoDevelop.GtkCore/packages.config index c7c96e1d12..12fcbf164a 100644 --- a/main/src/addins/MonoDevelop.GtkCore/packages.config +++ b/main/src/addins/MonoDevelop.GtkCore/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" 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.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs index cf9650b36a..8f991baac1 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs @@ -183,39 +183,40 @@ namespace MonoDevelop.CodeActions .OfType<DiagnosticResult> () .Select (dr => dr.Diagnostic) .ToList (); - System.Threading.Tasks.Task.Factory.StartNew (async delegate { - var codeIssueFixes = new List<Tuple<CodeFixDescriptor, CodeAction>> (); - var diagnosticIds = diagnosticsAtCaret.Select (diagnostic => diagnostic.Id).ToImmutableArray<string> (); - foreach (var cfp in CodeDiagnosticService.GetBuiltInCodeFixDescriptorAsync (CodeRefactoringService.MimeTypeToLanguage(Editor.MimeType)).Result) { - if (token.IsCancellationRequested) - return; - var provider = cfp.GetCodeFixProvider (); - if (!provider.GetFixableDiagnosticIds ().Any (diagnosticIds.Contains)) - continue; - - try { - await provider.ComputeFixesAsync (new CodeFixContext (ad, span, diagnosticsAtCaret.ToImmutableArray (), - (ca, diag) => codeIssueFixes.Add (Tuple.Create (cfp, ca)), - token)); - } catch (Exception ex) { - LoggingService.LogError ("Error while getting refactorings from code fix provider " + cfp.Name, ex); - continue; - } - } - var codeActions = new List<Tuple<CodeRefactoringDescriptor, CodeAction>> (); - foreach (var action in CodeRefactoringService.GetValidActionsAsync (Editor, DocumentContext, span, token).Result) { - codeActions.Add (action); - } - Application.Invoke (delegate { - if (token.IsCancellationRequested) - return; - if (codeIssueFixes.Count == 0 && codeActions.Count == 0) { - RemoveWidget (); - return; - } - CreateSmartTag (new CodeActionContainer (codeIssueFixes, codeActions), loc); - }); - }); + // TODO: Broken due roslyn update. +// System.Threading.Tasks.Task.Factory.StartNew (async delegate { +// var codeIssueFixes = new List<Tuple<CodeFixDescriptor, CodeAction>> (); +// var diagnosticIds = diagnosticsAtCaret.Select (diagnostic => diagnostic.Id).ToImmutableArray<string> (); +// foreach (var cfp in CodeDiagnosticService.GetBuiltInCodeFixDescriptorAsync (CodeRefactoringService.MimeTypeToLanguage(Editor.MimeType)).Result) { +// if (token.IsCancellationRequested) +// return; +// var provider = cfp.GetCodeFixProvider (); +// if (!provider.GetFixableDiagnosticIds ().Any (diagnosticIds.Contains)) +// continue; +// +// try { +// await provider.ComputeFixesAsync (new CodeFixContext (ad, span, diagnosticsAtCaret.ToImmutableArray (), +// (ca, diag) => codeIssueFixes.Add (Tuple.Create (cfp, ca)), +// token)); +// } catch (Exception ex) { +// LoggingService.LogError ("Error while getting refactorings from code fix provider " + cfp.Name, ex); +// continue; +// } +// } +// var codeActions = new List<Tuple<CodeRefactoringDescriptor, CodeAction>> (); +// foreach (var action in CodeRefactoringService.GetValidActionsAsync (Editor, DocumentContext, span, token).Result) { +// codeActions.Add (action); +// } +// Application.Invoke (delegate { +// if (token.IsCancellationRequested) +// return; +// if (codeIssueFixes.Count == 0 && codeActions.Count == 0) { +// RemoveWidget (); +// return; +// } +// CreateSmartTag (new CodeActionContainer (codeIssueFixes, codeActions), loc); +// }); +// }); // RefactoringService.QueueQuickFixAnalysis (Document, loc, token, delegate(List<CodeAction> fixes) { @@ -473,7 +474,7 @@ namespace MonoDevelop.CodeActions { int mnemonic = 1; bool gotImportantFix = false, addedSeparator = false; - foreach (var fix_ in Fixes.CodeDiagnosticActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i.Item2), (int)0, GetUsage (i.Item2.Id)))) { + foreach (var fix_ in Fixes.CodeDiagnosticActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i.Item2), (int)0, GetUsage (i.Item2.EquivalenceKey)))) { // filter out code actions that are already resolutions of a code issue if (IsAnalysisOrErrorFix (fix_.Item2)) gotImportantFix = true; @@ -489,7 +490,7 @@ namespace MonoDevelop.CodeActions : " " + escapedLabel; var thisInstanceMenuItem = new FixMenuEntry (label, delegate { new ContextActionRunner (fix.Item2, Editor, DocumentContext).Run (null, EventArgs.Empty); - ConfirmUsage (fix.Item2.Id); + ConfirmUsage (fix.Item2.EquivalenceKey); }); menu.Add (thisInstanceMenuItem); items++; @@ -509,7 +510,7 @@ namespace MonoDevelop.CodeActions : " " + escapedLabel; var thisInstanceMenuItem = new FixMenuEntry (label, delegate { new ContextActionRunner (fix.Item2, Editor, DocumentContext).Run (null, EventArgs.Empty); - ConfirmUsage (fix.Item2.Id); + ConfirmUsage (fix.Item2.EquivalenceKey); }); menu.Add (thisInstanceMenuItem); items++; @@ -519,7 +520,7 @@ namespace MonoDevelop.CodeActions menu.Add (FixMenuEntry.Separator); } - foreach (var fix_ in Fixes.CodeDiagnosticActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i.Item2), (int)0, GetUsage (i.Item2.Id)))) { + foreach (var fix_ in Fixes.CodeDiagnosticActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i.Item2), (int)0, GetUsage (i.Item2.EquivalenceKey)))) { var fix = fix_; var label = GettextCatalog.GetString ("_Options for \"{0}\"", fix.Item2.Title); var subMenu = new FixMenuDescriptor (label); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs index 6cd1357970..c845671203 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs @@ -27,6 +27,7 @@ using System; using Microsoft.CodeAnalysis.CodeRefactorings; using MonoDevelop.Core; +using System.Linq; namespace MonoDevelop.CodeActions { @@ -57,7 +58,7 @@ namespace MonoDevelop.CodeActions /// <summary> /// Gets the language for this action. /// </summary> - public string Language { get { return attr.Language; } } + public string Language { get { return attr.Languages.FirstOrDefault (); } } /// <summary> /// Gets or sets a value indicating whether this code action is enabled by the user. diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs index 0d7989e4a7..f8a84e99e9 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs @@ -49,65 +49,65 @@ namespace MonoDevelop.CodeIssues var input = analysisDocument.DocumentContext; if (!AnalysisOptions.EnableFancyFeatures || input.Project == null || !input.IsCompileableInProject || input.AnalysisDocument == null) return Enumerable.Empty<Result> (); - - try { - var model = input.ParsedDocument.GetAst<SemanticModel> (); - if (model == null) - return Enumerable.Empty<Result> (); - var compilation = model.Compilation; - var language = CodeRefactoringService.MimeTypeToLanguage (analysisDocument.Editor.MimeType); - - var options = new AnalyzerOptions(System.Collections.Immutable.ImmutableArray<AdditionalStream>.Empty, System.Collections.Immutable.ImmutableDictionary<string, string>.Empty); - var providers = new List<DiagnosticAnalyzer> (); - var alreadyAdded = new HashSet<Type>(); - var codeIssues = CodeDiagnosticService.GetBuiltInCodeIssuesAsync (language); - foreach (var issue in codeIssues.Result) { - if (alreadyAdded.Contains (issue.CodeIssueType)) - continue; - alreadyAdded.Add (issue.CodeIssueType); - var provider = issue.GetProvider (); - providers.Add (provider); - } - - if (providers.Count == 0) - return Enumerable.Empty<Result> (); - - var driver = AnalyzerDriver.Create( - compilation, - System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange(providers), - options, - out compilation, - CancellationToken.None - ); - - - if (input.ParsedDocument == null) - return Enumerable.Empty<Result> (); - model = compilation.GetSemanticModel (model.SyntaxTree); - - var tree = model.SyntaxTree; - if (tree == null) - return Enumerable.Empty<Result> (); - model.GetDiagnostics (null, cancellationToken); - model.GetSyntaxDiagnostics (null, cancellationToken); - model.GetDeclarationDiagnostics (null, cancellationToken); - model.GetMethodBodyDiagnostics (null, cancellationToken); - - var diagnosticList = driver.GetDiagnosticsAsync ().Result; - return diagnosticList - .Where (d => !string.IsNullOrEmpty (d.Descriptor.Description.ToString ())) - .Select (diagnostic => { - var res = new DiagnosticResult(diagnostic); - // var line = analysisDocument.Editor.GetLineByOffset (res.Region.Start); - // Console.WriteLine (diagnostic.Id + "/" + res.Region +"/" + analysisDocument.Editor.GetTextAt (line)); - return res; - }); - } catch (OperationCanceledException) { - return Enumerable.Empty<Result> (); - } catch (Exception e) { - LoggingService.LogError ("Error while running diagnostics.", e); + // TODO: Broken due roslyn update. +// try { +// var model = input.ParsedDocument.GetAst<SemanticModel> (); +// if (model == null) +// return Enumerable.Empty<Result> (); +// var compilation = model.Compilation; +// var language = CodeRefactoringService.MimeTypeToLanguage (analysisDocument.Editor.MimeType); +// +// var options = new AnalyzerOptions(System.Collections.Immutable.ImmutableArray<AdditionalStream>.Empty, System.Collections.Immutable.ImmutableDictionary<string, string>.Empty); +// var providers = new List<DiagnosticAnalyzer> (); +// var alreadyAdded = new HashSet<Type>(); +// var codeIssues = CodeDiagnosticService.GetBuiltInCodeIssuesAsync (language); +// foreach (var issue in codeIssues.Result) { +// if (alreadyAdded.Contains (issue.CodeIssueType)) +// continue; +// alreadyAdded.Add (issue.CodeIssueType); +// var provider = issue.GetProvider (); +// providers.Add (provider); +// } +// +// if (providers.Count == 0) +// return Enumerable.Empty<Result> (); +// +// var driver = AnalyzerDriver.Create( +// compilation, +// System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange(providers), +// options, +// out compilation, +// CancellationToken.None +// ); +// +// +// if (input.ParsedDocument == null) +// return Enumerable.Empty<Result> (); +// model = compilation.GetSemanticModel (model.SyntaxTree); +// +// var tree = model.SyntaxTree; +// if (tree == null) +// return Enumerable.Empty<Result> (); +// model.GetDiagnostics (null, cancellationToken); +// model.GetSyntaxDiagnostics (null, cancellationToken); +// model.GetDeclarationDiagnostics (null, cancellationToken); +// model.GetMethodBodyDiagnostics (null, cancellationToken); +// +// var diagnosticList = driver.GetDiagnosticsAsync ().Result; +// return diagnosticList +// .Where (d => !string.IsNullOrEmpty (d.Descriptor.Description.ToString ())) +// .Select (diagnostic => { +// var res = new DiagnosticResult(diagnostic); +// // var line = analysisDocument.Editor.GetLineByOffset (res.Region.Start); +// // Console.WriteLine (diagnostic.Id + "/" + res.Region +"/" + analysisDocument.Editor.GetTextAt (line)); +// return res; +// }); +// } catch (OperationCanceledException) { +// return Enumerable.Empty<Result> (); +// } catch (Exception e) { +// LoggingService.LogError ("Error while running diagnostics.", e); return Enumerable.Empty<Result> (); - } +// } } } }
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFixDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFixDescriptor.cs index 9b87275f14..c02126bc93 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFixDescriptor.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFixDescriptor.cs @@ -68,7 +68,7 @@ namespace MonoDevelop.CodeIssues public CodeDiagnosticDescriptor GetCodeDiagnosticDescriptor (string language) { - var fixableIds = GetCodeFixProvider ().GetFixableDiagnosticIds ().ToList (); + var fixableIds = GetCodeFixProvider ().FixableDiagnosticIds.ToList (); foreach (var descriptor in CodeDiagnosticService.GetBuiltInCodeIssuesAsync (language).Result) { if (descriptor.GetProvider ().SupportedDiagnostics.Any (diagnostic => fixableIds.Contains (diagnostic.Id))) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 0d2599deed..74f942c0c7 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -76,49 +76,49 @@ <Reference Include="Mono.Cairo" /> <Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.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>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath> </Reference> <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs index 8c92c04210..3bf680a3d6 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs @@ -210,7 +210,7 @@ namespace MonoDevelop.Refactoring internal static InsertionPoint GetSuitableInsertionPoint (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part, SyntaxNode member) { - switch (member.CSharpKind ()) { + switch (member.Kind ()) { case SyntaxKind.FieldDeclaration: return GetNewFieldPosition (data, points, cls, part); case SyntaxKind.MethodDeclaration: @@ -223,7 +223,7 @@ namespace MonoDevelop.Refactoring case SyntaxKind.PropertyDeclaration: return GetNewPropertyPosition (data, points, cls, part); } - throw new InvalidOperationException ("Invalid member type: " + member.CSharpKind ()); + throw new InvalidOperationException ("Invalid member type: " + member.Kind ()); } static InsertionPoint GetNewFieldPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs index 43bb2c61c3..b1532d9e50 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs @@ -147,7 +147,7 @@ namespace MonoDevelop.Refactoring var cu = node as CompilationUnitSyntax; if (cu != null) { foreach (var u in cu.Usings) { - if (u.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) + if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) result.Add (u.Name.ToString ()); } } @@ -156,7 +156,7 @@ namespace MonoDevelop.Refactoring var name = ns.Name.ToString (); result.Add (name); foreach (var u in ns.Usings) { - if (u.CSharpKind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) + if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) result.Add (u.Name.ToString ()); } } diff --git a/main/src/addins/MonoDevelop.Refactoring/packages.config b/main/src/addins/MonoDevelop.Refactoring/packages.config index 7089b422a8..38a30aaa8f 100644 --- a/main/src/addins/MonoDevelop.Refactoring/packages.config +++ b/main/src/addins/MonoDevelop.Refactoring/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.Composition" version="1.0.30" 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.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index c3e843ae82..9d83ee5e78 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -121,16 +121,16 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/packages.config b/main/src/addins/MonoDevelop.SourceEditor2/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/packages.config +++ b/main/src/addins/MonoDevelop.SourceEditor2/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 8e66edb722..99f57da5c7 100644 --- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj +++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj @@ -76,16 +76,16 @@ <HintPath>..\..\..\packages\NUnit.Runners.2.6.3\tools\lib\nunit.util.dll</HintPath> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -178,12 +178,13 @@ <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png"> <LogicalName>project-nunit-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <!-- <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 Include="Gui\icons\project-nunit-overlay-32@2x.png"> + </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 cdb4799c52..9e112b4847 100644 --- a/main/src/addins/NUnit/packages.config +++ b/main/src/addins/NUnit/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="NUnit.Runners" version="2.6.3" targetFramework="net40" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" 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/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index e05fffbc58..6a14bf1336 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -74,16 +74,16 @@ </Reference> <Reference Include="System.Core" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 cd0e466d0d..ed1bba9650 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -113,16 +113,16 @@ <Reference Include="System.Core" /> <Reference Include="Mono.Cairo" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config b/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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 25aa7d79cd..6af08f44f5 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -84,16 +84,16 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.Web" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="System.ServiceModel" /> <Reference Include="Microsoft.CSharp" /> diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config index d6ac190610..d3fca62c00 100644 --- a/main/src/core/MonoDevelop.Core/packages.config +++ b/main/src/core/MonoDevelop.Core/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" 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.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs index fda9fc7364..23a2820fbe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs @@ -67,7 +67,7 @@ namespace MonoDevelop.Ide.TypeSystem internal void InformDocumentTextChange (DocumentId id, SourceText text) { - base.ChangedDocumentText (id, text); + base.ApplyDocumentTextChanged (id, text); } async void HandleActiveConfigurationChanged (object sender, EventArgs e) @@ -254,7 +254,7 @@ namespace MonoDevelop.Ide.TypeSystem static DocumentInfo CreateDocumentInfo (ProjectData id, MonoDevelop.Projects.ProjectFile f) { - return DocumentInfo.Create (GetDocumentId (id, f), f.FilePath, null, SourceCodeKind.Regular, CreateTextLoader (f.Name), f.Name, System.Text.Encoding.Default, false); + return DocumentInfo.Create (GetDocumentId (id, f), f.FilePath, null, SourceCodeKind.Regular, CreateTextLoader (f.Name), f.Name, false); } IEnumerable<DocumentInfo> GetDocuments (ProjectData id, MonoDevelop.Projects.Project p) @@ -285,8 +285,7 @@ namespace MonoDevelop.Ide.TypeSystem null, SourceCodeKind.Regular, TextLoader.From (TextAndVersion.Create (new MonoDevelopSourceText (projection.Result.Document), VersionStamp.Create (), projection.Result.Document.FileName)), - f.Name, - System.Text.Encoding.Default, + f.Name, false ); } @@ -476,10 +475,10 @@ namespace MonoDevelop.Ide.TypeSystem public override void CloseDocument (DocumentId documentId) { } - - protected override void ChangedDocumentText(DocumentId documentId, SourceText text) + + protected override void ApplyDocumentTextChanged (DocumentId id, SourceText text) { - var document = CurrentSolution.GetDocument (documentId); + var document = CurrentSolution.GetDocument (id); if (document == null) return; @@ -489,7 +488,7 @@ namespace MonoDevelop.Ide.TypeSystem data.ReplaceText (change.Span.Start, change.Span.Length, change.NewText); } - OnDocumentTextChanged (documentId, text, PreservationMode.PreserveValue); + OnDocumentTextChanged (id, text, PreservationMode.PreserveValue); } #endregion diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs index 1309f41fbc..9d98c1beb5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDocDocumentationProvider.cs @@ -143,10 +143,10 @@ namespace MonoDevelop.Ide.TypeSystem static string GetTypeString (ITypeSymbol t) { switch (t.TypeKind) { - case TypeKind.ArrayType: + case TypeKind.Array: var arr = (IArrayTypeSymbol)t; return GetTypeString (arr.ElementType) + "[" + new string (',', arr.Rank - 1) + "]"; - case TypeKind.PointerType: + case TypeKind.Pointer: var ptr = (IPointerTypeSymbol)t; return "*" + GetTypeString (ptr.PointedAtType); default: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs index e39b07a723..1c4a7f5aa4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs @@ -227,13 +227,13 @@ namespace MonoDevelop.Ide.TypeSystem { switch (typeKind) { case Microsoft.CodeAnalysis.TypeKind.Unknown: - case Microsoft.CodeAnalysis.TypeKind.ArrayType: + case Microsoft.CodeAnalysis.TypeKind.Array: return 0; case Microsoft.CodeAnalysis.TypeKind.Class: return 0; case Microsoft.CodeAnalysis.TypeKind.Delegate: return 4; - case Microsoft.CodeAnalysis.TypeKind.DynamicType: + case Microsoft.CodeAnalysis.TypeKind.Dynamic: return 0; case Microsoft.CodeAnalysis.TypeKind.Enum: return 1; @@ -243,7 +243,7 @@ namespace MonoDevelop.Ide.TypeSystem return 2; case Microsoft.CodeAnalysis.TypeKind.Module: return 0; - case Microsoft.CodeAnalysis.TypeKind.PointerType: + case Microsoft.CodeAnalysis.TypeKind.Pointer: return 0; case Microsoft.CodeAnalysis.TypeKind.Struct: return 3; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index 66d1d1d964..8a27d19287 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -102,42 +102,42 @@ <Reference Include="System.Design" /> <Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\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.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.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>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\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> + <HintPath>..\..\..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/core/MonoDevelop.Ide/packages.config b/main/src/core/MonoDevelop.Ide/packages.config index 7089b422a8..ec91d6a940 100644 --- a/main/src/core/MonoDevelop.Ide/packages.config +++ b/main/src/core/MonoDevelop.Ide/packages.config @@ -4,7 +4,7 @@ <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.Composition" version="1.0.30" 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 26f8db4407..b63f103208 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -62,22 +62,22 @@ <HintPath>..\..\external\guiunit\bin\net_4_0\GuiUnit.exe</HintPath> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + <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.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Desktop"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> + <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop"> - <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> + <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/tests/UnitTests/packages.config b/main/tests/UnitTests/packages.config index 8ad04cd484..f8f771207f 100644 --- a/main/tests/UnitTests/packages.config +++ b/main/tests/UnitTests/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
- <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
- <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" 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 |