Merge branch 'stable' into SDK

This commit is contained in:
Samuele E. Locatelli
2020-07-28 10:30:11 +02:00
3 changed files with 19 additions and 7 deletions
Vendored
+1 -1
View File
@@ -130,7 +130,7 @@ pipeline {
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:AutoParameterizationWebConfigConnectionStrings=False /p:PackageLocation=Releases/${env.BRANCH_NAME}/NKC.zip /p:DeployIisAppPath=\"Default Web Site/NKC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj"
// pubblico su server deploy!
publishToDeployServer("NKC\\", "c:\\inetpub\\wwwroot\\SWS\\", "NKC")
publishToDeployServer("NKC_WF\\", "c:\\inetpub\\wwwroot\\SWS\\", "NKC")
nexusArtifactUploader (
artifacts: [
[
+9 -3
View File
@@ -260,9 +260,15 @@
<Content Include="Images\test.svg" />
<Content Include="Images\test_1.svg" />
<Content Include="mongocrypt.dll" />
<Content Include="Resources\ChangeLog.html" />
<Content Include="Resources\logoSteamware.png" />
<Content Include="Resources\manifest.xml" />
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\logoSteamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\manifest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.js" />
+9 -3
View File
@@ -49,9 +49,15 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="ChangeLog.html" />
<Content Include="logoSteamware.png" />
<Content Include="manifest.xml" />
<Content Include="ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="logoSteamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="manifest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="VersGen.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VersGen.cs</LastGenOutput>