Revert "Fix VS code editor issues"

vikasnav · vikasnav · commit c9ff056e9594 · 2016-09-27T12:00:34.000-07:00
This reverts commit 941126f.
diff --git a/101-simple-windows-vm-diag/azuredeploy.json b/101-simple-windows-vm-diag/azuredeploy.json
@@ -248,7 +248,7 @@
             "autoUpgradeMinorVersion": true,
             "settings": {
               "xmlCfg": "[base64(concat(variables('wadcfgxstart'), variables('wadmetricsresourceid'), variables('vmName'), variables('wadcfgxend')))]",
-              "StorageAccount": "[variables('existingdiagnosticsStorageAccountName')]"
+              "storageAccount": "[variables('existingdiagnosticsStorageAccountName')]"
             },
             "protectedSettings": {
               "storageAccountName": "[variables('existingdiagnosticsStorageAccountName')]",
diff --git a/101-two-vm-extensions/azuredeploy.json b/101-two-vm-extensions/azuredeploy.json
@@ -21,10 +21,9 @@
         "publisher": "Microsoft.Compute",
         "type": "CustomScriptExtension",
         "typeHandlerVersion": "1.8",
-        "autoUpgradeMinorVersion": true,
+        "autoUpgradeMinorVersion": "true",
         "settings": {
-            "commandToExecute": "md c:\\users\\public\\documents\\test",
-            "fileUris": []
+          "commandToExecute": "md c:\\users\\public\\documents\\test"
         }
       }
     },
@@ -37,12 +36,10 @@
         "publisher": "Microsoft.Compute",
         "type": "BGInfo",
         "typeHandlerVersion": "2.1",
-        "autoUpgradeMinorVersion": true,
+        "autoUpgradeMinorVersion": "true",
         "settings": {
-            "fileUris": [ ],
-            "commandToExecute": "",
-            "Properties": [
-            ]
+          "Properties": [
+          ]
         }
       }
     }
diff --git a/101-vm-ext-win-cs-cmd/azuredeploy.json b/101-vm-ext-win-cs-cmd/azuredeploy.json
@@ -21,10 +21,9 @@
         "publisher": "Microsoft.Compute",
         "type": "CustomScriptExtension",
         "typeHandlerVersion": "1.8",
-        "autoUpgradeMinorVersion": true,
+        "autoUpgradeMinorVersion": "true",
         "settings": {
-            "commandToExecute": "md c:\\users\\public\\documents\\test",
-            "fileUris": []
+          "commandToExecute": "md c:\\users\\public\\documents\\test"
         }
       }
     }
diff --git a/101-vm-ext-win-cs-pscmd/azuredeploy.json b/101-vm-ext-win-cs-pscmd/azuredeploy.json
@@ -21,10 +21,9 @@
         "publisher": "Microsoft.Compute",
         "type": "CustomScriptExtension",
         "typeHandlerVersion": "1.8",
-        "autoUpgradeMinorVersion": true,
+        "autoUpgradeMinorVersion": "true",
         "settings": {
-            "commandToExecute": "powershell -ExecutionPolicy Unrestricted Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.100.2, 8.8.8.8",
-            "fileUris": []
+          "commandToExecute": "powershell -ExecutionPolicy Unrestricted Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.100.2, 8.8.8.8"
         }
       }
     }
diff --git a/101-vm-ext-win-cs-scriptfile/azuredeploy.json b/101-vm-ext-win-cs-scriptfile/azuredeploy.json
@@ -33,7 +33,7 @@
         "publisher": "Microsoft.Compute",
         "type": "CustomScriptExtension",
         "typeHandlerVersion": "1.8",
-        "autoUpgradeMinorVersion": true,
+        "autoUpgradeMinorVersion": "true",
         "settings": {
           "fileUris": [ "[parameters('scriptFile')]" ],
           "commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -file ',parameters('scriptName'))]"
diff --git a/anti-malware-ext-win/azuredeploy.json b/anti-malware-ext-win/azuredeploy.json
@@ -210,12 +210,7 @@
                         "scanType": "Quick",
                         "day": "7",
                         "time": "120"
-                    },
-                    "Exclusions": {
-                        "Extensions": "",
-                        "Paths": "",
-                        "Processes": ""
-                    }
+                     }
                 }
             }
 
