diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index 1bde439..c917b97 100644 Binary files a/.vs/ScheMe-SP/v15/sqlite3/storage.ide and b/.vs/ScheMe-SP/v15/sqlite3/storage.ide differ diff --git a/Jenkinsfile b/Jenkinsfile index a901619..bc9fb78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1113']) { + withEnv(['NEXT_BUILD_NUMBER=892']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'ScheMe' diff --git a/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml b/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml index d1fda46..f1b1e30 100644 --- a/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml +++ b/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml @@ -8,11 +8,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy CUSBG Any CPU - http://scheme.steamware.net/cusbg + http://scheme.steamware.net/SP/CusBG True True https://wprod01.steamware.net:8172/MsDeploy.axd - smc.steamware.net/cusbg + scheme.steamware.net/SP/CusBG False WMSVC @@ -22,43 +22,43 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + - + - + - + - + - + - + - + - + @@ -72,11 +72,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt False - Data Source=51.254.23.3,50000;Initial Catalog=ScheMe-AFA;Persist Security Info=True;User ID=sa;Password=keyhammer16 + Data Source=51.254.23.3,50000;Initial Catalog=ScheMe-SP;Persist Security Info=True;User ID=sa;Password=keyhammer16 False - Data Source=51.254.23.3,50000;Initial Catalog=ScheMe-AFA_files;Persist Security Info=True;User ID=sa;Password=keyhammer16 + Data Source=51.254.23.3,50000;Initial Catalog=ScheMe-SP_files;Persist Security Info=True;User ID=sa;Password=keyhammer16 False diff --git a/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml.user b/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml.user index 65e6a29..87b476e 100644 --- a/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml.user +++ b/ScheMe-SP/Properties/PublishProfiles/CUSBG.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAARdW8JTnOyE+iTw0spIHxLQAAAAACAAAAAAADZgAAwAAAABAAAAC3HH68WtFEjY1/IzOlNn5hAAAAAASAAACgAAAAEAAAAEn6oAxdBytgNEAu0ajWnssYAAAAxPLr9mDi8i6eRtSt3ZTji+tD/FFSNEZrFAAAAMoulN1Bo1RSHUrT28vFB64Mz1gU + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAlrB60ApziESBdFdq9Lqy0gAAAAACAAAAAAADZgAAwAAAABAAAADpTCIzU1W5NulyE5i7lgirAAAAAASAAACgAAAAEAAAAAw8UYuymE0JDI31gy8P9l0YAAAAwKBPkb5Vmg09ibRAGWXDeiSoC2ycrj/wFAAAAEmUT9H9YbaZLYZwkWhxk1kahqrp \ No newline at end of file diff --git a/ScheMe-SP/ScheMe-SP.csproj.user b/ScheMe-SP/ScheMe-SP.csproj.user index 799a0a0..0023581 100644 --- a/ScheMe-SP/ScheMe-SP.csproj.user +++ b/ScheMe-SP/ScheMe-SP.csproj.user @@ -9,7 +9,7 @@ - IIS01 + CUSBG diff --git a/VersGen/VersGen.cs b/VersGen/VersGen.cs index 42a3969..eca7227 100644 --- a/VersGen/VersGen.cs +++ b/VersGen/VersGen.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.1708.891")] -[assembly: AssemblyFileVersion("2.2.1708.891")] +[assembly: AssemblyVersion("2.2.000.000")] +[assembly: AssemblyFileVersion("2.2.000.000")] [assembly: AssemblyCopyright("Steamware © 2007-2017")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/VersGen.tt b/VersGen/VersGen.tt index 725141f..eef0556 100644 --- a/VersGen/VersGen.tt +++ b/VersGen/VersGen.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.<#= this.Build #>.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.<#= this.Build #>.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.000.000")] +[assembly: AssemblyFileVersion("2.2.000.000")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+