From 574ffa0cfd051aad30c7b6a42fbb874baae7e6fc Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 09:49:36 +0100 Subject: [PATCH 1/7] refactor: add file exlusion in vscode settings --- .vscode/settings.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0f88c6d..e8aca22 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,5 +23,25 @@ "socio", "solrevdev", "Trello" - ] + ], + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "**/Thumbs.db": true, + "**/bin": true, + "**/obj": true, + ".vscode": false, + ".vs": true, + ".gitignore": false, + ".gitattributes": false, + ".prettierrc": false, + ".editorconfig": false, + ".dockerignore": false, + "omnisharp.json": false, + "global.json": false, + "**/lcov.info": true + }, } From ba387c2f0bf98c2327c8d617437cbf7e5318daf7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 09:50:25 +0100 Subject: [PATCH 2/7] refactor: change needed for c# dev kit extension --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index e8aca22..94c98dc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -44,4 +44,5 @@ "global.json": false, "**/lcov.info": true }, + "dotnet.defaultSolution": "solrevdev.seedfolder.sln" } From cb217f9efd05fcab0e5f1565b6e6ca521dbddb95 Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 09:50:58 +0100 Subject: [PATCH 3/7] refactor: omnisharp.json changes --- src/Data/omnisharp.json | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Data/omnisharp.json b/src/Data/omnisharp.json index 9036543..f047247 100644 --- a/src/Data/omnisharp.json +++ b/src/Data/omnisharp.json @@ -1,9 +1,24 @@ { "RoslynExtensionsOptions": { - "enableAnalyzersSupport": true, - "enableDecompilationSupport": true + "EnableAnalyzersSupport": true, + "EnableDecompilationSupport": true, + "EnableImportCompletion": true }, "FormattingOptions": { - "enableEditorConfigSupport": true + "EnableEditorConfigSupport": true, + "OrganizeImports": true + }, + "RenameOptions": { + "RenameInComments": true, + "RenameOverloads": true, + "RenameInStrings": true + }, + "FileOptions": { + "SystemExcludeSearchPatterns": [ + "**/node_modules/**/*", + "**/bin/**/*", + "**/obj/**/*" + ], + "ExcludeSearchPatterns": [] } } From ff0a5243de6b257134a627b1fbe332c6d4906f6e Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 10:45:38 +0100 Subject: [PATCH 4/7] refactor: disable shellcheck warnings --- build/lint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/lint.sh b/build/lint.sh index 4d86740..a256b51 100755 --- a/build/lint.sh +++ b/build/lint.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +# shellcheck disable=SC2086,SC2164,SC2046 cd $(dirname $0) dotnet-format ../solrevdev.seedfolder.sln --fix-style warn From 77a01f2a9c5ff8bb53448e8d31e59c5c856bde2a Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 10:50:21 +0100 Subject: [PATCH 5/7] feat: support .net 6 LTS --- src/solrevdev.seedfolder.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/solrevdev.seedfolder.csproj b/src/solrevdev.seedfolder.csproj index 1cd4776..e2028f9 100644 --- a/src/solrevdev.seedfolder.csproj +++ b/src/solrevdev.seedfolder.csproj @@ -2,8 +2,8 @@ Exe - net7.0 - 11 + net6.0;net7.0 + latest enable true seedfolder From de3bd26076652771a25bfbab05a4e094d160b2e7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 10:50:55 +0100 Subject: [PATCH 6/7] build: test nupkg locally bash and powerhell --- build/test-local.ps1 | 35 +++++++++++++++++++++++++++++++++++ build/test-local.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100755 build/test-local.ps1 create mode 100755 build/test-local.sh diff --git a/build/test-local.ps1 b/build/test-local.ps1 new file mode 100755 index 0000000..c685a0d --- /dev/null +++ b/build/test-local.ps1 @@ -0,0 +1,35 @@ +#!/usr/bin/env pwsh + +$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent +$scriptDir = Split-Path -Path $scriptDir -Parent + +Set-Location -Path $scriptDir + +# Clean and build the project +dotnet clean .\solrevdev.seedfolder.sln +dotnet restore .\solrevdev.seedfolder.sln +dotnet build .\solrevdev.seedfolder.sln + +# Create an artifact folder +$null = New-Item -Path .\artifacts -ItemType Directory -Force + +# Remove any old nupkg files +Remove-Item -Path .\artifacts\nupkg\* -Recurse -Force + +# Package the dotnet tool +dotnet pack .\solrevdev.seedfolder.sln -c Release -o .\artifacts\nupkg + +# Uninstall any version you currently have installed +dotnet tool uninstall -g solrevdev.seedfolder + +# Install the version we have just built and packaged +dotnet tool install -g --add-source .\artifacts\nupkg solrevdev.seedfolder + +# Run the tool +seedfolder --help + +# Now uninstall the tool ready for the next run +dotnet tool uninstall -g solrevdev.seedfolder + +# And install it again from nuget +dotnet tool install -g solrevdev.seedfolder diff --git a/build/test-local.sh b/build/test-local.sh new file mode 100755 index 0000000..883d9fc --- /dev/null +++ b/build/test-local.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +# shellcheck disable=SC2046 +cd $(dirname "$0") || exit + +# clean and build the project +dotnet clean ../solrevdev.seedfolder.sln +dotnet restore ../solrevdev.seedfolder.sln +dotnet build ../solrevdev.seedfolder.sln + +# create an artifact folder +mkdir -p ../artifacts + +# remove any old nupkg files +rm -rf ../artifacts/nupkg + +# package the dotnet tool +dotnet pack ../solrevdev.seedfolder.sln -c release -o ../artifacts/nupkg + +# uninstall any version you currently have installed +dotnet tool uninstall -g solrevdev.seedfolder + +# install the version we have just built and packaged +dotnet tool install -g --add-source ../artifacts/nupkg solrevdev.seedfolder + +# run the tool +seedfolder --help + +# now uninstall the tool ready for the next run +dotnet tool uninstall -g solrevdev.seedfolder + +# and install it again from nuget +dotnet tool install -g solrevdev.seedfolder From 5d039ba0a49355a29a49a1b62625d09c6d96ae41 Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 7 Jul 2023 10:56:18 +0100 Subject: [PATCH 7/7] feat: bump version --- src/solrevdev.seedfolder.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/solrevdev.seedfolder.csproj b/src/solrevdev.seedfolder.csproj index e2028f9..60b4ff2 100644 --- a/src/solrevdev.seedfolder.csproj +++ b/src/solrevdev.seedfolder.csproj @@ -9,7 +9,7 @@ seedfolder ./nupkg true - 1.2.3 + 1.2.4 solrevdev.seedfolder .NET Core Global Tool that creates a folder and copies dotfiles into it therefore seeding a folder. .NET Core Global Tool that creates a folder and copies dotfiles into it therefore seeding a folder.