diff --git a/doc/ChangeLog.xml b/doc/ChangeLog.xml index 9aa552c829..2bddcc2ceb 100644 --- a/doc/ChangeLog.xml +++ b/doc/ChangeLog.xml @@ -1,4 +1,65 @@  + Fixed SD2-402:Toolbar in bookmark pad. + some changes/fixes, LoggingService used + Allow addins to have their project/file templates stored in the addin directory. + dynamic help: new method/type detection (by Robert_G, Delphi-PRAXiS) used for Forms designer support + Allow find references and rename for local variables and parameters. + Fixed find references on private members in partial classes. + dynamic help: sorting implemented, some other fixed + Renamed InvocationExpression.Parameters to InvocationExpression.Arguments. +Fixed bug that caused SharpDevelop to add byte order marks to plain ASCII files when UTF-8 was chosen as default encoding. + When renaming a field, ask the user if he also wants to the rename the property. + dynamic help: some changes and fixes and (I hope) improvements + dynamic help: Forms designer support added; some more improvements + PropertyPad: SelectedGridItemChanged event for Dynamic Help added + Reduced number of allocations: +- do not load xml documentation keys into memory but load only the hash code and keep everything else cached on disk. +- made Dom's region a value-type. +- do not create a SortedList<string, IReturnType> for every using statement but only when the using statements actually uses aliases. +Overall SD should use ca. 10 MB RAM less when working on a big solution like SharpDevelop.sln. + dynamic help: debug info enabled; using other ResolveResult types to get more info + Fixed SD2-419:C# Parser bug (methodBase is ConstructorInfo ? #ctor : methodBase.Name). + SharpRefactory tests are now running under MbUnit. + Fixed SD2-439: VB.Net event handlers are lost. +Save layout configuration before switching layout by starting debugger or pressing Shift+Escape. + Show error message when going to designer mode in a file with syntax errors instead of displaying an empty form. + SD2-437. Source code now generated in InitializeComponent method for non-visual components. + dynamic help: some scripting improvements + I changed some of the CSharp namespace names; there are no bug fixes in this upload + Fixed some bugs. + dynamic help: I forgot the 3 images for the toolstrip (required to compile) and the HTML file and the 2 *Book.png images for the dynamic help (required to use DH) + dynamic help: added support for Help 2.0 namespace reloading + dynamic help changed and ready to use + Implemented hiding of status strip in fullscreen. +Hiding of main menu refactored. + Improved overload resolution by implementing 14.4.2.2 Better function member. + Implemented hiding of main menu and toolbar in fullscreen + Unavailable variables in debugger handled gracefully + Fixed bug that was caused by breakpoints set on non-executable lines + Fixed bug that was caused by static variables maked as ThreadStatic + Implement type argument inference for generic method calls. + Fixed "copy/cut/paste" in context menus. +Fixed ExpressionFinder bug with identifiers containing underscores. + Improved RefactoringMenuBuilder. + Fixed bug that prevented stepping through anonymous methods. + Fixed bug in search pad when document was changed after the search. +Fixed crash when two classes with the same name were removed from a project content. + Improved overload lookup (but the rules from § 14.4.2.2 are still missing). + Add option to choose between "professional" menu style and system menu style. + Allow AddIns to add their own string resources to the ResourceService. + Fixed bug in InterfaceImplementorCodeGenerator. + Removed IIndexer from ICSharpCode.Dom (replaced by IProperty.IsIndexer) + Fixed some NRefactory bugs (Generic method invocations in VB.NET and output visitor bugs) + Remove quotes from svn:keywords property. + Added fullscreen options panel (no features implemented yet) + Fixed properties on newly added xml editor test files - removed quotes from the Revision keyword. + Added xml editor tests from Fidalgo branch. The XmlSchemaCompletionData class is now using the XmlSchemaAttribute's AttributeSchemaType property instead of the obsolete AttributeType which was causing a few of the attribute value tests to fail. + Fixed bug that prevented VB.Net windows forms applications from compiling. + Right click on class and member names (and method invocations) in the text editor now shows the "go to definition" command and the class browser context menu of that item. + Core bugfixes: + - Fixed exceptions when doozer/condition evaluator is not found. + - Context menus can now use sub menu builders +Context menu in text editor now shows items from the class member bookmarks. Fixed assembly loading bug introduced in rev. 429. Add a "DoEvents" call to the workaround for SD2-426. Fixed SD2-434: Reference locking issue diff --git a/src/Tools/SVNChangeLogToXml/Main.cs b/src/Tools/SVNChangeLogToXml/Main.cs index 8b30124efa..28d5689ac3 100644 --- a/src/Tools/SVNChangeLogToXml/Main.cs +++ b/src/Tools/SVNChangeLogToXml/Main.cs @@ -31,6 +31,9 @@ class MainClass string appDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); File.Copy(@"AddIns\Misc\SubversionAddIn\RequiredLibraries\msvcr70.dll", Path.Combine(appDir, "msvcr70.dll"), true); File.Copy(@"AddIns\Misc\SubversionAddIn\RequiredLibraries\msvcp70.dll", Path.Combine(appDir, "msvcp70.dll"), true); + if (args.Length == 1 && args[0] == "--REVISION") { + CreateRevisionFile(); + } ConvertChangeLog(); return 0; } catch (Exception ex) { @@ -39,6 +42,16 @@ class MainClass } } + static void CreateRevisionFile() + { + Console.Write("Writing revision to file: "); + int rev = new Client().SingleStatus(".").Entry.Revision; + Console.WriteLine(rev); + using (StreamWriter writer = new StreamWriter("../REVISION")) { + writer.WriteLine(rev); + } + } + static void ConvertChangeLog() { Console.WriteLine("Reading SVN changelog, this might take a while..."); diff --git a/src/Tools/Tools.build b/src/Tools/Tools.build index bf8f4b5322..b4e3e67a16 100644 --- a/src/Tools/Tools.build +++ b/src/Tools/Tools.build @@ -42,12 +42,14 @@ - + - - - + + + + + diff --git a/src/Tools/UpdateAssemblyInfo/Main.cs b/src/Tools/UpdateAssemblyInfo/Main.cs index 24e731469a..08e8eb7cbf 100644 --- a/src/Tools/UpdateAssemblyInfo/Main.cs +++ b/src/Tools/UpdateAssemblyInfo/Main.cs @@ -227,10 +227,12 @@ namespace UpdateAssemblyInfo revisionNumber = revision.ToString(); } catch (Exception e) { Console.WriteLine("Reading revision number with NSvn failed: " + e.Message); - revisionNumber = ReadRevisionFromFile(); } finally { Environment.CurrentDirectory = oldWorkingDir; } + if (revisionNumber == null || revisionNumber.Length == 0 || revisionNumber == "0") { + revisionNumber = ReadRevisionFromFile(); + } if (revisionNumber == null || revisionNumber.Length == 0 || revisionNumber == "0") { throw new ApplicationException("Error reading revision number"); } diff --git a/src/prepareRelease.bat b/src/prepareRelease.bat new file mode 100644 index 0000000000..38b3b8b3e1 --- /dev/null +++ b/src/prepareRelease.bat @@ -0,0 +1,12 @@ +rem Prepares a release by updating the changelog +pushd Tools +%windir%\microsoft.net\framework\v2.0.50215\msbuild /t:PrepareRelease /property:Configuration=Release Tools.build +@popd +@IF %ERRORLEVEL% NEQ 0 PAUSE & EXIT +@echo. +@echo. +@echo. +@echo PrepareRelease.bat completed successfully. +@echo The change log has been updated and a VERSION file containing the current revision number has been created. +@echo. +@pause \ No newline at end of file diff --git a/src/publish.bat b/src/publish.bat deleted file mode 100644 index 0d5029d05d..0000000000 --- a/src/publish.bat +++ /dev/null @@ -1,18 +0,0 @@ -rem Does a releasebuild, updates the changelog and creates the installer -call releasebuild.bat -@IF %ERRORLEVEL% NEQ 0 EXIT -pushd Tools -%windir%\microsoft.net\framework\v2.0.50215\msbuild /t:publish /property:Configuration=Release Tools.build -@IF %ERRORLEVEL% NEQ 0 PAUSE & EXIT -popd -pushd ..\setup -call buildSetup.bat -@IF %ERRORLEVEL% NEQ 0 EXIT -popd -@echo. -@echo. -@echo. -@echo Publish.bat completed successfully. -@echo In the directory SharpDevelop\setup, you will find Setup.exe. -@echo. -@pause \ No newline at end of file