Merge branch 'develop'

Jenkinsfile

@@ -73,13 +73,13 @@ pipeline {
           }
           // procedo solo se NON si tratta di commit in ramo UnitTesting...
           if (env.BRANCH_NAME != "UnitTesting") {
+            // elimino vecchie build...
+            bat "del /f /q *.nupkg"
             // CAMBIO numero versione + checkout NuGet in file sorgente!!!
             bat "e:\\fart.exe SteamWareLib\\SteamWare.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
             bat "e:\\fart.exe SteamWareLib\\SteamWare.csproj 1.0.0.0 ${env.packVers} || EXIT /B 0"
             //bat "e:\\nuget.exe restore ${WORKSPACE}\\SteamWare.sln"
             fixNuget("${WORKSPACE}\\SteamWare.sln")
-            // elimino vecchie build...
-            bat "del /f /q *.nupkg"
             parallel (
               MAIN_LIB: {
                 // BUILD!

SteamWare.Logger/App_Readme/README_SteamWare.txt

@@ -0,0 +1,12 @@
+---------------------------------------------------------------
+-------							SteamWareLib SDK										------- 
+---------------------------------------------------------------
+
+Libreria di utility base di SteamWare.
+
+Le dipendenze inserite sono necessarie al funzionamento dell'SDK.
+
+Sono inclusi a titolo di esempio vari files di conf:
+  * example-NLog.config
+
+Attenzione a configurare correttamente il file NLog.xml includendo il rule per la classe, vedere ad esempio il file example-NLog.config allegato.

SteamWare.Logger/App_Readme/SteamWare_demo/example-NLog.config

@@ -4,31 +4,28 @@
       xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
       autoReload="true"
       throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
 
-  <!-- optional, add some variables
+
+  <!-- optional, add some variabeles
   https://github.com/nlog/NLog/wiki/Configuration-file#variables
   -->
   <variable name="myvar" value="myvalue"/>
 
-  <!--
-  See https://github.com/nlog/nlog/wiki/Configuration-file
+  <!-- 
+  See https://github.com/nlog/nlog/wiki/Configuration-file 
   for information on customizing logging rules and outputs.
    -->
-  <targets>
 
-    <!--
-    add your targets here
-    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
-    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-    -->
-
-    <!-- Write events to a file with the date in the filename. -->
-    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
-            layout="${longdate} ${uppercase:${level}} ${message}" />
+  <targets async="true">
+    <target xsi:type="File"
+            name="SteamWareLib"
+            fileName="${basedir}/logs/${shortdate}-SteamWare.log"
+            layout="${longdate} ${uppercase:${level}} ${message}"
+            /> 
   </targets>
 
   <rules>
-    <logger name="*" minlevel="Debug" writeTo="f" />
+    <logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWareLib" />
   </rules>
-</nlog>
+</nlog>

SteamWare.Logger/SteamWare.Logger.csproj

@@ -56,16 +56,18 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="NLog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <None Include="App_Readme\SteamWare_demo\example-NLog.config" />
     <None Include="logs\.placeholder">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="NLog.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_Readme\README_SteamWare.txt" />
+    <Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

SteamWare.Logger/SteamWare.Logger.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
+</Project>

SteamWare.Logger/packages.config

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="4.6.8" targetFramework="net462" />
-  <package id="NLog.Config" version="4.6.8" targetFramework="net462" />
-  <package id="NLog.Schema" version="4.6.8" targetFramework="net462" />
 </packages>