Skip to content

Commit

Permalink
Use .net6 in jenkins release build (#280)
Browse files Browse the repository at this point in the history
* Use .net6 in jenkins release build

* Update .net in docker and readme as well
  • Loading branch information
einarmo authored Nov 19, 2021
1 parent 5ff09af commit 5c3ec31
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.bridge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:5.0
FROM mcr.microsoft.com/dotnet/sdk:6.0
VOLUME /config
VOLUME /logs
COPY /deploy /bridge
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.bridge.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:5.0
FROM mcr.microsoft.com/dotnet/sdk:6.0

WORKDIR /build
COPY . .
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ podTemplate(
packBridge('linux-x64', "$version", true)
}
stage('Build linux installers') {
sh('cp -r ExtractorLauncher/bin/Release/net5.0/linux-x64/publish/ linux/publish/')
sh('cp -r ExtractorLauncher/bin/Release/net6.0/linux-x64/publish/ linux/publish/')
sh('cp LICENSE.md linux/')
sh('cp -r config/ linux/')
dir ('linux') {
Expand Down Expand Up @@ -237,7 +237,7 @@ podTemplate(
void packBridge(String configuration, String version, boolean linux) {
sh("dotnet publish -c Release -r $configuration --self-contained true /p:PublishSingleFile=\"true\" MQTTCDFBridge/")
sh("mkdir -p ./${configuration}")
sh("mv MQTTCDFBridge/bin/Release/net5.0/${configuration}/publish/* ./${configuration}/")
sh("mv MQTTCDFBridge/bin/Release/net6.0/${configuration}/publish/* ./${configuration}/")
sh("rm -f ./${configuration}/*.config ./${configuration}/*.pdb ./${configuration}/*.xml")
sh("mkdir -p ./${configuration}/config")
sh("cp ./config/config.bridge.example.yml ./${configuration}/config/")
Expand All @@ -255,9 +255,9 @@ void packProject(String configuration, String version, boolean linux) {
sh("dotnet publish -c Release -r $configuration $publishArgs ExtractorLauncher/")
sh("mkdir -p ./${configuration}/")
if (linux) {
sh("cp -r ExtractorLauncher/bin/Release/net5.0/${configuration}/publish/* ./${configuration}/")
sh("cp -r ExtractorLauncher/bin/Release/net6.0/${configuration}/publish/* ./${configuration}/")
} else {
sh("mv ExtractorLauncher/bin/Release/net5.0/${configuration}/publish/* ./${configuration}/")
sh("mv ExtractorLauncher/bin/Release/net6.0/${configuration}/publish/* ./${configuration}/")
}
sh("rm -f ./${configuration}/*.config ./${configuration}/*.pdb ./${configuration}/*.xml")
sh("cp -r ./config ./${configuration}/")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ OPC-UA extractor using libraries from OPCFoundation see [here](https://github.co
## How to use

### Building
Install .net 5.0 from [here](https://dotnet.microsoft.com/download).
Install .net 6.0 from [here](https://dotnet.microsoft.com/download).

To run:
`dotnet run --project ExtractorLauncher/`.
Expand Down

0 comments on commit 5c3ec31

Please sign in to comment.