Compare commits

..

No commits in common. "master" and "2023-03-081746" have entirely different histories.

3 changed files with 9 additions and 12 deletions

17
Jenkinsfile vendored
View File

@ -1,5 +1,8 @@
pipeline { pipeline {
agent any agent any
tools {
dotnetsdk 'dotnet7'
}
stages { stages {
stage('clean old'){ stage('clean old'){
steps{ steps{
@ -8,20 +11,14 @@ pipeline {
} }
stage('linux') { stage('linux') {
steps { steps {
sh 'dotnet publish directors-assistant.csproj --configuration Release --os linux' sh 'dotnet publish --configuration Release --os linux'
archiveArtifacts artifacts: 'bin/Release/net7.0/linux-x64/publish/*' archiveArtifacts artifacts: 'bin/Release/net7.0/linux-x64/publish/*.*'
}
}
stage('pi') {
steps {
sh 'dotnet publish directors-assistant.csproj --configuration Release --runtime linux-arm64 --self-contained'
archiveArtifacts artifacts: 'bin/Release/net7.0/linux-arm64/publish/*'
} }
} }
stage('windows') { stage('windows') {
steps { steps {
sh 'dotnet publish directors-assistant.csproj --configuration Release --os win' sh 'dotnet publish --configuration Release --os windows'
archiveArtifacts artifacts: 'bin/Release/net7.0/win-x64/publish/*.*' archiveArtifacts artifacts: 'bin/Release/net7.0/windows-x64/publish/*.*'
} }
} }
} }

View File

@ -37,7 +37,7 @@ namespace directors_assistant
var justArgs = string.Join(' ', cmdAndArgs.Skip(1).ToList()); var justArgs = string.Join(' ', cmdAndArgs.Skip(1).ToList());
if(!string.IsNullOrWhiteSpace(ec.args)) if(!string.IsNullOrWhiteSpace(ec.args))
{ {
justArgs += " " + ec.args; justArgs += ec.args;
} }
var commandPath = cmdAndArgs[0]; var commandPath = cmdAndArgs[0];
var commandArguments = String.Join(' ', justArgs); var commandArguments = String.Join(' ', justArgs);

View File

@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="greyn.franz" Version="2.1.0" /> <PackageReference Include="greyn.franz" Version="2.1.0" />
</ItemGroup> </ItemGroup>