Merge branch 'master' into develop

This commit is contained in:
Samuele Locatelli
2022-02-18 18:34:33 +01:00
3 changed files with 6 additions and 5 deletions
Vendored
+3 -2
View File
@@ -104,9 +104,10 @@ pipeline {
},
MAIN_LIB: {
// BUILD!
bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/Release /verbosity:minimal /m"
//bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /verbosity:minimal /m"
// creo package NuGet... con version in modo da fare ANCHE le beta
bat "e:\\nuget.exe pack ${WORKSPACE}\\SteamWareLib\\SteamWare.csproj -properties Configuration=${env.config} -Version ${env.packVers}"
bat "e:\\nuget.exe pack ${WORKSPACE}\\SteamWareLib\\SteamWare.csproj -properties Configuration=Release -Version ${env.packVers}"
},
REPORTS: {
// BUILD Reports lib!
+2 -2
View File
@@ -68,8 +68,8 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="AegisImplicitMail, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll</HintPath>
<Reference Include="AegisImplicitMail, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll</HintPath>
</Reference>
<Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AIM" version="1.1.0" targetFramework="net462" />
<package id="AIM" version="1.0.3" targetFramework="net462" />
<package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.6.0" targetFramework="net462" />