Skip to content

Commit 895945c

Browse files
committed
v1.1.0
1 parent c0da8ef commit 895945c

File tree

70 files changed

+3493
-934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3493
-934
lines changed

Commons.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
Directory.Build.props = Directory.Build.props
1919
Directory.Build.targets = Directory.Build.targets
2020
license.txt = license.txt
21-
netcoreTemplate.sln.DotSettings.user = netcoreTemplate.sln.DotSettings.user
2221
readme.md = readme.md
2322
release.chklist = release.chklist
2423
Version.props = Version.props

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!--
44
=======================================================================================
5-
RAD Customized build process v1.0.1
5+
RAD Customized build process v1.0.2
66
=======================================================================================
77
-->
88

Version.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
-->
99
<PropertyGroup>
1010
<RadMajor>1</RadMajor>
11-
<RadMinor>0</RadMinor>
11+
<RadMinor>1</RadMinor>
1212
<RadPatch>0</RadPatch>
13-
<RadBuild>493</RadBuild>
14-
<PackageVersionShort>1.0.0</PackageVersionShort>
15-
<PackageVersionFull>1.0.0+493.181221114250.master.e752c43</PackageVersionFull>
16-
<GitCommit>e752c43</GitCommit>
17-
<GitBranch>master</GitBranch>
13+
<RadBuild>515</RadBuild>
14+
<PackageVersionShort>1.1.0</PackageVersionShort>
15+
<PackageVersionFull>1.1.0+515.181229223445.release.7d9ca8f-dirty</PackageVersionFull>
16+
<GitCommit>7d9ca8f-dirty</GitCommit>
17+
<GitBranch>release</GitBranch>
1818
</PropertyGroup>
1919
</Project>

build.tasks/GenerateNuSpecFileTask.cs

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ public class GenerateNuSpecFileTask : Task
8484
/// URL to package license
8585
/// </summary>
8686
public string PackageLicenseUrl { get; set; }
87-
87+
88+
/// <summary>
89+
/// Package license type
90+
/// </summary>
91+
public string PackageLicense { get; set; }
92+
8893
/// <summary>
8994
/// URL to package project
9095
/// </summary>
@@ -198,7 +203,15 @@ public override bool Execute()
198203
sb.AppendLine($" <title>{title}</title>");
199204
sb.AppendLine($" <owners>{Authors}</owners>");
200205
sb.AppendLine($" <requireLicenseAcceptance>{PackageRequireLicenseAcceptance}</requireLicenseAcceptance>");
201-
sb.AppendLine($" <licenseUrl>{PackageLicenseUrl}</licenseUrl>");
206+
// ReSharper disable once ConvertIfStatementToConditionalTernaryExpression
207+
if (!string.IsNullOrEmpty(PackageLicense))
208+
{
209+
sb.AppendLine($" <license type=\"expression\">{PackageLicense}</license>");
210+
}
211+
else
212+
{
213+
sb.AppendLine($" <licenseUrl>{PackageLicenseUrl}</licenseUrl>");
214+
}
202215
sb.AppendLine($" <projectUrl>{PackageProjectUrl}</projectUrl>");
203216
sb.AppendLine($" <iconUrl>{PackageIconUrl}</iconUrl>");
204217
sb.AppendLine($" <description>{Description}</description>");
@@ -265,7 +278,10 @@ public override bool Execute()
265278

