From ced027da178dfa386d0f6852c97dc68d705bd3c1 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 18 Jul 2024 04:38:08 +0000 Subject: [PATCH] Began updating to .NET 8.0. --- .vscode/launch.json | 26 ++++++++++++ .vscode/tasks.json | 41 +++++++++++++++++++ Jenkinsfile | 22 ++++------ .../Props.Shop.Adafruit.Tests.csproj | 4 +- .../Adafruit/Props.Shop.Adafruit.csproj | 2 +- .../Framework/Props.Shop.Framework.csproj | 2 +- Props.Tests/Props.Tests.csproj | 2 +- Props/Props.csproj | 2 +- 8 files changed, 81 insertions(+), 20 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..a0b88e1 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/Props.Shop/Adafruit.Tests/bin/Debug/net8.0/Props.Shop.Adafruit.Tests.dll", + "args": [], + "cwd": "${workspaceFolder}/Props.Shop/Adafruit.Tests", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..3270acc --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Props.Shop/Props.Shop.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Props.Shop/Props.Shop.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/Props.Shop/Props.Shop.sln" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 93846e9..4d85f48 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,17 +8,16 @@ pipeline { # According to https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#examples # and https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install curl -L -o- https://dot.net/v1/dotnet-install.sh | bash -s -- --channel 8.0 - echo \'export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1\' >> ~/.profile - echo \'export DOTNET_ROOT=$HOME/.dotnet\' >> ~/.profile - echo \'export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools\' >> ~/.profile + echo export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 >> ~/.bashrc + echo 'export DOTNET_ROOT=$HOME/.dotnet' >> ~/.bashrc + echo 'export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools' >> ~/.bashrc # Installing Node Version Manager - # According to https://github.com/nvm-sh/nvm?tab=readme-ov-file#installing-and-updating - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash + # According to https://github.com/Schniz/fnm + curl -fsSL https://fnm.vercel.app/install | bash ''' sh '''#!/bin/bash - source ~/.profile - nvm install 20.15.1 - nvm use default + fnm install 20.15.1 + fnm use default # Restore all projects dotnet restore Props/Props.csproj dotnet restore Props.Tests/Props.Tests.csproj @@ -32,8 +31,7 @@ pipeline { stage("Test") { steps { sh '''#!/bin/bash - source ~/.profile - dotnet test --logger xunit --no-restore Props.Shop/Props.Shop.sln + dotnet test --logger xunit --no-restore Props.Shop/Adafruit.Tests/Props.Shop.Adafruit.Tests.csproj ''' xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Shop/*.Tests/TestResults/*.xml', stopProcessingIfError: true)]) } @@ -41,12 +39,10 @@ pipeline { stage("Publish") { steps { sh '''#!/bin/bash - source ~/.profile dotnet publish --configuration Release --output output/shop-modules Props.Shop/Props.Shop.sln ''' fingerprint 'output/shop-modules/**/Props.Shop.*' sh '''#!/bin/bash - source ~/.profile cp ./Props.Shop/output/shop-modules/**/*.dll ./Props.Shop/output/shop-modules/**/*.deps.json ./Props/shops/. ''' } @@ -58,7 +54,6 @@ pipeline { stage("Test") { steps { sh '''#!/bin/bash - source ~/.profile dotnet test --logger xunit --no-restore Props.Tests ''' xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Tests/TestResults/*.xml', stopProcessingIfError: true)]) @@ -67,7 +62,6 @@ pipeline { stage("Publish") { steps { sh '''#!/bin/bash - source ~/.profile dotnet publish --configuration Release --output output/props/props-linux-x64 --runtime linux-x64 --self-contained Props dotnet publish --configuration Release --output output/props/props-win-x64 --runtime win-x64 --self-contained Props ''' diff --git a/Props.Shop/Adafruit.Tests/Props.Shop.Adafruit.Tests.csproj b/Props.Shop/Adafruit.Tests/Props.Shop.Adafruit.Tests.csproj index a66a3ad..030175d 100644 --- a/Props.Shop/Adafruit.Tests/Props.Shop.Adafruit.Tests.csproj +++ b/Props.Shop/Adafruit.Tests/Props.Shop.Adafruit.Tests.csproj @@ -1,14 +1,14 @@ - net7.0 + net8.0 true false - + diff --git a/Props.Shop/Adafruit/Props.Shop.Adafruit.csproj b/Props.Shop/Adafruit/Props.Shop.Adafruit.csproj index 3fb1711..d3099a9 100644 --- a/Props.Shop/Adafruit/Props.Shop.Adafruit.csproj +++ b/Props.Shop/Adafruit/Props.Shop.Adafruit.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 true diff --git a/Props.Shop/Framework/Props.Shop.Framework.csproj b/Props.Shop/Framework/Props.Shop.Framework.csproj index 6e2d5b4..03e4aa5 100644 --- a/Props.Shop/Framework/Props.Shop.Framework.csproj +++ b/Props.Shop/Framework/Props.Shop.Framework.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 diff --git a/Props.Tests/Props.Tests.csproj b/Props.Tests/Props.Tests.csproj index 1496729..22434b4 100644 --- a/Props.Tests/Props.Tests.csproj +++ b/Props.Tests/Props.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable true false diff --git a/Props/Props.csproj b/Props/Props.csproj index 081e2bb..63f4ba2 100644 --- a/Props/Props.csproj +++ b/Props/Props.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 true true false