Skip to content

Commit 18725c8

Browse files
committed
Update nuget file
1 parent b4339fb commit 18725c8

File tree

3 files changed

+48
-15
lines changed

3 files changed

+48
-15
lines changed

3DconnexionDriver.csproj

+35-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6-
</PropertyGroup>
7-
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
<OutputType>Library</OutputType>
6+
<AssemblyName>3DconnexionDriver</AssemblyName>
7+
<ApplicationRevision>0</ApplicationRevision>
8+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
9+
<PackageId>DMXControlProjects.3DconnexionDriver</PackageId>
10+
<Authors>DMXControl Projects e.V.</Authors>
11+
<Description>3Dconnexion Driver to control the 3D mice of 3Dconnexion</Description>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<Content Include="Licence.txt" copyToOutput="true">
16+
<IncludeInPackage>true</IncludeInPackage>
17+
<CopyToOutput>true</CopyToOutput>
18+
<BuildAction>Content</BuildAction>
19+
<copyToOutput>true</copyToOutput>
20+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21+
</Content>
22+
<Content Include="LicenseAgreement3DxSDK.txt" copyToOutput="true">
23+
<IncludeInPackage>true</IncludeInPackage>
24+
<CopyToOutput>true</CopyToOutput>
25+
<BuildAction>Content</BuildAction>
26+
<copyToOutput>true</copyToOutput>
27+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
28+
</Content>
29+
<Content Include="README.md" copyToOutput="true">
30+
<IncludeInPackage>true</IncludeInPackage>
31+
<CopyToOutput>true</CopyToOutput>
32+
<BuildAction>Content</BuildAction>
33+
<copyToOutput>true</copyToOutput>
34+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35+
</Content>
36+
</ItemGroup>
837
</Project>

3DconnexionDriver.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30114.105
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.3.32819.101
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3DconnexionDriver", "3DconnexionDriver.csproj", "{9B78C331-7940-45C7-AAF9-E98270462BD4}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "3DconnexionDriver", "3DconnexionDriver.csproj", "{9B78C331-7940-45C7-AAF9-E98270462BD4}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

JenkinsFile

+10-6
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,29 @@ pipeline {
4949
}
5050
}
5151
}
52-
stage('Archive Artifacts'){
53-
steps {
54-
archiveArtifacts artifacts: 'bin/Release/3DconnexionDriver.dll'
55-
}
56-
}
5752
stage('Pack and Publish Package on Public NuGet'){
5853
when { allOf {buildingTag() ; tag pattern: "[1-9][0-9]*\\.[0-9]+\\.[0-9]+", comparator: "REGEXP"} }
5954
steps {
6055
script {
56+
PROGRAM_VERSION_TOKENIZED = powershell(returnStdout: true, script: "(Get-Item \"DMXLIB/bin/Release/netstandard2.0/3DconnexionDriver.dll\").VersionInfo.FileVersion").trim().tokenize(".")
57+
PROGRAM_VERSION = PROGRAM_VERSION_TOKENIZED[0] + '.' + PROGRAM_VERSION_TOKENIZED[1] + '.' + PROGRAM_VERSION_TOKENIZED[2] + '.' + PROGRAM_VERSION_TOKENIZED[3]
58+
6159
// Run the NuGet Publisher Worker Job to pack and publish the artifacts (only, if this build is tagged)
6260
build job:'_worker-NuGet-Publisher', parameters: [
6361
string(name: 'WS_PATH', value: "${WORKSPACE}"),
6462
string(name: 'PRJ_FILE', value: "3DconnexionDriver.csproj" ),
65-
string(name: 'VERSION', value: "${TAG_NAME}" ),
63+
string(name: 'VERSION', value: "${PROGRAM_VERSION}" ),
64+
string(name: 'USE_DOTNET_PACK', value: "true" ),
6665
booleanParam(name: 'USE_DMXC_NUGET', value: false),
6766
[$class: 'NodeParameterValue', name: 'BUILD_NODE', labels: ["${env.NODE_NAME}"], nodeEligibility: [$class: 'AllNodeEligibility']]]
6867
}
6968
}
7069
}
70+
stage('Archive Artifacts'){
71+
steps {
72+
archiveArtifacts artifacts: 'bin/Release/**/*.*'
73+
}
74+
}
7175
}
7276
post {
7377
always {

0 commit comments

Comments
 (0)