diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a911345..1786599 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: .version-fix: &version-fix - | # Esecuzione fix numero versione x pack nuget - $fileNameAss = 'SteamWareLib\SteamWare.cs'; + $fileNameAss = '$env:APP_NAME\$env:APP_NAME.cs'; $env:NUM_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH) $env:NUM_DEB = $env:VERS_MAIN+"."+(get-date –format yyMM)+"-beta."+(get-date –format dHH) $env:NEW_COPYRIGHT = "EgalWare @ 2006-" + (get-date -format yyyy) @@ -54,7 +54,7 @@ SteamWare.IO:build: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' SteamWare.Logger:build: stage: build @@ -68,21 +68,21 @@ SteamWare.Logger:build: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -SteamWareLib:build: +SteamWare:build: stage: build tags: - win variables: CONFIG: Release - APP_NAME: SteamWareLib + APP_NAME: SteamWare before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" "$env:APP_NAME\SteamWare.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' SteamWare.Reports:build: stage: build @@ -96,7 +96,7 @@ SteamWare.Reports:build: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' Steamware.Scheduler:build: stage: build @@ -110,29 +110,30 @@ Steamware.Scheduler:build: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# EgtWPFLib5:staging: -# stage: staging -# needs: ["EgtWPFLib5:build"] -# tags: -# - win -# variables: -# CONFIG: Debug -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln"-verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" "$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' -# - '& "$env:NUGET_PATH" pack Develop.nuspec' -# - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' -# - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' +SteamWare.IO:staging: + stage: staging + needs: ["SteamWare.IO:build"] + tags: + - win + variables: + CONFIG: Debug + APP_NAME: Steamware.IO + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' + - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' + - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' # EgtWPFLib5:release: diff --git a/README.md b/README.md index 1708798..2a78516 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SteamWareLib +# SteamWare Libreria di utility condivise per progetti SteamWare C# .net diff --git a/README.pdf b/README.pdf index c6895f0..af722f1 100644 Binary files a/README.pdf and b/README.pdf differ diff --git a/SteamWare.Logger/App_Readme/README_SteamWare.txt b/SteamWare.Logger/App_Readme/README_SteamWare.txt index bf60ed1..954eff8 100644 --- a/SteamWare.Logger/App_Readme/README_SteamWare.txt +++ b/SteamWare.Logger/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/SteamWare.Logger/App_Readme/SteamWare_demo/example-NLog.config b/SteamWare.Logger/App_Readme/SteamWare_demo/example-NLog.config index a11a39e..3461e58 100644 --- a/SteamWare.Logger/App_Readme/SteamWare_demo/example-NLog.config +++ b/SteamWare.Logger/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/SteamWare.Logger/SteamWare.Logger.csproj b/SteamWare.Logger/SteamWare.Logger.csproj index 78491b3..8906477 100644 --- a/SteamWare.Logger/SteamWare.Logger.csproj +++ b/SteamWare.Logger/SteamWare.Logger.csproj @@ -49,7 +49,7 @@ - + SteamWare.cs diff --git a/SteamWare.Reports/SteamWare.Reports.csproj b/SteamWare.Reports/SteamWare.Reports.csproj index 7ab4fbc..12a59d8 100644 --- a/SteamWare.Reports/SteamWare.Reports.csproj +++ b/SteamWare.Reports/SteamWare.Reports.csproj @@ -46,7 +46,7 @@ - + SteamWare.cs diff --git a/SteamWare.sln b/SteamWare.sln index 76cac37..bc88ea8 100644 --- a/SteamWare.sln +++ b/SteamWare.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29306.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "SteamWareLib\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBench", "TestBench\TestBench.csproj", "{C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare.Reports", "SteamWare.Reports\SteamWare.Reports.csproj", "{1792D70C-D854-415B-ACF1-76BBCB8AC6FE}" @@ -20,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "SteamWare\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -30,16 +30,6 @@ Global Release|Mixed Platforms = Release|Mixed Platforms EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|.NET.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|.NET.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}.Debug|.NET.ActiveCfg = Debug|Any CPU {C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}.Debug|.NET.Build.0 = Debug|Any CPU {C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -100,6 +90,18 @@ Global {8901AFAC-987A-40C9-B730-D1FDE0E5170C}.Release|Any CPU.Build.0 = Release|Any CPU {8901AFAC-987A-40C9-B730-D1FDE0E5170C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {8901AFAC-987A-40C9-B730-D1FDE0E5170C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|.NET.Build.0 = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|.NET.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|.NET.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SteamWare/App_Readme/README_SteamWare.txt b/SteamWare/App_Readme/README_SteamWare.txt index bf60ed1..5626502 100644 --- a/SteamWare/App_Readme/README_SteamWare.txt +++ b/SteamWare/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/SteamWare/App_Readme/SteamWare_demo/example-NLog.config b/SteamWare/App_Readme/SteamWare_demo/example-NLog.config index a11a39e..3461e58 100644 --- a/SteamWare/App_Readme/SteamWare_demo/example-NLog.config +++ b/SteamWare/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/Steamware.Scheduler/Steamware.Scheduler.csproj b/Steamware.Scheduler/Steamware.Scheduler.csproj index c2cfaee..1b69b2c 100644 --- a/Steamware.Scheduler/Steamware.Scheduler.csproj +++ b/Steamware.Scheduler/Steamware.Scheduler.csproj @@ -41,7 +41,7 @@ - + SteamWare.cs diff --git a/TestBench/TestBench.csproj b/TestBench/TestBench.csproj index 136e525..abe02aa 100644 --- a/TestBench/TestBench.csproj +++ b/TestBench/TestBench.csproj @@ -140,7 +140,7 @@ {8901afac-987a-40c9-b730-d1fde0e5170c} Steamware.Scheduler - + {2872dcfe-8b46-43b2-baa0-842a816a2dd5} SteamWare