diff --git a/docker-swarm-ubuntu/azuredeploy.json b/docker-swarm-ubuntu/azuredeploy.json
@@ -637,7 +637,7 @@
                     "vmSize": "[variables('agentVMSize')]"
                 },
                 "osProfile": {
-                    "computerName": "[concat(variables('agentVMNamePrefix'), copyIndex())]",
+                    "computername": "[concat(variables('agentVMNamePrefix'), copyIndex())]",
                     "adminUsername": "[variables('adminUsername')]",
                     "adminPassword": "[variables('adminPassword')]",
                     "linuxConfiguration": "[variables('linuxConfiguration')]"
diff --git a/mesos-windows-jumpbox/azuredeploy.json b/mesos-windows-jumpbox/azuredeploy.json
@@ -377,7 +377,7 @@
                     "vmSize": "[variables('jumpboxVMSize')]"
                 },
                 "osProfile": {
-                    "computerName": "[variables('jumpboxVMName')]",
+                    "computername": "[variables('jumpboxVMName')]",
                     "adminUsername": "[variables('windowsAdminUsername')]",
                     "adminPassword": "[variables('windowsAdminPassword')]"
                 },
diff --git a/rds-deployment-existing-ad/azuredeploy.json b/rds-deployment-existing-ad/azuredeploy.json
@@ -66,6 +66,8 @@
         "uniqueStorageAccountContainerName": "[concat('sc', resourceGroup().name)]",
         "imagePublisher": "MicrosoftWindowsServer",
         "imageOffer": "WindowsServer",
+        "vnetAddressRange": "10.0.0.0/16",
+        "subnetAddressRange": "10.0.0.0/24",
         "dnsServerPrivateIp": "10.0.0.4",
         "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('adVnetName')),'/subnets/',parameters('adSubnetName'))]",
         "publicIpRef": "publicIp",
@@ -123,22 +125,19 @@
           "apiVersion": "2015-06-15",
           "type": "Microsoft.Compute/availabilitySets",
           "name": "gw-availabilityset",
