From 1640cb8c32f27653b58399f24e114c26573bccac Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 18 May 2012 22:23:55 +0200 Subject: Set version number to 5.0.1; fixed some compiler warnings. --- .../Completion/CSharpCompletionEngine.cs | 3 +-- .../ICSharpCode.NRefactory.CSharp.csproj | 3 ++- .../InconsistentNamingIssue/InconsistentNamingIssue.cs | 3 +-- ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs | 2 +- ICSharpCode.NRefactory/Editor/IDocument.cs | 2 +- ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs | 14 +++++++------- ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs | 6 ++---- Packages/ICSharpCode.NRefactory.nuspec | 4 ++-- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 59a02c6f..aeee45d4 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -1,4 +1,4 @@ -// +// // CSharpCompletionEngine.cs // // Author: @@ -288,7 +288,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion IEnumerable MagicKeyCompletion(char completionChar, bool controlSpace) { - ExpressionResult expr; Tuple resolveResult; switch (completionChar) { // Magic key completion diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj index f15a8381..26c93a9d 100644 --- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj +++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj @@ -41,7 +41,8 @@ TRACE;FULL_AST - none + PdbOnly + false full diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs index afc95aec..dc9d0d41 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs @@ -1,4 +1,4 @@ -// +// // InconsistentNamingIssue.cs // // Author: @@ -48,7 +48,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring { readonly InconsistentNamingIssue inspector; readonly NamingConventionService service; - List rules; public GatherVisitor (BaseRefactoringContext ctx, InconsistentNamingIssue inspector) : base (ctx) { diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs index b9cfaef0..caf62c78 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs @@ -324,7 +324,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring /// /// Renames the specified entity. /// - /// + /// /// The Entity to rename /// /// diff --git a/ICSharpCode.NRefactory/Editor/IDocument.cs b/ICSharpCode.NRefactory/Editor/IDocument.cs index ade9ea80..4201ce44 100644 --- a/ICSharpCode.NRefactory/Editor/IDocument.cs +++ b/ICSharpCode.NRefactory/Editor/IDocument.cs @@ -35,7 +35,7 @@ namespace ICSharpCode.NRefactory.Editor /// /// Gets/Sets the text of the whole document.. /// - new string Text { get; set; } // hides TextBuffer.Text to add the setter + new string Text { get; set; } // hides ITextSource.Text to add the setter /// /// This event is called directly before a change is applied to the document. diff --git a/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs b/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs index d5d3b0df..f2381b87 100644 --- a/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs +++ b/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs @@ -17,10 +17,10 @@ using System.Runtime.InteropServices; // If you need to expose a type to COM, use [ComVisible(true)] on that type. [assembly: ComVisible(false)] -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("5.0.0.6")] +// We keep the AssemblyVersion at 5.0.0.0 for all versions of NRefactory 5. +// This eliminates the need for binding redirects. +[assembly: AssemblyVersion("5.0.0.0")] + +// [AssemblyFileVersion] is the version of the NuGet package, +// should follow http://semver.org/ rules +[assembly: AssemblyFileVersion("5.0.1")] diff --git a/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs b/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs index 7a946fd5..a0a59c35 100644 --- a/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs +++ b/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs @@ -410,16 +410,14 @@ namespace ICSharpCode.NRefactory.TypeSystem #region ITypeReference.Resolve(ICompilation) /// - /// Resolves a type reference. + /// Resolves a type reference in the compilation's main type resolve context. + /// Some type references require a more specific type resolve context and will not resolve using this method. /// /// /// Returns the resolved type. /// In case of an error, returns . /// Never returns null. /// - /// - /// The compilation in which the type should be resolved. - /// public static IType Resolve (this ITypeReference reference, ICompilation compilation) { if (reference == null) diff --git a/Packages/ICSharpCode.NRefactory.nuspec b/Packages/ICSharpCode.NRefactory.nuspec index 7ffda799..770e9c00 100644 --- a/Packages/ICSharpCode.NRefactory.nuspec +++ b/Packages/ICSharpCode.NRefactory.nuspec @@ -2,7 +2,7 @@ ICSharpCode.NRefactory - 5.0.0.6 + 5.0.1 NRefactory Daniel Grunwald, Mike Krüger Daniel Grunwald @@ -11,7 +11,7 @@ http://community.sharpdevelop.net/blogs/mattward/SharpDevelop.png false NRefactory supports analysis of C# source code: it includes a parser, abstract syntax tree, type system, semantic analysis (resolver), code completion, and several refactorings. - This is an alpha release. Expect bugs and breaking changes in the future. + Copyright 2010-2012 AlphaSierraPapa C# Parser Semantic Analysis SharpDevelop -- cgit v1.2.3