From 10c6bdfe0c856b48ae993285dd3aac4d1d4bb85d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Oct 2019 16:12:59 +0200
Subject: [PATCH] Fix favicon + nuova vers

---
 Jenkinsfile                   |  6 +++---
 SteamWareLib/SteamWare.csproj | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dba0fa2..b7d22d2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,9 +11,9 @@ pipeline {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
         withEnv(['NEXT_BUILD_NUMBER=671']) {
-          // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
-          env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
-          env.versionNumberBeta = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+          // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+          env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+          env.versionNumberBeta = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'SteamWareLib'
         }
       }				
diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj
index 4dc78cc..387d2b9 100644
--- a/SteamWareLib/SteamWare.csproj
+++ b/SteamWareLib/SteamWare.csproj
@@ -59,7 +59,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>favicon.ico</ApplicationIcon>
+    <ApplicationIcon>example-favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -228,10 +228,18 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="favicon.ico" />
+    <Content Include="example-favicon.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="example-NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="README.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="example-app.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="SteamWare.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>SteamWare.cs</LastGenOutput>
@@ -302,7 +310,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="appunti.txt" />
+    <None Include="appunti.txt" />
     <None Include="DataLayer_AnagGen.xsc">
       <DependentUpon>DataLayer_AnagGen.xsd</DependentUpon>
     </None>