266279
foreach (var src in SourceFiles)
267280
{
268-
var srcFileRel = src.GetMetadata("OriginalItemSpec").Replace($@"{ProjectDirectory}\", "");
281+
var srcFileOriginal = src.GetMetadata("OriginalItemSpec");
282+
var srcFileRel = srcFileOriginal.Replace($@"{ProjectDirectory}\", "");
283+
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
284+
269285
var targetFile = Path.Combine("src", ProjectName, srcFileRel);
270286
sb.AppendLine($@" <file src=""{src}"" target=""{targetFile}"" />");
271287
}

build.tasks/sourceOnlyPackage/GenerateSourceOnlyPackageNuspecsTask.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ public class GenerateSourceOnlyPackageNuspecsTask : Task
2828
/// <summary>
2929
/// URL to package license
3030
/// </summary>
31-
public string PackageLicenseUrl { get; set; }
31+
public string PackageLicenseUrl { get; set; }
32+
/// <summary>
33+
/// Package license type
34+
/// </summary>
35+
public string PackageLicense { get; set; }
3236
/// <summary>
3337
/// URL to package project
3438
/// </summary>
@@ -137,7 +141,15 @@ public override bool Execute()
137141
SetOrCreateElement(metadataXElement, "owners", ns, Authors);
138142
SetOrCreateElement(metadataXElement, "description", ns, $"Source only package {packageId}", false); //don't override if exists
139143
SetOrCreateElement(metadataXElement, "requireLicenseAcceptance", ns, PackageRequireLicenseAcceptance);
140-
SetOrCreateElement(metadataXElement, "licenseUrl", ns, PackageLicenseUrl);
144+
if (!string.IsNullOrEmpty(PackageLicense))
145+
{
146+
SetOrCreateElement(metadataXElement, "license", ns, PackageLicense).
147+
Add(new XAttribute("type","expression"));
148+
}
149+
else
150+
{
151+
SetOrCreateElement(metadataXElement, "licenseUrl", ns, PackageLicenseUrl);
152+
}
141153
SetOrCreateElement(metadataXElement, "projectUrl", ns, PackageProjectUrl);
142154
SetOrCreateElement(metadataXElement, "iconUrl", ns, PackageIconUrl);
143155
SetOrCreateElement(metadataXElement, "copyright", ns, Copyright);

build/custom/Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Copyright>Radek Adamec 2018</Copyright>
1212
<Description>Library of common helpers, utilities and extensions</Description>
1313
<PackageLicenseUrl>https://github.com/adamecr/Commons/blob/master/license.txt</PackageLicenseUrl>
14+
<PackageLicense>MIT</PackageLicense>
1415
<RepositoryType>git</RepositoryType>
1516
<PackageProjectUrl>https://github.com/adamecr/Commons</PackageProjectUrl>
1617
<RepositoryUrl>https://github.com/adamecr/Commons.git</RepositoryUrl>

build/master/use/NuGet.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
Authors="$(Authors)"
5353
PackageRequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
5454
PackageLicenseUrl="$(PackageLicenseUrl)"
55+
PackageLicense="$(PackageLicense)"
5556
PackageProjectUrl="$(PackageProjectUrl)"
5657
PackageIconUrl="$(PackageIconUrl)"
5758
Description="$(Description)"

build/master/use/NuGetSourceOnly.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
Authors="$(Authors)"
6262
PackageRequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
6363
PackageLicenseUrl="$(PackageLicenseUrl)"
64+
PackageLicense="$(PackageLicense)"
6465
PackageProjectUrl="$(PackageProjectUrl)"
6566
PackageIconUrl="$(PackageIconUrl)"
6667
Copyright="$(Copyright)"

changelog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6+
## [1.1.0] - 2018-12-29 ##
7+
8+
### Added ###
9+
- CommonLogging: extended methods for Trace
10+
- CommonLogging: extended methods for pass-throu exception logging of existing exceptions
11+
- CommonLogging: extended methods for exception logging in catch filters
12+
13+
### Changed ###
14+
- CommonLogging: Removed dependency on ProxyFoo
15+
- CommonLogging: Extensions class LoggerExtensions replaced by "regular" class LoggerExt, interface ILogger extended with the methods directly
16+
- CommonLogging: Explicit methods for logging with the correlation ID
17+
- Adjusted (somehow unified) argument validations
18+
- Small corrections in code and package documentation
19+
620
## [1.0.0] - 2018-12-21 ##
721
### Added ###
822
- Packages published to NuGet
@@ -16,5 +30,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1630
- Initial release
1731
- NuGet packages are not published yet, they will be published with v1.0.0
1832

33+
[1.1.0]: https://github.com/adamecr/Commons/compare/v1.0.0...v1.1.0
1934
[1.0.0]: https://github.com/adamecr/Commons/compare/v0.1.0...v1.0.0
2035
[0.1.0]: https://github.com/adamecr/Commons/releases/tag/v0.1.0

0 commit comments

Comments
 (0)