Merge pull request #17 from usysware/AzurePipeline

Modified pipeline for non-beta builds.
sergey-visual-studio · Dec 6, 2020 · 30bcfa9 · 30bcfa9
2 parents 34244b2 + e82910f
commit 30bcfa9
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 51 deletions.
diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
@@ -3,6 +3,22 @@
 # Add steps that publish symbols, save build artifacts, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
+parameters:
+- name: configuration
+  displayName: Build Configuration
+  type: string
+  default: Release
+  values:
+  - Debug
+  - Release
+- name: beta
+  displayName: Beta
+  type: boolean
+  default: false
+  values:
+  - true
+  - false
+
 trigger:
   batch: true
   branches:
@@ -15,9 +31,9 @@ pool:
 variables:
   solution: 'DPackRx.sln'
   buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
+  buildConfiguration: ${{ parameters.configuration }}
 
-name: "DPack.$(Date:yyyyMMdd).$(Build.BuildID)$(BuildBeta)"
+name: "DPackRx.$(Date:yyyyMMdd).$(Build.BuildID)"
 steps:
 - task: NuGetToolInstaller@1
 
@@ -32,7 +48,7 @@ steps:
     solution: '$(solution)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
-    msbuildArgs: '-verbosity:minimal -p:DeployExtension=false -p:BETA=$(BuildBeta)'
+    msbuildArgs: '-verbosity:minimal -p:DeployExtension=false -p:BETA=${{ parameters.beta }}'
 
 - task: VSTest@2
   inputs:

diff --git a/.azure/vsix-readme.md b/.azure/vsix-readme.md
@@ -1,6 +1,4 @@
-Please be aware that DPack Rx currently is and will remain for a while in **BETA** status.
-
-DPack Rx is a free collection of solution, project and file navigation and productivity tools for Visual Studio. DPack Rx is an evolution of the [original DPack](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPack-16348), built as an OS project. It's currently in _BETA_.
+DPack Rx is a free collection of solution, project and file navigation and productivity tools for Visual Studio. DPack Rx is an evolution of the [original DPack](https://marketplace.visualstudio.com/items?itemName=SergeyM.DPack-16348), built as an OS project.
 
 DPack Rx includes various navigation tools (aka browsers) that allow the developer to quickly find solution files, types, particular type code members, methods or properties for instance. DPack Rx also includes greatly enhanced numbered bookmarks feature, and much more.
 

diff --git a/DPackRx.Tests/Properties/AssemblyInfo.cs b/DPackRx.Tests/Properties/AssemblyInfo.cs
@@ -1,13 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
-[assembly: AssemblyTitle("USysWare DPack Rx Tests")]
-[assembly: AssemblyCompany("USysWare, Inc.")]
-[assembly: AssemblyCopyright("Copyright © 2004-2019 USysWare, Inc.")]
-[assembly: AssemblyTrademark("USysWare, Inc.")]
+[assembly: AssemblyTitle("DPack Rx Tests")]
+[assembly: AssemblyCopyright("Copyright © 2004-2020 Sergey Mishkovskiy")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyProduct("DPack Rx")]
-[assembly: AssemblyDescription("USysWare DPack Rx Tests")]
+[assembly: AssemblyDescription("DPack Rx Tests")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 

diff --git a/DPackRx/DPackRx.csproj b/DPackRx/DPackRx.csproj
@@ -46,7 +46,7 @@
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <DefineConstants Condition=" '$(BETA)' != '' ">$(DefineConstants);BETA</DefineConstants>
+    <DefineConstants Condition=" '$(BETA)' == 'true' ">$(DefineConstants);BETA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>rules.ruleset</CodeAnalysisRuleSet>

diff --git a/DPackRx/Features/CodeBrowser/CodeBrowserViewModel.cs b/DPackRx/Features/CodeBrowser/CodeBrowserViewModel.cs
@@ -270,7 +270,7 @@ private void ApplyMembers()
 				filter = "methods";
 			else if (this.Filter.HasFlag(CodeModelFilterFlags.Properties))
 				filter = "properties";
-			this.Title = $"USysWare Code Browser {(string.IsNullOrEmpty(filter) ? string.Empty : $"- {filter} ")}- {Path.GetFileName(this.FileName)}";
+			this.Title = $"Code Browser {(string.IsNullOrEmpty(filter) ? string.Empty : $"- {filter} ")}- {Path.GetFileName(this.FileName)}";
 
 			_sourceMembers.Clear();
 			_sourceMembers.AddRange(members); // causes filter to be evaluated

diff --git a/DPackRx/Features/FileBrowser/FileBrowserWindow.xaml b/DPackRx/Features/FileBrowser/FileBrowserWindow.xaml
@@ -11,7 +11,7 @@
         d:DataContext="{d:DesignInstance Type=local:FileBrowserViewModel, IsDesignTimeCreatable=True}"
         Icon="Images/FileBrowser.ico"
         Height="400" Width="600" MinHeight="200" MinWidth="400"
-        Title="USysWare File Browser" WindowStartupLocation="CenterOwner" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        Title="File Browser" WindowStartupLocation="CenterOwner" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
         behaviors:WindowCloseOnEsc.Enabled="True"
         behaviors:WindowClose.DialogResult="{Binding CloseWindow}">
 

diff --git a/DPackRx/Package/IDs.cs b/DPackRx/Package/IDs.cs
@@ -7,8 +7,7 @@ public static class IDs
 	{
 		public const int PRODUCT = 101;
 		public const int ABOUT = 102;
-		public const int COMPANY = 103;
-		public const int URL = 104;
-		public const int EMAIL = 105;
+		public const int URL = 103;
+		public const int EMAIL = 104;
 	}
 }
diff --git a/DPackRx/Package/IPackageService.cs b/DPackRx/Package/IPackageService.cs
@@ -29,11 +29,6 @@ public interface IPackageService : IServiceProvider
 		/// </summary>
 		string ProductName { get; }
 
-		/// <summary>
-		/// Product company name.
-		/// </summary>
-		string CompanyName { get; }
-
 		/// <summary>
 		/// Product version.
 		/// </summary>

diff --git a/DPackRx/Package/PackageService.cs b/DPackRx/Package/PackageService.cs
@@ -145,14 +145,6 @@ public string ProductName
 			get { return GetResourceString(IDs.PRODUCT); }
 		}
 
