diff options
| author |  vnugent <public@vaughnnugent.com> | 2024-06-19 12:56:43 -0400 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2024-06-19 12:56:43 -0400 |
| commit | 0e0d7701979cd09e67cbd0137016ba6a5bb3b803 (patch) | |
| tree | 47704c39980e5367b99dd5fa48cfdc62923914dd | |
| parent | dd50b014f7ea0dc80505f03292777f8531cf25c5 (diff) | |
| parent | 90166048046d2511f0bb74f8880180e82466d4c0 (diff) | |
Merge branch 'develop' into c-sharp
| -rw-r--r-- | CMakePresets.json | 21 | ||||
| -rw-r--r-- | GitVersion.yml | 6 | ||||
| -rw-r--r-- | Module.Taskfile.yaml | 4 |
3 files changed, 10 insertions, 21 deletions
diff --git a/CMakePresets.json b/CMakePresets.json index 1c8038d..63ccfec 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -51,27 +51,6 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } - }, - { - "name": "x86-debug", - "displayName": "x86 Debug", - "inherits": "windows-base", - "architecture": { - "value": "x86", - "strategy": "external" - }, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "NC_BUILD_TESTS": true - } - }, - { - "name": "x86-release", - "displayName": "x86 Release", - "inherits": "x86-debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } } ] } diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..ebdfba1 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,6 @@ +assembly-versioning-scheme: MajorMinorPatch +mode: ContinuousDeployment +branches: {} +ignore: + sha: [] +merge-message-formats: {} diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml index 0a80e30..d31449a 100644 --- a/Module.Taskfile.yaml +++ b/Module.Taskfile.yaml @@ -18,6 +18,10 @@ tasks: - git reset --hard - git remote update - git pull origin {{.BRANCH_NAME}} --verify-signatures + + #updates the project versions for all inlcuded .NET projects + - dotnet-gitversion.exe /updateprojectfiles + #called by build pipeline to build module build: |