diff --git a/.gitignore b/.gitignore
index bbfa8e16e..cca1f4801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,9 @@ UnitTests/TestResults
TestResults
# git merge files
-.orig
-.theirs
-.ours
+*.orig
+*.theirs
+*.ours
demo.*
diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj
index 3cad5995b..5594dd0da 100644
--- a/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj
+++ b/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj
@@ -6,12 +6,12 @@
enable
-
-
-
-
+
+
+
+
-
+
@@ -22,4 +22,8 @@
+
+
+
+
diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj
index e4e88bd61..42445111d 100644
--- a/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj
+++ b/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj
@@ -14,13 +14,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
all
@@ -45,4 +45,8 @@
+
+
+
+
diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
index 80d788ac3..06ce0794b 100644
--- a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
+++ b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
@@ -47,17 +47,21 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
diff --git a/CommunityToolkitExample/CommunityToolkitExample.csproj b/CommunityToolkitExample/CommunityToolkitExample.csproj
index fdb41dfcd..44b28218e 100644
--- a/CommunityToolkitExample/CommunityToolkitExample.csproj
+++ b/CommunityToolkitExample/CommunityToolkitExample.csproj
@@ -16,4 +16,8 @@
+
+
+
+
diff --git a/Example/Example.csproj b/Example/Example.csproj
index 4bb8cc0bc..47fafd9a1 100644
--- a/Example/Example.csproj
+++ b/Example/Example.csproj
@@ -13,4 +13,7 @@
+
+
+
\ No newline at end of file
diff --git a/GitVersion.yml.orig b/GitVersion.yml.orig
deleted file mode 100644
index 345f7237f..000000000
--- a/GitVersion.yml.orig
+++ /dev/null
@@ -1,103 +0,0 @@
-mode: ContinuousDeployment
-tag-prefix: '[vV]'
-continuous-delivery-fallback-tag: dev
-branches:
- develop:
- mode: ContinuousDeployment
- tag: dev
- regex: develop
- source-branches:
- - main
- pre-release-weight: 100
-
- v2_develop:
- mode: ContinuousDeployment
- tag: dev
- regex: ^v2_develop?[/-]
-<<<<<<< HEAD
- #is-release-branch: true
-=======
->>>>>>> v2_develop
- tracks-release-branches: true
- is-source-branch-for: ['v2_release']
- source-branches: []
-
- v2_release:
- mode: ContinuousDeployment
- tag: prealpha
- regex: v2_release
- is-release-branch: true
- source-branches: ['v2_develop']
-
- pull-request:
- mode: ContinuousDeployment
- tag: PullRequest.{BranchName}
- increment: Inherit
- tag-number-pattern: '[/-](?\d+)'
- regex: ^(pull|pull\-requests|pr)[/-]
- source-branches:
- - develop
- - main
- - release
- - v2_develop
- - v2_release
- - feature
- - support
- - hotfix
- pre-release-weight: 30000
-
-ignore:
- sha: []
-
-
-# next-version: 2.0.0
-# mode: ContinuousDeployment
-# tag-prefix: '[vV]'
-# continuous-delivery-fallback-tag: 'pre'
-# branches:
-# # v1_develop:
-# # mode: ContinuousDeployment
-# # tag: pre
-# # regex: ^v1_develop?[/-]
-# # is-release-branch: false
-# # source-branches:
-# # - v1
-# # v1:
-# # tag: rc
-# # increment: Patch
-# # regex: ^v2?[/-]
-# # is-release-branch: false
-# # source-branches: []
-# # is-mainline: true
-
-# v2_develop:
-# mode: ContinuousDeployment
-# tag: pre
-# regex: ^v2_develop?[/-]
-# is-release-branch: true
-# tracks-release-branches: true
-# is-source-branch-for: ['v2']
-# source-branches: []
-# v2:
-# mode: ContinuousDeployment
-# is-release-branch: false
-# tag: alpha
-# increment: Patch
-# regex: ^v2?[/-]
-# source-branches: ['v2_develop']
-
-# # feature:
-# # tag: useBranchName
-# # regex: ^features?[/-]
-# # source-branches:
-# # - v1
-# # - v1_develop
-# # - v2
-# # - v2_develop
-
-# pull-request:
-# tag: PullRequest.{BranchName}
-# increment: Inherit
-# ignore:
-# sha: []
-# merge-message-formats: {}
diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj
index 54f46753a..42ddcc91d 100644
--- a/ReactiveExample/ReactiveExample.csproj
+++ b/ReactiveExample/ReactiveExample.csproj
@@ -12,10 +12,13 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index 1959d51d3..b436834a1 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -50,14 +50,14 @@
-
-
-
-
+
+
+
+
-
-
+
+
all
diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj
index e461d7c2f..1295f4f5a 100644
--- a/UICatalog/UICatalog.csproj
+++ b/UICatalog/UICatalog.csproj
@@ -29,9 +29,9 @@
-
+
-
+
@@ -46,4 +46,7 @@
+
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 716afb0fa..d64e3c63a 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -29,12 +29,12 @@
true
-
-
-
-
+
+
+
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -57,6 +57,9 @@
+
+
+
False