FarmMaps/CarbonLib
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	CarbonLib.csproj
This commit is contained in:
Peter (extern)
2023-07-30 10:48:02 +02:00
parent dd44069132 34d0d86bd5
commit 58c84bc13d
2 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CarbonLib.csproj
View File

@@ -8,12 +8,12 @@
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>2.0.1</Version> <Version>2.0.99</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Base.Core.Common" Version="2.3.0-prerelease.2055" /> <PackageReference Include="Base.Core.Common" Version="2.2.99" />
<PackageReference Include="Base.Core.Common.Geometry" Version="2.2.0-prerelease.2061" /> <PackageReference Include="Base.Core.Common.Geometry" Version="2.1.99" />
<PackageReference Include="NetTopologySuite" Version="2.5.0" /> <PackageReference Include="NetTopologySuite" Version="2.5.0" />
<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" /> <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
</ItemGroup> </ItemGroup>

49
Jenkinsfile vendored
View File

@@ -1,42 +1,29 @@
@Library('farmmaps-shared-library') _
pipeline { pipeline {
agent any agent any;
environment { options {
APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim() copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim() }
APP_VERSION="${APP_VERSION_PREFIX}" triggers {
upstream(
upstreamProjects: '/FarmMaps/Base.Core.Common.Geometry/master',
threshold: hudson.model.Result.SUCCESS
)
} }
stages { stages {
stage('Dotnet Restore') { stage('BaseBuildAll') {
steps { steps {
sh '''dotnet restore CarbonLib.csproj''' stepBaseBuildAll();
} }
} }
stage('Dotnet Build') { }
steps {
sh '''dotnet build CarbonLib.csproj'''
}
}
stage('Dotnet Package') {
steps {
sh '''rm -rf nuget
dotnet pack -c release -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
}
}
stage('Dotnet Publish') {
steps {
sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
}
}
}
post { post {
success {
postSuccess();
}
always { always {
emailext ( postAlways();
body: '${DEFAULT_CONTENT}',
mimeType: 'text/html',
replyTo: '${DEFAULT_REPLYTO}',
subject: '${DEFAULT_SUBJECT}',
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
)
} }
} }
} }