Merge Master

specification/security/resource-manager/Microsoft.Security/stable/2020-01-01/SecuritySolutions.json

@@ -147,6 +147,7 @@
       "allOf": [
         {
           "$ref": "../../../common/v1/types.json#/definitions/Resource"
+
         },
         {
           "$ref": "../../../common/v1/types.json#/definitions/Location"
@@ -236,3 +237,6 @@
     }
   }
 }
+
+}
+

specification/security/resource-manager/readme.md

@@ -221,6 +221,7 @@ input-file:
 - Microsoft.Security/stable/2020-01-01/securitySolutionsReferenceData.json
 - Microsoft.Security/stable/2020-01-01/externalSecuritySolutions.json
 - Microsoft.Security/stable/2020-01-01/secureScore.json
+- Microsoft.Security/preview/2020-01-01-preview/secureScore.json
 - Microsoft.Security/stable/2020-01-01/SecuritySolutions.json
 - Microsoft.Security/preview/2020-01-01-preview/connectors.json
 - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json
@@ -548,4 +549,73 @@ See configuration in [readme.ruby.md](./readme.ruby.md)
 
 ## Java
 
-See configuration in [readme.java.md](./readme.java.md)
+See configuration in [readme.java.md](./readme.java.md)
+
+``` yaml $(tag) == 'all-api-versions' /*autogenerated*/
+# include the azure profile definitions from the standard location
+require: $(this-folder)/../../../profiles/readme.md
+
+# all the input files across all versions
+input-file:
+  - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/secureScore.json
+  - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/connectors.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/automations.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/pricings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/securityContacts.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/workspaceSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/autoProvisioningSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/compliances.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/advancedThreatProtectionSettings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/settings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/operations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/locations.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/tasks.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/alerts.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/discoveredSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/jitNetworkAccessPolicies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/applicationWhitelistings.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/externalSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/topologies.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json
+  - $(this-folder)/Microsoft.Security/preview/2015-06-01-preview/adaptiveNetworkHardenings.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/alertsSuppressionRules.json
+  - $(this-folder)/Microsoft.Security/stable/2018-06-01/pricings.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2017-08-01-preview/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/alerts.json
+  - $(this-folder)/Microsoft.Security/stable/2017-08-01/complianceResults.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/settings.json
+  - $(this-folder)/Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotAlertTypes.json
+  - $(this-folder)/Microsoft.Security/stable/2019-08-01/iotAlerts.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/serverVulnerabilityAssessments.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessmentMetadata.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessments.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/applicationWhitelistings.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/allowedConnections.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/topologies.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/jitNetworkAccessPolicies.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/discoveredSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/securitySolutionsReferenceData.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/SecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/stable/2020-01-01/externalSecuritySolutions.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json
+  - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessments.json
+
+```
+
+If there are files that should not be in the `all-api-versions` set,
+uncomment the  `exclude-file` section below and add the file paths.
+
+``` yaml $(tag) == 'all-api-versions'
+#exclude-file:
+#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
+```