From 14ff9b9d192f63cd3f0172df11a4a7c4693f1c7b Mon Sep 17 00:00:00 2001 From: Igor Iric Date: Mon, 16 Nov 2020 11:23:26 +0100 Subject: [PATCH 1/6] update to .NET 5 --- src/azmi-commandline/azmi-commandline.csproj | 2 +- src/azmi-main/azmi-main.csproj | 2 +- test/azmi-commandline-tests/azmi-commandline-tests.csproj | 4 ++-- test/azmi-main-tests/azmi-main-tests.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/azmi-commandline/azmi-commandline.csproj b/src/azmi-commandline/azmi-commandline.csproj index 2b9be85..fbf83c7 100644 --- a/src/azmi-commandline/azmi-commandline.csproj +++ b/src/azmi-commandline/azmi-commandline.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 azmi_commandline azmi diff --git a/src/azmi-main/azmi-main.csproj b/src/azmi-main/azmi-main.csproj index d326d2d..551ed2b 100644 --- a/src/azmi-main/azmi-main.csproj +++ b/src/azmi-main/azmi-main.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 azmi_main Library 0.5.0 diff --git a/test/azmi-commandline-tests/azmi-commandline-tests.csproj b/test/azmi-commandline-tests/azmi-commandline-tests.csproj index a45d92a..8037e99 100644 --- a/test/azmi-commandline-tests/azmi-commandline-tests.csproj +++ b/test/azmi-commandline-tests/azmi-commandline-tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1 + net5.0 azmi_commandline_tests false diff --git a/test/azmi-main-tests/azmi-main-tests.csproj b/test/azmi-main-tests/azmi-main-tests.csproj index 48816ee..31c20dc 100644 --- a/test/azmi-main-tests/azmi-main-tests.csproj +++ b/test/azmi-main-tests/azmi-main-tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 azmi_tests false From cc3a8cc987c5137c8f2fab7ecaed14fd8f770fb3 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 15 Jan 2021 18:41:05 +0100 Subject: [PATCH 2/6] just retrigger checks --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f4cdde9..d4826d6 100644 --- a/README.md +++ b/README.md @@ -151,3 +151,4 @@ See [testing overview here](./Testing.md). ![GitHub repo size](https://img.shields.io/github/repo-size/sre-prg/azmitool) ![GitHub language count](https://img.shields.io/github/languages/count/sre-prg/azmitool) ![GitHub top language](https://img.shields.io/github/languages/top/sre-prg/azmitool) + From 64e3c25d6995e9e2422072a3f142ea6467837c27 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 15 Jan 2021 18:53:31 +0100 Subject: [PATCH 3/6] Update integration-pipeline.sh it has hardcoded binaries path --- test/integration/integration-pipeline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/integration-pipeline.sh b/test/integration/integration-pipeline.sh index fddfe81..2d3a638 100755 --- a/test/integration/integration-pipeline.sh +++ b/test/integration/integration-pipeline.sh @@ -8,7 +8,7 @@ dotnet publish ./src/azmi-commandline/azmi-commandline.csproj --configuration Release --self-contained true /p:PublishSingleFile=true --runtime linux-x64 -exePath=$(cd ./src/azmi-commandline/bin/Release/netcoreapp3.1/linux-x64/publish || exit; pwd) +exePath=$(cd ./src/azmi-commandline/bin/Release/net5.0/linux-x64/publish || exit; pwd) export PATH="$exePath:$PATH" export DOTNET_BUNDLE_EXTRACT_BASE_DIR="$HOME/cache_dotnet_bundle_extract" From f75c479a01ae5a63eb750842a0dc8940fcd24013 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 15 Jan 2021 19:07:36 +0100 Subject: [PATCH 4/6] Update 1-basic-tests.sh net5.0 --- test/performance/1-basic-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/1-basic-tests.sh b/test/performance/1-basic-tests.sh index 1fc9737..7f2806d 100755 --- a/test/performance/1-basic-tests.sh +++ b/test/performance/1-basic-tests.sh @@ -6,7 +6,7 @@ echo 'azmi - build executable' # dotnet build src/azmi-commandline/azmi-commandline.csproj dotnet publish ./src/azmi-commandline/azmi-commandline.csproj --configuration Release --self-contained true /p:PublishSingleFile=true --runtime linux-x64 -exePath=$(cd ./src/azmi-commandline/bin/Release/netcoreapp3.1/linux-x64/publish || exit; pwd) +exePath=$(cd ./src/azmi-commandline/bin/Release/net5.0/linux-x64/publish || exit; pwd) export PATH="$exePath:$PATH" export DOTNET_BUNDLE_EXTRACT_BASE_DIR="$HOME/cache_dotnet_bundle_extract" From 24237b55362645e9313eb424422ae753941bc706 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 15 Jan 2021 19:07:57 +0100 Subject: [PATCH 5/6] Update 2-single-blob-tests.sh net5.0 --- test/performance/2-single-blob-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/2-single-blob-tests.sh b/test/performance/2-single-blob-tests.sh index e73d99c..dc4a958 100755 --- a/test/performance/2-single-blob-tests.sh +++ b/test/performance/2-single-blob-tests.sh @@ -7,7 +7,7 @@ echo 'azmi - build executable' # dotnet build src/azmi-commandline/azmi-commandline.csproj dotnet publish ./src/azmi-commandline/azmi-commandline.csproj --configuration Release --self-contained true /p:PublishSingleFile=true --runtime linux-x64 -exePath=$(cd ./src/azmi-commandline/bin/Release/netcoreapp3.1/linux-x64/publish || exit; pwd) +exePath=$(cd ./src/azmi-commandline/bin/Release/net5.0/linux-x64/publish || exit; pwd) export PATH="$exePath:$PATH" export DOTNET_BUNDLE_EXTRACT_BASE_DIR="$HOME/cache_dotnet_bundle_extract" From e36579fee3a03e06b45e73cb9d1ca941ea853808 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 15 Jan 2021 19:08:18 +0100 Subject: [PATCH 6/6] Update 3-multiple-blobs-tests.sh net5.0 --- test/performance/3-multiple-blobs-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/3-multiple-blobs-tests.sh b/test/performance/3-multiple-blobs-tests.sh index 9ddf743..05852bd 100755 --- a/test/performance/3-multiple-blobs-tests.sh +++ b/test/performance/3-multiple-blobs-tests.sh @@ -4,7 +4,7 @@ echo 'azmi - build executable' # dotnet build src/azmi-commandline/azmi-commandline.csproj dotnet publish ./src/azmi-commandline/azmi-commandline.csproj --configuration Release --self-contained true /p:PublishSingleFile=true --runtime linux-x64 -exePath=$(cd ./src/azmi-commandline/bin/Release/netcoreapp3.1/linux-x64/publish || exit; pwd) +exePath=$(cd ./src/azmi-commandline/bin/Release/net5.0/linux-x64/publish || exit; pwd) export PATH="$exePath:$PATH" export DOTNET_BUNDLE_EXTRACT_BASE_DIR="$HOME/cache_dotnet_bundle_extract"