From 3d534c2b2c21b4c2b20372b319d64dc1ce14e039 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 21:08:57 +0100 Subject: [PATCH 1/6] build: update dotnet --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 3d26ee6..79422f0 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.2.401" + "version": "3.0.100" } } From 6bd19c0dcb300883a5baa39346839bbff448837a Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 21:12:29 +0100 Subject: [PATCH 2/6] ci: update dotnet --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b99f14..397e546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: csharp -dotnet: '2.2.401' +dotnet: '3.0.100' mono: none sudo: required From 120c1ee13717e1e1da649f15f691cf24912af1ca Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 21:41:15 +0100 Subject: [PATCH 3/6] ci: update dotnet-format --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 397e546..c10d6ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - sudo apt-get install -y powershell install: - - dotnet tool install -g dotnet-format --version 3.1.37601 + - dotnet tool install -g dotnet-format --version 4.0.40103 --add-source https://dotnet.myget.org/F/format/api/v3/index.json - pwsh ./ci/Install-Minikube.ps1 -MinikubeVersion v1.2.0 -KubernetesVersion v1.16.0 - pwsh -c 'Install-Module -Force -Scope CurrentUser PSScriptAnalyzer' From a29a33c2b4cddce53797facbfd99c9ca47f5c5b7 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 21:54:51 +0100 Subject: [PATCH 4/6] chore: update MiniCover --- src/PSKubectl.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PSKubectl.csproj b/src/PSKubectl.csproj index faf70c7..8becb44 100644 --- a/src/PSKubectl.csproj +++ b/src/PSKubectl.csproj @@ -13,6 +13,6 @@ All - + From b696b404d3498b99bcbdba3fae269195928eca56 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 22:31:14 +0100 Subject: [PATCH 5/6] build: use local tools --- .config/dotnet-tools.json | 18 ++++++++++++++++++ .travis.yml | 3 +-- src/PSKubectl.csproj | 1 - 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .config/dotnet-tools.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..2411106 --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-format": { + "version": "4.0.40103", + "commands": [ + "dotnet-format" + ] + }, + "minicover": { + "version": "3.0.0", + "commands": [ + "minicover" + ] + } + } +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index c10d6ba..b024934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,11 @@ before_install: - sudo apt-get install -y powershell install: - - dotnet tool install -g dotnet-format --version 4.0.40103 --add-source https://dotnet.myget.org/F/format/api/v3/index.json - pwsh ./ci/Install-Minikube.ps1 -MinikubeVersion v1.2.0 -KubernetesVersion v1.16.0 - pwsh -c 'Install-Module -Force -Scope CurrentUser PSScriptAnalyzer' script: - - ~/.dotnet/tools/dotnet-format + - dotnet dotnet-format - pwsh -c 'Invoke-ScriptAnalyzer -EnableExit -Path . -Recurse -Settings PSScriptAnalyzerSettings.psd1 | Format-List -Property RuleName,Message,ScriptPath,Line,Column' - pwsh ./build.ps1 - pwsh ./ci/Invoke-Tests.ps1 diff --git a/src/PSKubectl.csproj b/src/PSKubectl.csproj index 8becb44..da42b6b 100644 --- a/src/PSKubectl.csproj +++ b/src/PSKubectl.csproj @@ -13,6 +13,5 @@ All - From 2d19aabf905f7a07e3906996f506349e027e00a1 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Wed, 20 Nov 2019 22:38:27 +0100 Subject: [PATCH 6/6] ci: add dotnet tool restore --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b024934..5f4f23d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ before_install: - sudo apt-get install -y powershell install: + - dotnet tool restore - pwsh ./ci/Install-Minikube.ps1 -MinikubeVersion v1.2.0 -KubernetesVersion v1.16.0 - pwsh -c 'Install-Module -Force -Scope CurrentUser PSScriptAnalyzer'