Added the common project

artem1t · artem1t · commit f2a9200e6bee · 2022-07-29T12:03:49.000+10:00
Changed the pipeline
diff --git a/build/pipeline.yml b/build/pipeline.yml
@@ -1,5 +1,13 @@
-parameters:
-  projectName : ''
+trigger:
+  branches:
+    include:
+    - master
+    - dev
+  paths:
+    include:
+    - src/*
+
+name: '$(Date:yyyyMMdd).$(Rev:r)[$(BuildID)]'
   
 stages:
 
@@ -19,55 +27,67 @@ stages:
 
     steps:
       - task: NuGetToolInstaller@1
-        displayName: 'Use NuGet'
+        displayName: 'Install NuGet'
 
       - task: NuGetCommand@2
-        displayName: 'NuGet restore'
+        displayName: 'Restore NuGet References'
         inputs:
           restoreSolution: '**\*.sln'
 
-      - task: DownloadSecureFile@1
-        name: Certificate
-        displayName: 'Download code signing certificate'
-        inputs:
-          secureFile: xarial.snk
-
-      - task: VSBuild@1
-        displayName: 'Build and pack preview version'
-        inputs:
-          solution: 'src\${{ parameters.projectName }}\*.csproj'
-          msbuildArgs: '/t:pack /p:OutputPath=$(System.DefaultWorkingDirectory)\build\preview;SignAssembly=true;AssemblyOriginatorKeyFile=$(Certificate.secureFilePath);DelaySign=false;VersionSuffix=$(Build.BuildNumber)'
-          platform: '$(BuildPlatform)'
-          configuration: '$(BuildConfiguration)'
-      
-      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        - task: VSBuild@1
-          displayName: 'Build and pack release version'
-          inputs:
-            solution: 'src\${{ parameters.projectName }}\*.csproj'
-            msbuildArgs: '/t:pack /p:OutputPath=$(System.DefaultWorkingDirectory)\build\release;SignAssembly=true;AssemblyOriginatorKeyFile=$(Certificate.secureFilePath);DelaySign=false'
-            platform: '$(BuildPlatform)'
-            configuration: '$(BuildConfiguration)'
-            
       - task: VSBuild@1
         displayName: 'Build test projects'
         inputs:
-            solution: 'tests\${{ parameters.projectName }}.Tests\*.csproj'
+            solution: 'tests\*.Tests\*.csproj'
             platform: '$(BuildPlatform)'
             configuration: '$(BuildConfiguration)'
-            
+
       - task: VSTest@2
-        displayName: 'Unit test'
+        displayName: 'Run unit tests'
         inputs:
           testAssemblyVer2: |
             **\$(BuildConfiguration)\**\*tests*.dll
             !**\obj\**
           platform: '$(BuildPlatform)'
           configuration: '$(BuildConfiguration)'
+
+      - task: DownloadSecureFile@1
+        name: Certificate
+        displayName: 'Download code signing certificate'
+        inputs:
+          secureFile: xarial.snk
+
+      - task: VSBuild@1
+        displayName: 'Build projects'
+        inputs:
+          solution: 'src/**/*.csproj'
+          msbuildArgs: '/p:SignAssembly=true;AssemblyOriginatorKeyFile=$(Certificate.secureFilePath);DelaySign=false;BuildNumber=.$(Build.BuildID)'
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+
+      - ${{ if and(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+        - task: DotNetCoreCLI@2
+          displayName: 'Pack preview versions'
+          inputs:
+            command: pack
+            packagesToPack: 'src/**/*.csproj'
+            configurationToPack: $(BuildConfiguration)
+            outputDir: $(Build.ArtifactStagingDirectory)/packages/preview
+            nobuild: true
+            buildProperties: 'VersionSuffix=preview.$(Build.BuildId)'
+
+      - ${{ if and(eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+        - task: DotNetCoreCLI@2
+          displayName: 'Pack production versions'
+          inputs:
+            command: pack
+            packagesToPack: 'src/**/*.csproj'
+            configurationToPack: $(BuildConfiguration)
+            outputDir: $(Build.ArtifactStagingDirectory)/packages/release
+            nobuild: true
       
       - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
         - task: CopyFiles@2
-          displayName: 'Copy Nuget Package'
+          displayName: 'Copy NuGet packages to artifacts folder'
           inputs:
             SourceFolder: '$(system.defaultworkingdirectory)/build'
             Contents: |
@@ -77,6 +97,7 @@ stages:
       
       - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
         - publish: '$(Build.ArtifactStagingDirectory)/packages'
+          displayName: 'Publish packages artifact'
           artifact: 'packages'
 
 - stage: 'PublishPreviewNuGetPackage'
diff --git a/build/utils-pipeline.yml b/build/utils-pipeline.yml
diff --git a/build/wpf-pipeline.yml b/build/wpf-pipeline.yml
diff --git a/common/common.props b/common/common.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <OutputPath>..\..\_build\</OutputPath>
+    <Product>xToolkit</Product>
+    <BuildNumber></BuildNumber>
+    <VersionPrefix>0.4.0$(BuildNumber)</VersionPrefix>
+    <Company>Xarial Pty Limited</Company>
+    <Copyright>Copyright © Xarial Pty Limited 2022</Copyright>
+    <Authors>Xarial</Authors>
+    <PackageProjectUrl>https://xtoolkit.xarial.com</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/xarial/xtoolkit</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <SignAssembly>false</SignAssembly>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+	<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
+  </PropertyGroup>
+</Project>
diff --git a/src/Utils/CommandLineUtils.cs b/src/Utils/CommandLineUtils.cs
@@ -12,12 +12,21 @@
 
 namespace Xarial.XToolkit
 {
+    /// <summary>
+    /// Provides utility functions for working with command line
+    /// </summary>
     public static class CommandLineUtils
     {
         [DllImport("shell32.dll", SetLastError = true)]
         private static extern IntPtr CommandLineToArgvW(
             [MarshalAs(UnmanagedType.LPWStr)] string lpCmdLine, out int pNumArgs);
 
+        /// <summary>
+        /// Extracts arguments from the command line string
+        /// </summary>
+        /// <param name="cmdLineArgs">Command line arguments</param>
+        /// <returns>Separated arguments</returns>
+        /// <exception cref="Exception"></exception>
         public static string[] ParseCommandLine(string cmdLineArgs)
         {
             int count;
diff --git a/src/Utils/FileSystemUtils.cs b/src/Utils/FileSystemUtils.cs
@@ -114,18 +114,6 @@ public static string GetRelativePath(string thisPath, string relativeToDir)
             }
         }
 
-        private static string NormalizeDirectoryPath(string path)
-        {
-            if (!path.EndsWith("\\"))
-            {
-                return path + "\\";
-            }
-            else 
-            {
-                return path;
-            }
-        }
-
         /// <summary>
         /// Opens file explorer at the specified folder
         /// </summary>
@@ -183,5 +171,17 @@ public static string ReplaceIllegalRelativePathCharacters(string path, Func<char
 
             return res.ToString();
         }
+
+        private static string NormalizeDirectoryPath(string path)
+        {
+            if (!path.EndsWith("\\"))
+            {
+                return path + "\\";
+            }
+            else
+            {
+                return path;
+            }
+        }
     }
 }
diff --git a/src/Utils/Helpers/JsonFileSerializer.cs b/src/Utils/Helpers/JsonFileSerializer.cs
diff --git a/src/Utils/Services/UserSettings/Converters/SettingsJsonConverter.cs.cs b/src/Utils/Services/UserSettings/Converters/SettingsJsonConverter.cs.cs
@@ -34,10 +34,7 @@ protected SettingsJsonConverter(Type settsType, bool canRead, bool canWrite, Ver
 
         public override bool CanWrite => m_CanWrite;
 
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == m_SettsType;
-        }
+        public override bool CanConvert(Type objectType) => objectType == m_SettsType;
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
diff --git a/src/Utils/Utils.csproj b/src/Utils/Utils.csproj
@@ -4,32 +4,15 @@
     <RootNamespace>Xarial.XToolkit</RootNamespace>
     <AssemblyName>Xarial.XToolkit</AssemblyName>
     <TargetFrameworks>net6.0;netstandard2.1;net461</TargetFrameworks>
-	  <SignAssembly>false</SignAssembly>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>Xarial.XToolkit</PackageId>
-    <VersionPrefix>0.4.0</VersionPrefix>
-    <Authors>Xarial</Authors>
-    <Product>xToolkit</Product>
-    <Copyright>© 2022 Xarial Pty Limited</Copyright>
-    <PackageProjectUrl>https://xtoolkit.xarial.com</PackageProjectUrl>
-    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
-    <Company>Xarial Pty Limited</Company>
-    <RepositoryUrl>https://github.com/xarial/xtoolkit</RepositoryUrl>
     <PackageTags>toolkit,settings,reflection</PackageTags>
     <Description>Collection of utility functions</Description>
-    <RepositoryType>git</RepositoryType>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl>https://xarial.com/xtoolkit-icon.png</PackageIconUrl>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
+  <Import Project="..\..\common\common.props" />
   
   <ItemGroup>
     <None Include="..\..\data\icon.png">
diff --git a/src/Wpf/Wpf.csproj b/src/Wpf/Wpf.csproj
@@ -1,39 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
     <TargetFrameworks>net6.0-windows;netcoreapp3.1;net461</TargetFrameworks>
     <RootNamespace>Xarial.XToolkit.Wpf</RootNamespace>
     <AssemblyName>Xarial.XToolkit.Wpf</AssemblyName>
-	  <SignAssembly>false</SignAssembly>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>Xarial.XToolkit.Wpf</PackageId>
-    <VersionPrefix>0.4.0</VersionPrefix>
-    <Authors>Xarial</Authors>
-    <Product>xToolkit</Product>
-    <Copyright>© 2022 Xarial Pty Limited</Copyright>
-    <PackageProjectUrl>https://xtoolkit.xarial.com</PackageProjectUrl>
-    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
-    <Company>Xarial Pty Limited</Company>
-    <RepositoryUrl>https://github.com/xarial/xtoolkit</RepositoryUrl>
     <PackageTags>toolkit,wpf,controls</PackageTags>
     <Description>Collection of WPF Controls and utilities</Description>
-    <RepositoryType>git</RepositoryType>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl>https://xarial.com/xtoolkit-icon.png</PackageIconUrl>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
-  </PropertyGroup>
-  
+  <Import Project="..\..\common\common.props" />
+
   <ItemGroup>
     <None Include="..\..\data\icon.png">
       <Pack>True</Pack>

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,7 @@ protected SettingsJsonConverter(Type settsType, bool canRead, bool canWrite, Ver`
`34`	`34`
`35`	`35`	`public override bool CanWrite => m_CanWrite;`
`36`	`36`
`37`		`- public override bool CanConvert(Type objectType)`
`38`		`- {`
`39`		`- return objectType == m_SettsType;`
`40`		`- }`
	`37`	`+ public override bool CanConvert(Type objectType) => objectType == m_SettsType;`
`41`	`38`
`42`	`39`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`43`	`40`	`{`