v2.0.1

Commons.sln

@@ -23,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Version.props = Version.props
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "net.adamec.lib.common.core", "net.adamec.lib.common.core\net.adamec.lib.common.core.csproj", "{816D49A1-45D3-41BA-9F6D-7239D467E253}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,6 +43,10 @@ Global
 		{D09F8AE6-47AA-40B7-BFE7-E362B1C970C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D09F8AE6-47AA-40B7-BFE7-E362B1C970C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D09F8AE6-47AA-40B7-BFE7-E362B1C970C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{816D49A1-45D3-41BA-9F6D-7239D467E253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{816D49A1-45D3-41BA-9F6D-7239D467E253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{816D49A1-45D3-41BA-9F6D-7239D467E253}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{816D49A1-45D3-41BA-9F6D-7239D467E253}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Version.props

@@ -7,13 +7,13 @@
       =======================================================================================
     -->
   <PropertyGroup>
-    <RadMajor>1</RadMajor>
-    <RadMinor>2</RadMinor>
-    <RadPatch>0</RadPatch>
-    <RadBuild>538</RadBuild>
-    <PackageVersionShort>1.2.0</PackageVersionShort>
-    <PackageVersionFull>1.2.0+538.190122135212.master.2404837</PackageVersionFull>
-    <GitCommit>2404837</GitCommit>
-    <GitBranch>master</GitBranch>
+    <RadMajor>2</RadMajor>
+    <RadMinor>0</RadMinor>
+    <RadPatch>1</RadPatch>
+    <RadBuild>552</RadBuild>
+    <PackageVersionShort>2.0.1</PackageVersionShort>
+    <PackageVersionFull>2.0.1+552.190707161143.release.eea80db</PackageVersionFull>
+    <GitCommit>eea80db</GitCommit>
+    <GitBranch>release</GitBranch>
   </PropertyGroup>
 </Project>

build.tasks/build.tasks.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

build/build.csproj

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

changelog.md

@@ -3,6 +3,23 @@ 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/).
 
+## Unreleased ##
+
+## [2.0.1] - 2019-07-07 ##
+### Breaking Changes ###
+Created nuget package `RadCommons.core` containing `BaseDisposable` class, `Configuration` class and logging that are no longer available as source-only packages mainly due to a `public` members and/or limitations of having them as `internal` (problems with inheritance in consuming code). This nuget package is needed by some of the source-only packages.  
+
+### Fixed ###
+CommonLogging: Fix in DebugCorr (removed dummy log item)
+BaseDisposable: DisposedManaged and DisposedNative thread safety
+Configuration: removed reference to CommonLogging (was not used at all)
+RadCommons.di.Component: removed reference to CommonLogging (was not used at all), removed reference to itself (fix)
+
+### Changes ###
+AsyncManager: removed reference to (and used of) CommonLogging
+RadCommons.di.Config: removed reference to (and used of) CommonLogging
+RadCommons.di.PostInit: removed reference to (and used of) CommonLogging
+
 ## [1.2.0] - 2019-01-22 ##
 ### Added ###
 - Added `Disposer` - Keeps the stack of disposable objects, and disposes them when the disposer is being disposed.
@@ -56,6 +73,7 @@ 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
 
+[2.0.1]: https://github.com/adamecr/Commons/compare/v1.2.0...v2.0.1
 [1.2.0]: https://github.com/adamecr/Commons/compare/v1.1.0...v1.2.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

net.adamec.lib.common/config/Configuration.cs → net.adamec.lib.common.core/config/Configuration.cs

@@ -9,7 +9,7 @@
 using Environment = System.Environment;
 using InvalidCastException = System.InvalidCastException;
 
-namespace net.adamec.lib.common.config
+namespace net.adamec.lib.common.core.config
 {
     /// <summary>
     /// Singleton holding the application configuration (options) 
@@ -73,12 +73,6 @@ namespace net.adamec.lib.common.config
     /// then <see cref="Retrieve{TOptionsContainer}"/> it from the cache when needed.
     /// </para>
     /// </remarks>
-    /// <NuProp.Id>RadCommons.config.Configuration</NuProp.Id>
-    /// <NuProp.Description>Simple configuration container in case DI with more sophisticated containers is not used. Supports the JSON config files, command line arguments
-    /// and environment variables as sources and their hierarchy/overrides. The configuration can be used as key-value pairs or bound to objects (Source only package).</NuProp.Description>
-    /// <NuProp.Tags>RadCommons source-only configuration</NuProp.Tags>
-    /// <NuProp.Using id = "RadCommons.logging.CommonLogging" />
-    /// <NuProp.Remarks cref ="T:net.adamec.lib.common.config.Configuration" />
     public sealed class Configuration
     {
         #region Singleton

net.adamec.lib.common/config/Configuration.cs.partnuspec → net.adamec.lib.common.core/config/Configuration.cs.partnuspec

@@ -7,9 +7,6 @@
     <contentFiles>
       <files include="cs/**/*.*" buildAction="Compile" />
     </contentFiles>
-    <dependencies>
-      <dependency id="RadCommons.logging.CommonLogging" include="all" version="%%CURRENT_VERSION%%" />
-    </dependencies>
   </metadata>
   <files>
     <file src="Configuration.cs" target="content\App_Packages\RadCommons.config.Configuration\Configuration.cs" />

net.adamec.lib.common/logging/CommonLogging.cs → net.adamec.lib.common.core/logging/CommonLogging.cs

@@ -1,12 +1,13 @@
 using System;
 using NLog;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// <see cref="ILogger"/> factory
     /// </summary>
-    internal static class CommonLogging
+    // ReSharper disable once PartialTypeWithSinglePart
+    public static class CommonLogging
     {
         /// <summary>
         /// Creates the logger with given <paramref name="categoryName"/>

net.adamec.lib.common/logging/ILogger.CorrelationId.cs → net.adamec.lib.common.core/logging/ILogger.CorrelationId.cs

@@ -1,12 +1,12 @@
 using System;
 using System.ComponentModel;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Logger interface - wrapper around the <see cref="NLog.ILogger"/> with some additional methods
     /// </summary>
-    internal partial interface ILogger 
+    public partial interface ILogger 
     {
          /// <summary>
         /// Writes the diagnostic message at the <c>Trace</c> level with correlation ID.

net.adamec.lib.common/logging/ILogger.EventProperties.cs → net.adamec.lib.common.core/logging/ILogger.EventProperties.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Logger interface - wrapper around the <see cref="NLog.ILogger"/> with some additional methods
     /// </summary>
-    internal partial interface ILogger
+    public partial interface ILogger
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Trace</c> level.

net.adamec.lib.common/logging/ILogger.ExceptionFilter.cs → net.adamec.lib.common.core/logging/ILogger.ExceptionFilter.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Logger interface - wrapper around the <see cref="NLog.ILogger"/> with some additional methods
     /// </summary>
-    internal partial interface ILogger
+    public partial interface ILogger
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Error</c> level and returns the exception of <typeparamref name="TException">given type</typeparamref>

net.adamec.lib.common/logging/ILogger.ExceptionPassThrough.cs → net.adamec.lib.common.core/logging/ILogger.ExceptionPassThrough.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Logger interface - wrapper around the <see cref="NLog.ILogger"/> with some additional methods
     /// </summary>
-    internal partial interface ILogger
+    public partial interface ILogger
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Error</c> level and returns given <paramref name="exception"/>

net.adamec.lib.common/logging/ILogger.cs → net.adamec.lib.common.core/logging/ILogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Logger interface - wrapper around the <see cref="NLog.ILogger"/> with some additional methods
@@ -85,7 +85,7 @@ namespace net.adamec.lib.common.logging
     /// Such methods have the name ending with <c>Corr</c> suffix.
     /// </para>
     /// </remarks>
-    internal partial interface ILogger : NLog.ILogger
+    public partial interface ILogger : NLog.ILogger
     {
     }
 }

net.adamec.lib.common/logging/LoggerExt.CorrelationId.cs → net.adamec.lib.common.core/logging/LoggerExt.CorrelationId.cs

@@ -3,12 +3,12 @@
 using System.ComponentModel;
 using NLog;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Extended logger implementing <see cref="ILogger"/>
     /// </summary>
-    internal partial class LoggerExt
+    public partial class LoggerExt
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Trace</c> level with correlation ID
@@ -27,7 +27,6 @@ public void TraceCorr(string correlationId, [Localizable(false)] string message)
         /// <param name="message">Log message.</param>
         public void DebugCorr(string correlationId, [Localizable(false)] string message)
         {
-            base.Debug("a", "a");
             LogIt(LogLevel.Debug, correlationId, message);
         }
 
@@ -113,7 +112,7 @@ public void FatalCorr(string correlationId, Exception exception, [Localizable(fa
         /// <returns>Pass-through exception</returns>
         public TException ErrorCorr<TException>(string correlationId, TException exception, string message = null) where TException : Exception
         {
-            LogIt(LogLevel.Error, correlationId,string.IsNullOrWhiteSpace(message) ? exception.Message : message, exception);
+            LogIt(LogLevel.Error, correlationId, string.IsNullOrWhiteSpace(message) ? exception.Message : message, exception);
             return exception;
         }
 
@@ -126,7 +125,7 @@ public TException ErrorCorr<TException>(string correlationId, TException excepti
         /// <returns>Pass-through exception</returns>
         public TException FatalCorr<TException>(string correlationId, TException exception, string message = null) where TException : Exception
         {
-            LogIt(LogLevel.Fatal, correlationId,string.IsNullOrWhiteSpace(message) ? exception.Message : message, exception);
+            LogIt(LogLevel.Fatal, correlationId, string.IsNullOrWhiteSpace(message) ? exception.Message : message, exception);
             return exception;
         }
 

net.adamec.lib.common/logging/LoggerExt.EventProperties.cs → net.adamec.lib.common.core/logging/LoggerExt.EventProperties.cs

@@ -3,12 +3,12 @@
 using System.ComponentModel;
 using NLog;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Extended logger implementing <see cref="ILogger"/>
     /// </summary>
-    internal partial class LoggerExt
+    public partial class LoggerExt
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Trace</c> level.

net.adamec.lib.common/logging/LoggerExt.ExceptionFilter.cs → net.adamec.lib.common.core/logging/LoggerExt.ExceptionFilter.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Extended logger implementing <see cref="ILogger"/>
     /// </summary>
-    internal partial class LoggerExt
+    public partial class LoggerExt
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Error</c> level and returns the exception of <typeparamref name="TException">given type</typeparamref>

net.adamec.lib.common/logging/LoggerExt.ExceptionPassThrough.cs → net.adamec.lib.common.core/logging/LoggerExt.ExceptionPassThrough.cs

@@ -1,12 +1,12 @@
 using System;
 using NLog;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Extended logger implementing <see cref="ILogger"/>
     /// </summary>
-    internal partial class LoggerExt
+    public partial class LoggerExt
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Error</c> level and returns given <paramref name="exception"/>

net.adamec.lib.common/logging/LoggerExt.cs → net.adamec.lib.common.core/logging/LoggerExt.cs

@@ -4,12 +4,12 @@
 using System.Diagnostics;
 using NLog;
 
-namespace net.adamec.lib.common.logging
+namespace net.adamec.lib.common.core.logging
 {
     /// <summary>
     /// Extended logger implementing <see cref="ILogger"/>
     /// </summary>
-    internal partial class LoggerExt : Logger, ILogger
+    public partial class LoggerExt : Logger, ILogger
     {
         /// <summary>
         /// Writes the diagnostic message at the <c>Fatal</c> level. Creates and returns the exception of <typeparamref name="TException">given type</typeparamref>

net.adamec.lib.common.core/net.adamec.lib.common.core.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>RadCommons.core</PackageId>
+    <LangVersion>7.1</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="NLog" Version="4.6.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="config\Configuration.cs.partnuspec">
+      <DependentUpon>%(FileName)</DependentUpon>
+    </None>
+    <None Update="utils\BaseDisposable.cs.partnuspec">
+      <DependentUpon>%(FileName)</DependentUpon>
+    </None>
+  </ItemGroup>
+
+</Project>