Arm 7.18.6 (#115)

* added preview in vm for artifactory & X-ray

* updated artifactory 7.18.6 & X-ray 3.24.2 in templates file and remove -preview from VM

* Updated all changes for Artifactory version 7.18.6 & X-ray version 3.24.2

AzureResourceManager/Xray/azuredeploy_xray_vmss.json

@@ -19,7 +19,7 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.18",
+      "defaultValue": "0.0.21",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -27,7 +27,9 @@
 	"0.0.14",
 	"0.0.15",
 	"0.0.17",
-	"0.0.18"
+	"0.0.18",
+	"0.0.20",
+	"0.0.21"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."