use behavior instead of Disable property for Versioning Behavior

dansiegel · Jul 5, 2021 · 5b37696 · 5b37696
1 parent c6f70ca
commit 5b37696
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/docs/schemas/v2/buildtools.schema.json b/docs/schemas/v2/buildtools.schema.json
@@ -75,14 +75,6 @@
         "versionOffset": {
           "description": "If you need to offset from your build number, you may want to set the Version Offset to get a version that will work for you.",
           "type": "integer"
-        },
-        "disable": {
-          "description": "Disables this Mobile.BuildTools Task",
-          "type": [
-            "boolean",
-            "null"
-          ],
-          "default": false
         }
       }
     },

diff --git a/src/Mobile.BuildTools.Reference/Models/AutomaticVersioning.cs b/src/Mobile.BuildTools.Reference/Models/AutomaticVersioning.cs
@@ -3,7 +3,7 @@
 
 namespace Mobile.BuildTools.Models
 {
-    public class AutomaticVersioning : ToolItem
+    public class AutomaticVersioning
     {
         [DefaultValue(VersionBehavior.PreferBuildNumber)]
         [Description("Sets the default behavior for versioning the app. By default the Mobile.BuildTools will attempt to use a Build number and will fallback to a timestamp.")]

diff --git a/src/Mobile.BuildTools/Tasks/LocateBuildToolsConfigTask.cs b/src/Mobile.BuildTools/Tasks/LocateBuildToolsConfigTask.cs
@@ -76,7 +76,7 @@ public override bool Execute()
 
             // Only run these tasks for Android and iOS projects if they're not explicitly disabled
             EnableArtifactCopy = !crossTargetingProject && IsEnabled(configuration?.ArtifactCopy) && isPlatformHead;
-            EnableAutomaticVersioning = !crossTargetingProject && IsEnabled(configuration?.AutomaticVersioning) && isPlatformHead;
+            EnableAutomaticVersioning = !crossTargetingProject && configuration.AutomaticVersioning is not null && configuration.AutomaticVersioning.Behavior != VersionBehavior.Off && isPlatformHead;
             EnableImageProcessing = !crossTargetingProject && IsEnabled(configuration?.Images) && (platform == Platform.iOS || platform == Platform.Android);
             EnableTemplateManifests = !crossTargetingProject && IsEnabled(configuration?.Manifests) && isPlatformHead;
             EnableReleaseNotes = IsEnabled(configuration?.ReleaseNotes) && isPlatformHead && EnvironmentAnalyzer.IsInGitRepo(ProjectDir);