v1.1.0

Author: adamecr

Commons.sln

@@ -18,7 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		license.txt = license.txt
-		netcoreTemplate.sln.DotSettings.user = netcoreTemplate.sln.DotSettings.user
 		readme.md = readme.md
 		release.chklist = release.chklist
 		Version.props = Version.props

Directory.Build.targets

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
       ======================================================================================= 
-      RAD Customized build process v1.0.1
+      RAD Customized build process v1.0.2
       =======================================================================================
     -->
 

Version.props

@@ -8,12 +8,12 @@
     -->
   <PropertyGroup>
     <RadMajor>1</RadMajor>
-    <RadMinor>0</RadMinor>
+    <RadMinor>1</RadMinor>
     <RadPatch>0</RadPatch>
-    <RadBuild>493</RadBuild>
-    <PackageVersionShort>1.0.0</PackageVersionShort>
-    <PackageVersionFull>1.0.0+493.181221114250.master.e752c43</PackageVersionFull>
-    <GitCommit>e752c43</GitCommit>
-    <GitBranch>master</GitBranch>
+    <RadBuild>515</RadBuild>
+    <PackageVersionShort>1.1.0</PackageVersionShort>
+    <PackageVersionFull>1.1.0+515.181229223445.release.7d9ca8f-dirty</PackageVersionFull>
+    <GitCommit>7d9ca8f-dirty</GitCommit>
+    <GitBranch>release</GitBranch>
   </PropertyGroup>
 </Project>

build.tasks/GenerateNuSpecFileTask.cs

@@ -84,7 +84,12 @@ public class GenerateNuSpecFileTask : Task
         /// URL to package license
         /// </summary>
         public string PackageLicenseUrl { get; set; }
-
+        
+        /// <summary>
+        /// Package license type
+        /// </summary>
+        public string PackageLicense { get; set; }
+        
         /// <summary>
         /// URL to package project
         /// </summary>
@@ -198,7 +203,15 @@ public override bool Execute()
             sb.AppendLine($"  <title>{title}</title>");
             sb.AppendLine($"  <owners>{Authors}</owners>");
             sb.AppendLine($"  <requireLicenseAcceptance>{PackageRequireLicenseAcceptance}</requireLicenseAcceptance>");
-            sb.AppendLine($"  <licenseUrl>{PackageLicenseUrl}</licenseUrl>");
+            // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression
+            if (!string.IsNullOrEmpty(PackageLicense))
+            {
+                sb.AppendLine($"  <license type=\"expression\">{PackageLicense}</license>");
+            }
+            else
+            {
+                sb.AppendLine($"  <licenseUrl>{PackageLicenseUrl}</licenseUrl>");
+            }
             sb.AppendLine($"  <projectUrl>{PackageProjectUrl}</projectUrl>");
             sb.AppendLine($"  <iconUrl>{PackageIconUrl}</iconUrl>");
             sb.AppendLine($"  <description>{Description}</description>");
