Merge pull request #205 from intuit/NemoSerilogger

Updates for latest schema changes and tests - Minorversion 62
intuit · Aug 13, 2021 · c0ea9ad · c0ea9ad
2 parents 1603f8b + f34d475
commit c0ea9ad
Show file tree

Hide file tree

Showing 121 changed files with 128 additions and 39,865 deletions.
diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core.Test/Intuit.Ipp.Core.Test.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core.Test/Intuit.Ipp.Core.Test.csproj
@@ -29,7 +29,6 @@
     <ProjectReference Include="..\Intuit.Ipp.Security\Intuit.Ipp.Security.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.Utility\Intuit.Ipp.Utility.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.DataService.Test/Intuit.Ipp.DataService.Test.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.DataService.Test/Intuit.Ipp.DataService.Test.csproj
@@ -26,7 +26,6 @@
     <ProjectReference Include="..\Intuit.Ipp.Security\Intuit.Ipp.Security.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.Utility\Intuit.Ipp.Utility.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.DataService/DataService.cs b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.DataService/DataService.cs
@@ -259,7 +259,7 @@ public T Add<T>(T entity) where T : IEntity
         /// <param name="entity">Entity to Delete.</param>
         public T Delete<T>(T entity) where T : IEntity
         {
-            this.serviceContext.IppConfiguration.Logger.CustomLogger.Log(Diagnostics.TraceLevel.Info, "Called Method Void.");
+            this.serviceContext.IppConfiguration.Logger.CustomLogger.Log(Diagnostics.TraceLevel.Info, "Called Method Delete.");
 
             // Validate parameter
             if (!ServicesHelper.IsTypeNull(entity))
@@ -400,7 +400,7 @@ public T Void<T>(T entity) where T : IEntity
         /// <returns>Returns an updated version of the entity with updated identifier and sync token.</returns>
         public T Update<T>(T entity) where T : IEntity
         {
-            this.serviceContext.IppConfiguration.Logger.CustomLogger.Log(Diagnostics.TraceLevel.Info, "Called Method Add.");
+            this.serviceContext.IppConfiguration.Logger.CustomLogger.Log(Diagnostics.TraceLevel.Info, "Called Method Update.");
 
             // Validate parameter
             if (!ServicesHelper.IsTypeNull(entity))

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Diagnostics.Test/Intuit.Ipp.Diagnostics.Test.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Diagnostics.Test/Intuit.Ipp.Diagnostics.Test.csproj
@@ -20,7 +20,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Intuit.Ipp.Diagnostics\Intuit.Ipp.Diagnostics.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Diagnostics/Interface/ILogger.cs b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Diagnostics/Interface/ILogger.cs
@@ -16,7 +16,7 @@
  * limitations under the License.
  *******************************************************************************/
 // <summary>This file contains SdkException.</summary>
-// <summary>This file contains an interface for Logging.</summary>
+// <summary>This file contains an interface for old Logging.</summary>
 ////*********************************************************
 
 namespace Intuit.Ipp.Diagnostics

diff --git a/...KitCSV3/Code/Intuit.Ipp.EntitlementService.Test/Intuit.Ipp.EntitlementService.Test.csproj b/...KitCSV3/Code/Intuit.Ipp.EntitlementService.Test/Intuit.Ipp.EntitlementService.Test.csproj
@@ -30,7 +30,6 @@
     <ProjectReference Include="..\Intuit.Ipp.Security\Intuit.Ipp.Security.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.Utility\Intuit.Ipp.Utility.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Exception.Test/Intuit.Ipp.Exception.Test.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Exception.Test/Intuit.Ipp.Exception.Test.csproj
@@ -19,7 +19,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Intuit.Ipp.Exception\Intuit.Ipp.Exception.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...NetDevKitCSV3/Code/Intuit.Ipp.GlobalTaxServiceTest/Intuit.Ipp.GlobalTaxServiceTest.csproj b/...NetDevKitCSV3/Code/Intuit.Ipp.GlobalTaxServiceTest/Intuit.Ipp.GlobalTaxServiceTest.csproj
@@ -27,7 +27,6 @@
     <ProjectReference Include="..\Intuit.Ipp.Security\Intuit.Ipp.Security.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.Utility\Intuit.Ipp.Utility.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj
@@ -10,8 +10,8 @@
     <AssemblyName>IppDotNetSdkForQuickBooksApiV3</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(AssemblyName).xml</DocumentationFile>
     <MainVersion>14.6.2.0</MainVersion>
-    <!--<PackageVersionSuffix>stable</PackageVersionSuffix>-->
-    <!--<Version>$(MainVersion)-$(PackageVersionSuffix)</Version>-->
+    <PackageVersionSuffix>pre</PackageVersionSuffix>
+    <Version>$(MainVersion)-$(PackageVersionSuffix)</Version>
     <Version>$(MainVersion)</Version>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -54,7 +54,7 @@
     <ProjectReference Include="..\Intuit.Ipp.Exception\Intuit.Ipp.Exception.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.GlobalTaxService\Intuit.Ipp.GlobalTaxService.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all"/>
     <ProjectReference Include="..\Intuit.Ipp.QueryFilter\Intuit.Ipp.QueryFilter.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.ReportService\Intuit.Ipp.ReportService.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.Retry\Intuit.Ipp.Retry.csproj" AdditionalProperties="TargetFramework=net472" PrivateAssets="all" />
@@ -71,7 +71,7 @@
     <ProjectReference Include="..\Intuit.Ipp.Exception\Intuit.Ipp.Exception.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.GlobalTaxService\Intuit.Ipp.GlobalTaxService.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.QueryFilter\Intuit.Ipp.QueryFilter.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.ReportService\Intuit.Ipp.ReportService.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
     <ProjectReference Include="..\Intuit.Ipp.Retry\Intuit.Ipp.Retry.csproj" AdditionalProperties="TargetFramework=net461" PrivateAssets="all" />
@@ -82,7 +82,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472'">
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
-    <!--<PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
 
 
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
@@ -92,7 +92,7 @@
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />-->
+    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
@@ -103,7 +103,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
 
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
-    <!--<PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
 
 
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
@@ -114,7 +114,7 @@
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />-->
+    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="2.2.0" />
@@ -123,15 +123,15 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <!--<PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />-->
+    <PackageReference Include="SerilogTraceListener" Version="3.2.0" />
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />

diff --git a/...SV3/Code/Intuit.Ipp.OAuth2PlatformClient.Test/Intuit.Ipp.OAuth2PlatformClient.Test.csproj b/...SV3/Code/Intuit.Ipp.OAuth2PlatformClient.Test/Intuit.Ipp.OAuth2PlatformClient.Test.csproj
@@ -19,7 +19,6 @@
     <ProjectReference Include="..\Intuit.Ipp.Core\Intuit.Ipp.Core.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.DataService\Intuit.Ipp.DataService.csproj" />
     <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient\Intuit.Ipp.OAuth2PlatformClient.csproj" />
-    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...NetDevKitCSV3/Code/Intuit.Ipp.OAuth2PlatformClient/Intuit.Ipp.OAuth2PlatformClient.csproj b/...NetDevKitCSV3/Code/Intuit.Ipp.OAuth2PlatformClient/Intuit.Ipp.OAuth2PlatformClient.csproj
@@ -14,10 +14,11 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
 
   </ItemGroup>
+
   <ItemGroup>
-        <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Intuit.Ipp.OAuth2PlatformClient.Diagnostics\Intuit.Ipp.OAuth2PlatformClient.Diagnostics.csproj" PrivateAssets="all"/>
   </ItemGroup>
-
+  
 
 
 </Project>