Merge pull request #16 from usysware/Release

Out of beta release

DPackRx/Features/Bookmarks/BookmarksService.cs

@@ -114,7 +114,7 @@ public void RegisterCallback(IBookmarkCallbackClient client, string fileName)
 				return;
 			}
 
-			_log.LogMessage($"File '{Path.GetFileName(fileName)}' registered for bookmarks callback", LOG_CATEGORY);
+			_log.LogMessage($"Registered for bookmarks callback: {Path.GetFileName(fileName)}", LOG_CATEGORY);
 			_bookmarkCallbacks.Add(fileName, client);
 		}
 
@@ -136,7 +136,7 @@ public void UnregisterCallback(IBookmarkCallbackClient client)
 			var fileName = _bookmarkCallbacks.First(b => b.Value == client).Key;
 			if (!string.IsNullOrEmpty(fileName))
 				_bookmarkCallbacks.Remove(fileName);
-			_log.LogMessage($"File '{Path.GetFileName(fileName)}' unregistered for bookmarks callback", LOG_CATEGORY);
+			_log.LogMessage($"Unregistered for bookmarks callback: {Path.GetFileName(fileName)}", LOG_CATEGORY);
 		}
 
 		/// <summary>
@@ -189,7 +189,7 @@ public bool SetBookmark(int number)
 			if (position.IsEmpty())
 				return false;
 
-			_log.LogMessage($"Setting '{fileName}' bookmark # {number}", LOG_CATEGORY);
+			_log.LogMessage($"Setting bookmark # {number}: {fileName}", LOG_CATEGORY);
 			List<Bookmark> bookmarks;
 			if (_bookmarks.ContainsKey(fileName))
 			{
@@ -257,7 +257,7 @@ public bool GoToBookmark(int number)
 				return false;
 			}
 
-			_log.LogMessage($"Looking for '{fileName}' bookmark # {number}", LOG_CATEGORY);
+			_log.LogMessage($"Looking for bookmark # {number}: {fileName}", LOG_CATEGORY);
 			var bookmarks = _bookmarks[fileName];
 			var bookmark = bookmarks.FirstOrDefault(b => (b.Number == number) && (b.Type == BookmarkType.Local));
 			if (bookmark != null)
@@ -315,7 +315,7 @@ public bool SetGlobalBookmark(int number)
 				}
 			}
 
-			_log.LogMessage($"Setting '{fileName}' global bookmark # {number}", LOG_CATEGORY);
+			_log.LogMessage($"Setting global bookmark # {number}: {fileName}", LOG_CATEGORY);
 			List<Bookmark> bookmarks;
 			if (_bookmarks.ContainsKey(fileName))
 			{
@@ -416,7 +416,7 @@ public bool ClearFileBookmarks()
 			if (_bookmarks.ContainsKey(fileName))
 				_bookmarks.Remove(fileName);
 			_shellStatusBarService.SetStatusBarText("Cleared all file bookmarks");
-			_log.LogMessage($"Cleared all '{fileName}' bookmarks", LOG_CATEGORY);
+			_log.LogMessage($"Cleared all bookmarks: {fileName}", LOG_CATEGORY);
 
 			DoChanged(fileName, 0, BookmarkType.Any);
 			return true;

DPackRx/Options/OptionsService.cs

@@ -359,7 +359,7 @@ private bool Save(KnownFeature feature)
 			}
 
 			_optionsPersistenceService.SaveOptions(feature, _options[feature]);
-			_log.LogMessage("Options saved", LOG_CATEGORY);
+			_log.LogMessage($"Options saved: {feature.GetDescription()}", LOG_CATEGORY);
 
 			return true;
 		}

DPackRx/Package/PackageService.cs

@@ -161,7 +161,9 @@ public string Version
 			get
 			{
 				var version = Assembly.GetExecutingAssembly().GetName().Version;
-				if (version.Revision == 0)
+				if (version.Major == 0)
+					return string.Empty; // debugging scenario
+				else if (version.Revision == 0)
 					return version.ToString(3); // w/o revision
 				else
 					return version.ToString(); // full version

DPackRx/source.extension.vsixmanifest

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="3D22E261-32E5-46CE-A4B0-B884FA49A9A2" Version="4.0.0.34" Language="en-US" Publisher="USysWare" />
+        <Identity Id="3D22E261-32E5-46CE-A4B0-B884FA49A9A2" Version="4.0.1.0" Language="en-US" Publisher="USysWare" />
         <DisplayName>DPack Rx</DisplayName>
         <Description xml:space="preserve">FREE tools collection designed to greatly increase developer's productivity, automate repetitive processes and expand upon some of Microsoft Visual Studio features. Visual Studio 2017 and 2019 are supported.</Description>
         <MoreInfo>https://github.com/usysware/dpack</MoreInfo>
         <Icon>Resources\Package.ico</Icon>
         <PreviewImage>Resources\Preview.png</PreviewImage>
         <Tags>Code, Coding, Tools, Productivity, DPack</Tags>
-        <Preview>true</Preview>
     </Metadata>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />

README.md

@@ -3,17 +3,13 @@
 
 [[What is DPack Rx]](#what-is-dpack-rx) [[What's included]](#what-features-are-included-so-far) [[Major changes]](#major-changes) [[Future plans]](#future-plans) [[Contribute]](#help-needed) [[Donate]](#donate)
 
-# DPack is in BETA!
-
-Please be aware that [DPack Rx](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPackRx) currently is and will remain for a while in **BETA** status. Tread carefully and report any issues you might find. Thanks!
-
 ### DPack Rx (former DPack)
 
 FREE tools collection designed to greatly increase developer's productivity, automate repetitive processes and expand upon some of Microsoft Visual Studio features. Visual Studio 2017 and 2019 are supported.
 
 ### What is DPack Rx?
 
-DPack Rx is an effort to remedy former [DPack](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPack-16348) limitations: bring it under OSS umbrella, upgrade it for more modern Visual Studio integration, and apply more modern technology and development practices. I also felt the effort needed a new product name.
+[DPack Rx](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPackRx) is an effort to remedy former [DPack](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPack-16348) limitations: bring it under OSS umbrella, upgrade it for more modern Visual Studio integration, and apply more modern technology and development practices. I also felt the effort needed a new product name.
 
 Driving principal behind DPack design is fire-and-forget user experience with minimal impact on the development environment. To adhere to that principal most of the major features are invoked on demand, present a dialog (if applicable), which goes away once user interaction ends. Little to no impact on the development environment is expected from thereafter. Taking all that into account, features such as ToolWindow support don't fit well into that design paradigm.
 
@@ -51,7 +47,6 @@ Driving principal behind DPack design is fire-and-forget user experience with mi
 
 ### Help needed
 
-- Testing the latest beta on VS 2017 and 2019
 - Graphics for DPack's menu items
 
 Thanks and enjoy.