diff --git a/GitVersion.yml b/GitVersion.yml
index 8bd0940c1..b8d28d02e 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,10 +1,11 @@
-next-version: 3.15.5
+next-version: 3.17.1
 mode: ContinuousDelivery
 legacy-semver-padding: 5
 build-metadata-padding: 5
 commits-since-version-source-padding: 5
 branches:
   master:
+    regex: ^(main|version3X)$
     tag: dev
   release:
     tag: pre
diff --git a/build.cake b/build.cake
index 498be2407..2ec9efdc4 100644
--- a/build.cake
+++ b/build.cake
@@ -779,7 +779,7 @@ Task("BuildTestAndPackage")
 Task("Appveyor")
     .Description("Target we run in our AppVeyor CI")
     .IsDependentOn("BuildTestAndPackage")
-    //.IsDependentOn("PublishPackages")
+    .IsDependentOn("PublishPackages")
     .IsDependentOn("CreateDraftRelease")
     .IsDependentOn("CreateProductionRelease");
 
diff --git a/src/NUnitEngine/nunit.engine.core.tests/Services/ExtensionManagerTests.cs b/src/NUnitEngine/nunit.engine.core.tests/Services/ExtensionManagerTests.cs
index 86b3b59bc..ab74dfb51 100644
--- a/src/NUnitEngine/nunit.engine.core.tests/Services/ExtensionManagerTests.cs
+++ b/src/NUnitEngine/nunit.engine.core.tests/Services/ExtensionManagerTests.cs
@@ -152,7 +152,7 @@ public void SkipsGracefullyLoadingOtherFrameworkExtensionAssembly()
             // Attempt to load the .NET 3.5 version of the extensions from the .NET Core 2.0 tests
             var assemblyName = Path.Combine(GetSiblingDirectory("net35"), "nunit.engine.core.tests.exe");
 #else
-            // Attempt to load the .NET Core 2.1 version of the extensions from the .NET 3.5 tests
+            // Attempt to load the .NET Core 3.1 version of the extensions from the .NET 3.5 tests
             var assemblyName = Path.Combine(GetSiblingDirectory("netcoreapp3.1"), "nunit.engine.core.tests.dll");
 #endif
             Assert.That(assemblyName, Does.Exist);