Update riferimenti alla nuova folder

This commit is contained in:
Samuele Locatelli
2022-04-09 11:03:26 +02:00
parent 1d34719575
commit 4afb94de7a
12 changed files with 56 additions and 53 deletions
+29 -28
View File
@@ -25,7 +25,7 @@ variables:
.version-fix: &version-fix .version-fix: &version-fix
- | - |
# Esecuzione fix numero versione x pack nuget # 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_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:NUM_DEB = $env:VERS_MAIN+"."+(get-date format yyMM)+"-beta."+(get-date format dHH)
$env:NEW_COPYRIGHT = "EgalWare @ 2006-" + (get-date -format yyyy) $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' - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
- *version-fix - *version-fix
script: 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: SteamWare.Logger:build:
stage: build stage: build
@@ -68,21 +68,21 @@ SteamWare.Logger:build:
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
- *version-fix - *version-fix
script: 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 stage: build
tags: tags:
- win - win
variables: variables:
CONFIG: Release CONFIG: Release
APP_NAME: SteamWareLib APP_NAME: SteamWare
before_script: before_script:
- *nuget-fix - *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
- *version-fix - *version-fix
script: 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: SteamWare.Reports:build:
stage: build stage: build
@@ -96,7 +96,7 @@ SteamWare.Reports:build:
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
- *version-fix - *version-fix
script: 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: Steamware.Scheduler:build:
stage: build stage: build
@@ -110,29 +110,30 @@ Steamware.Scheduler:build:
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet' - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
- *version-fix - *version-fix
script: 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: SteamWare.IO:staging:
# stage: staging stage: staging
# needs: ["EgtWPFLib5:build"] needs: ["SteamWare.IO:build"]
# tags: tags:
# - win - win
# variables: variables:
# CONFIG: Debug CONFIG: Debug
# except: APP_NAME: Steamware.IO
# refs: except:
# - main refs:
# - master - main
# before_script: - master
# - *nuget-fix before_script:
# - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln"-verbosity quiet' - *nuget-fix
# - *version-fix - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln"-verbosity quiet'
# script: - *version-fix
# - '& "$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' script:
# - '& "$env:NUGET_PATH" pack Develop.nuspec' - '& "$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" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
# - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' - '& "$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: # EgtWPFLib5:release:
+1 -1
View File
@@ -1,4 +1,4 @@
# SteamWareLib # SteamWare
Libreria di utility condivise per progetti SteamWare C# .net Libreria di utility condivise per progetti SteamWare C# .net
BIN
View File
Binary file not shown.
@@ -1,5 +1,5 @@
--------------------------------------------------------------- ---------------------------------------------------------------
------- SteamWareLib SDK ------- ------- SteamWare SDK -------
--------------------------------------------------------------- ---------------------------------------------------------------
Libreria di utility base di SteamWare. Libreria di utility base di SteamWare.
@@ -19,13 +19,13 @@
<targets async="true"> <targets async="true">
<target xsi:type="File" <target xsi:type="File"
name="SteamWareLib" name="SteamWare"
fileName="${basedir}/logs/${shortdate}-SteamWare.log" fileName="${basedir}/logs/${shortdate}-SteamWare.log"
layout="${longdate} ${uppercase:${level}} ${message}" layout="${longdate} ${uppercase:${level}} ${message}"
/> />
</targets> </targets>
<rules> <rules>
<logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWareLib" /> <logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWare" />
</rules> </rules>
</nlog> </nlog>
+1 -1
View File
@@ -49,7 +49,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\SteamWareLib\SteamWare.cs"> <Compile Include="..\SteamWare\SteamWare.cs">
<Link>SteamWare.cs</Link> <Link>SteamWare.cs</Link>
</Compile> </Compile>
<Compile Include="Constants.cs" /> <Compile Include="Constants.cs" />
+1 -1
View File
@@ -46,7 +46,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\SteamWareLib\SteamWare.cs"> <Compile Include="..\SteamWare\SteamWare.cs">
<Link>SteamWare.cs</Link> <Link>SteamWare.cs</Link>
</Compile> </Compile>
<Compile Include="devInfoParam.cs" /> <Compile Include="devInfoParam.cs" />
+16 -14
View File
@@ -1,10 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.29306.81 VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBench", "TestBench\TestBench.csproj", "{C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare.Reports", "SteamWare.Reports\SteamWare.Reports.csproj", "{1792D70C-D854-415B-ACF1-76BBCB8AC6FE}" 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 .editorconfig = .editorconfig
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "SteamWare\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET Debug|.NET = Debug|.NET
@@ -30,16 +30,6 @@ Global
Release|Mixed Platforms = Release|Mixed Platforms Release|Mixed Platforms = Release|Mixed Platforms
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution 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.ActiveCfg = Debug|Any CPU
{C406C4DA-29D6-4B6B-A87B-F5E10F6DB9DA}.Debug|.NET.Build.0 = 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 {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|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.ActiveCfg = Release|Any CPU
{8901AFAC-987A-40C9-B730-D1FDE0E5170C}.Release|Mixed Platforms.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
+1 -1
View File
@@ -1,5 +1,5 @@
--------------------------------------------------------------- ---------------------------------------------------------------
------- SteamWareLib SDK ------- ------- SteamWare SDK -------
--------------------------------------------------------------- ---------------------------------------------------------------
Libreria di utility base di SteamWare. Libreria di utility base di SteamWare.
@@ -19,13 +19,13 @@
<targets async="true"> <targets async="true">
<target xsi:type="File" <target xsi:type="File"
name="SteamWareLib" name="SteamWare"
fileName="${basedir}/logs/${shortdate}-SteamWare.log" fileName="${basedir}/logs/${shortdate}-SteamWare.log"
layout="${longdate} ${uppercase:${level}} ${message}" layout="${longdate} ${uppercase:${level}} ${message}"
/> />
</targets> </targets>
<rules> <rules>
<logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWareLib" /> <logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWare" />
</rules> </rules>
</nlog> </nlog>
@@ -41,7 +41,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\SteamWareLib\SteamWare.cs"> <Compile Include="..\SteamWare\SteamWare.cs">
<Link>SteamWare.cs</Link> <Link>SteamWare.cs</Link>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
+1 -1
View File
@@ -140,7 +140,7 @@
<Project>{8901afac-987a-40c9-b730-d1fde0e5170c}</Project> <Project>{8901afac-987a-40c9-b730-d1fde0e5170c}</Project>
<Name>Steamware.Scheduler</Name> <Name>Steamware.Scheduler</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\SteamWareLib\SteamWare.csproj"> <ProjectReference Include="..\SteamWare\SteamWare.csproj">
<Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project> <Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
<Name>SteamWare</Name> <Name>SteamWare</Name>
</ProjectReference> </ProjectReference>