diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 3c92c7854..58b75c74b 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Test
       run: |
         sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
-        dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage"  --settings UnitTests/coverlet.runsettings --blame
+        dotnet test --verbosity normal --blame --diag:logs/logs.txt --blame-hang --blame-hang-timeout 60s
         mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
 
     # Note: this step is currently not writing to the gist for some reason
diff --git a/GitVersion.yml b/GitVersion.yml
index af28d2f24..ba888b3d5 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,10 +1,10 @@
 mode: ContinuousDeployment
 tag-prefix: '[vV]'
-continuous-delivery-fallback-tag: pre
+continuous-delivery-fallback-tag: dev
 branches:
   develop:
     mode: ContinuousDeployment
-    tag: pre
+    tag: dev
     regex: develop
     source-branches:
     - main
@@ -14,7 +14,6 @@ branches:
     mode: ContinuousDeployment
     tag: dev
     regex: ^v2_develop?[/-]
-    #is-release-branch: true
     tracks-release-branches: true
     is-source-branch-for: ['v2_release']
     source-branches: []
diff --git a/GitVersion.yml.orig b/GitVersion.yml.orig
new file mode 100644
index 000000000..345f7237f
--- /dev/null
+++ b/GitVersion.yml.orig
@@ -0,0 +1,103 @@
+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: '[/-](?<number>\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/UnitTests/UnitTests.sln b/UnitTests/UnitTests.sln
new file mode 100644
index 000000000..0d950924c
--- /dev/null
+++ b/UnitTests/UnitTests.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests.csproj", "{A29633F2-B26E-48B2-997A-1733286E3C13}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {86ED8EAD-F1D5-4F95-A0E6-6D73DFC8442F}
+	EndGlobalSection
+EndGlobal