@@ -265,7 +278,10 @@ public override bool Execute()
 
                 foreach (var src in SourceFiles)
                 {
-                    var srcFileRel = src.GetMetadata("OriginalItemSpec").Replace($@"{ProjectDirectory}\", "");
+                    var srcFileOriginal = src.GetMetadata("OriginalItemSpec");
+                    var srcFileRel = srcFileOriginal.Replace($@"{ProjectDirectory}\", "");
+                    if (Path.IsPathRooted(srcFileRel)) continue; //not a project file (probably source-only package) - project files have the relative path in srcFileRel, non project files have full path in srcFileRel 
+
                     var targetFile = Path.Combine("src", ProjectName, srcFileRel);
                     sb.AppendLine($@"    <file src=""{src}"" target=""{targetFile}"" />");
                 }

build.tasks/sourceOnlyPackage/GenerateSourceOnlyPackageNuspecsTask.cs

@@ -28,7 +28,11 @@ public class GenerateSourceOnlyPackageNuspecsTask : Task
         /// <summary>
         /// URL to package license
         /// </summary>
-        public string PackageLicenseUrl { get; set; }
+        public string PackageLicenseUrl { get; set; } 
+        /// <summary>
+        /// Package license type
+        /// </summary>
+        public string PackageLicense { get; set; }
         /// <summary>
         /// URL to package project
         /// </summary>
@@ -137,7 +141,15 @@ public override bool Execute()
                 SetOrCreateElement(metadataXElement, "owners", ns, Authors);
                 SetOrCreateElement(metadataXElement, "description", ns, $"Source only package {packageId}", false); //don't override if exists
                 SetOrCreateElement(metadataXElement, "requireLicenseAcceptance", ns, PackageRequireLicenseAcceptance);
-                SetOrCreateElement(metadataXElement, "licenseUrl", ns, PackageLicenseUrl);
+                if (!string.IsNullOrEmpty(PackageLicense))
+                {
+                    SetOrCreateElement(metadataXElement, "license", ns, PackageLicense).
+                        Add(new XAttribute("type","expression"));
+                }
+                else
+                {
+                    SetOrCreateElement(metadataXElement, "licenseUrl", ns, PackageLicenseUrl);
+                }
                 SetOrCreateElement(metadataXElement, "projectUrl", ns, PackageProjectUrl);
                 SetOrCreateElement(metadataXElement, "iconUrl", ns, PackageIconUrl);
                 SetOrCreateElement(metadataXElement, "copyright", ns, Copyright);

build/custom/Build.props

@@ -11,6 +11,7 @@
     <Copyright>Radek Adamec 2018</Copyright>
     <Description>Library of common helpers, utilities and extensions</Description>
     <PackageLicenseUrl>https://github.com/adamecr/Commons/blob/master/license.txt</PackageLicenseUrl>
+    <PackageLicense>MIT</PackageLicense>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://github.com/adamecr/Commons</PackageProjectUrl>
     <RepositoryUrl>https://github.com/adamecr/Commons.git</RepositoryUrl>

build/master/use/NuGet.targets

@@ -52,6 +52,7 @@
       Authors="$(Authors)"
       PackageRequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
       PackageLicenseUrl="$(PackageLicenseUrl)"
+      PackageLicense="$(PackageLicense)"
       PackageProjectUrl="$(PackageProjectUrl)"
       PackageIconUrl="$(PackageIconUrl)"
       Description="$(Description)"

build/master/use/NuGetSourceOnly.targets

@@ -61,6 +61,7 @@
       Authors="$(Authors)"
       PackageRequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
       PackageLicenseUrl="$(PackageLicenseUrl)"
+      PackageLicense="$(PackageLicense)"
       PackageProjectUrl="$(PackageProjectUrl)"
       PackageIconUrl="$(PackageIconUrl)"
       Copyright="$(Copyright)"

changelog.md

@@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.1.0] - 2018-12-29 ##
+
+### Added ###
+- CommonLogging: extended methods for Trace
+- CommonLogging: extended methods for pass-throu exception logging of existing exceptions
+- CommonLogging: extended methods for exception logging in catch filters
+
+### Changed ###
+- CommonLogging: Removed dependency on ProxyFoo
+- CommonLogging: Extensions class LoggerExtensions replaced by "regular" class LoggerExt, interface ILogger extended with the methods directly
+- CommonLogging: Explicit methods for logging with the correlation ID
+- Adjusted (somehow unified) argument validations
+- Small corrections in code and package documentation
+
 ## [1.0.0] - 2018-12-21 ##
 ### Added ###
 - Packages published to NuGet
@@ -16,5 +30,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release
 - NuGet packages are not published yet, they will be published with v1.0.0
 
+[1.1.0]: https://github.com/adamecr/Commons/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/adamecr/Commons/compare/v0.1.0...v1.0.0
 [0.1.0]: https://github.com/adamecr/Commons/releases/tag/v0.1.0