-		/// <summary>
-		/// Product company name.
-		/// </summary>
-		public string CompanyName
-		{
-			get { return GetResourceString(IDs.COMPANY); }
-		}
-
 		/// <summary>
 		/// Product version.
 		/// </summary>

diff --git a/DPackRx/Properties/AssemblyInfo.cs b/DPackRx/Properties/AssemblyInfo.cs
@@ -2,13 +2,11 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("USysWare DPack Rx")]
-[assembly: AssemblyCompany("USysWare, Inc.")]
-[assembly: AssemblyCopyright("Copyright © 2004-2020 USysWare, Inc.")]
-[assembly: AssemblyTrademark("USysWare, Inc.")]
+[assembly: AssemblyTitle("DPack Rx")]
+[assembly: AssemblyCopyright("Copyright © 2004-2020 Sergey Mishkovskiy")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyProduct("DPack Rx")]
-[assembly: AssemblyDescription("USysWare DPack Rx for Visual Studio")]
+[assembly: AssemblyDescription("DPack Rx for Visual Studio")]
 [assembly: ComVisible(true)]
 
 [assembly: InternalsVisibleTo("DPackRx.Tests")]

diff --git a/DPackRx/Resources/VSPackage.resx b/DPackRx/Resources/VSPackage.resx
@@ -123,19 +123,15 @@
   </data>
   <data name="102" xml:space="preserve">
     <value>DPack Rx for Visual Studio
-Copyright © 2004-2020 USysWare, Inc.</value>
+Copyright © 2004-2020 Sergey Mishkovskiy</value>
     <comment>Help|About</comment>
   </data>
   <data name="103" xml:space="preserve">
-    <value>USysWare</value>
-    <comment>Short company name</comment>
-  </data>
-  <data name="104" xml:space="preserve">
     <value>https://github.com/usysware/dpack</value>
     <comment>Project URL</comment>
   </data>
-  <data name="105" xml:space="preserve">
-    <value>usysware@outlook.com</value>
+  <data name="104" xml:space="preserve">
+    <value>sergey-visual-studio@outlook.com</value>
     <comment>Project email</comment>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

diff --git a/DPackRx/Services/Log.cs b/DPackRx/Services/Log.cs
@@ -153,17 +153,14 @@ private void Open()
 			if (_file != null)
 				return;
 
-			var attrib = (AssemblyCompanyAttribute)Attribute.GetCustomAttribute(
-				this.GetType().Assembly, typeof(AssemblyCompanyAttribute), false);
-			var attribs = attrib.Company.Split(' ');
-			var companyName = attribs[0];
-			if (companyName.EndsWith(",", StringComparison.OrdinalIgnoreCase))
-				companyName = companyName.Substring(0, companyName.Length - 1);
+			var attrib = (AssemblyProductAttribute)Attribute.GetCustomAttribute(
+				this.GetType().Assembly, typeof(AssemblyProductAttribute), false);
+			var product = attrib.Product;
 
 			var logFullName = Path.Combine(
 				Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-				companyName,
-				$"DPack for VS {_packageService.VSKnownVersion}",
+				product,
+				$"VS {_packageService.VSKnownVersion}",
 				this.GetType().Assembly.GetName().Name + ".log");
 
 			var dirName = Path.GetDirectoryName(logFullName);

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ Driving principal behind DPack design is fire-and-forget user experience with mi
 
 Thanks and enjoy.
 
-Sergey @ USysWare
+Sergey Mishkovskiy
 
 ### Donate