-          "location": "[resourceGroup().location]",
-          "properties": {}
+          "location": "[resourceGroup().location]"
         },
         {
           "apiVersion": "2015-06-15",
           "type": "Microsoft.Compute/availabilitySets",
           "name": "cb-availabilityset",
-          "location": "[resourceGroup().location]",
-          "properties": {}
+          "location": "[resourceGroup().location]"
         },
         {
           "apiVersion": "2015-06-15",
           "type": "Microsoft.Compute/availabilitySets",
           "name": "rdsh-availabilityset",
-          "location": "[resourceGroup().location]",
-          "properties": {}
+          "location": "[resourceGroup().location]"
         },
         {
             "apiVersion": "2015-06-15",
@@ -345,7 +344,7 @@
       "resources": [
         {
           "apiVersion": "2015-06-15",
-          "type": "extensions",
+          "type": "Microsoft.Compute/virtualMachines/extensions",
           "name": "gw-vm/gateway",
           "location": "[resourceGroup().location]",
           "dependsOn": [
@@ -430,7 +429,7 @@
       "resources": [
         {
           "apiVersion": "2015-06-15",
-          "type": "extensions",
+          "type": "Microsoft.Compute/virtualMachines/extensions",
           "name": "[concat('rdsh-', copyindex(),'/sessionhost')]",
           "location": "[resourceGroup().location]",
           "dependsOn": [
diff --git a/sharepoint-2013-non-ha/spVMTemplate.json b/sharepoint-2013-non-ha/spVMTemplate.json
@@ -183,7 +183,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','data-1.vhd')]",
                             "caching": "None",
-                            "createOption": "Empty",
+                            "createOption": "empty",
                             "diskSizeGB": "[parameters('dataDiskSize')]",
                             "lun": 0
                         },
@@ -193,7 +193,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','log-1.vhd')]",
                             "caching": "None",
-                            "createOption": "Empty",
+                            "createOption": "empty",
                             "diskSizeGB": "[parameters('dataDiskSize')]",
                             "lun": 1
                         }
diff --git a/sharepoint-2013-sample-loadtest/TestControllerRunLoadTest.json b/sharepoint-2013-sample-loadtest/TestControllerRunLoadTest.json
@@ -66,7 +66,7 @@
                 "publisher": "Microsoft.Compute",
                 "type": "CustomScriptExtension",
                 "typeHandlerVersion": "1.8",
-                "autoUpgradeMinorVersion": true,
+                "autoUpgradeMinorVersion": "true",
                 "settings": {
                     "fileUris": [
                         "[variables('DownloadLoadTestPackageScriptURL')]",
diff --git a/sql-2014-non-ha/sqlVmTemplate.json b/sql-2014-non-ha/sqlVmTemplate.json
@@ -87,6 +87,17 @@
         }
     },
     "variables": {
+        "apiVersion": {
+            "storage": {
+                "storageAccounts": "2015-06-15"
+            },
+            "compute": {
+                "virtualMachines": "2015-06-15"
+            },
+            "network": {
+                "virtualNetworks": "2015-05-01-preview"
+            }
+        },
         "location": "[resourceGroup().location]",
         "vmContainerName": "vhds"
 
@@ -96,7 +107,7 @@
             "name": "[parameters('storageAccount')]",
             "type": "Microsoft.Storage/storageAccounts",
             "location": "[variables('location')]",
-            "apiVersion": "2015-06-15",
+            "apiVersion": "[variables('apiVersion').storage.storageAccounts]",
             "properties": {
                 "accountType": "[parameters('storageAccountType')]"
             }
@@ -105,7 +116,7 @@
             "name": "[parameters('sqlNicName')]",
             "type": "Microsoft.Network/networkInterfaces",
             "location": "[variables('location')]",
-            "apiVersion": "2015-05-01-preview",
+            "apiVersion": "[variables('apiVersion').network.virtualNetworks]",
             "properties": {
                 "ipConfigurations": [
                     {
@@ -124,7 +135,7 @@
             "name": "[parameters('vmName')]",
             "type": "Microsoft.Compute/virtualMachines",
             "location": "[variables('location')]",
-            "apiVersion": "2015-06-15",
+            "apiVersion": "[variables('apiVersion').compute.virtualMachines]",
             "dependsOn": [
                 "[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
                 "[resourceId('Microsoft.Network/networkInterfaces',parameters('sqlNicName'))]"
@@ -160,7 +171,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','data-1.vhd')]",
                             "caching": "None",
-                            "createOption": "Empty",
+                            "createOption": "empty",
                             "diskSizeGB": "[parameters('sqlDiskSize')]",
                             "lun": 0
                         },
@@ -170,7 +181,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','log-1.vhd')]",
                             "caching": "None",
-                            "createOption": "Empty",
+                            "createOption": "empty",
                             "diskSizeGB": "[parameters('sqlDiskSize')]",
                             "lun": 1
                         }
diff --git a/vs2013-tcta/taVMTemplate.json b/vs2013-tcta/taVMTemplate.json

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,9 @@`
`21`	`21`	`"publisher": "Microsoft.Compute",`
`22`	`22`	`"type": "CustomScriptExtension",`
`23`	`23`	`"typeHandlerVersion": "1.8",`
`24`		`- "autoUpgradeMinorVersion": true,`
	`24`	`+ "autoUpgradeMinorVersion": "true",`
`25`	`25`	`"settings": {`
`26`		`- "commandToExecute": "md c:\\users\\public\\documents\\test",`
`27`		`- "fileUris": []`
	`26`	`+ "commandToExecute": "md c:\\users\\public\\documents\\test"`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`},`
`@@ -37,12 +36,10 @@`
`37`	`36`	`"publisher": "Microsoft.Compute",`
`38`	`37`	`"type": "BGInfo",`
`39`	`38`	`"typeHandlerVersion": "2.1",`
`40`		`- "autoUpgradeMinorVersion": true,`
	`39`	`+ "autoUpgradeMinorVersion": "true",`
`41`	`40`	`"settings": {`
`42`		`- "fileUris": [ ],`
`43`		`- "commandToExecute": "",`
`44`		`- "Properties": [`
`45`		`- ]`
	`41`	`+ "Properties": [`
	`42`	`+ ]`
`46`	`43`	`}`
`47`	`44`	`}`
`48`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,7 @@`
`210`	`210`	`"scanType": "Quick",`
`211`	`211`	`"day": "7",`
`212`	`212`	`"time": "120"`
`213`		`- },`
`214`		`- "Exclusions": {`
`215`		`- "Extensions": "",`
`216`		`- "Paths": "",`
`217`		`- "Processes": ""`
`218`		`- }`
	`213`	`+ }`
`219`	`214`	`}`
`220`	`215`	`}`
`221`	`216`