Merge remote-tracking branch 'origin/master' into Localization

Tasks/AppCenterDistributeV3/task.json

@@ -14,7 +14,7 @@
     "version": {
         "Major": 3,
         "Minor": 221,
-        "Patch": 0
+        "Patch": 1
     },
     "minimumAgentVersion": "2.144.0",
     "releaseNotes": "Added support for forwarding Android mapping to App Center Diagnostics. Added missing descriptions.",

Tasks/AppCenterDistributeV3/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 3,
     "Minor": 221,
-    "Patch": 0
+    "Patch": 1
   },
   "minimumAgentVersion": "2.144.0",
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/AppCenterTestV1/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 221,
-        "Patch": 0
+        "Patch": 1
     },
     "minimumAgentVersion": "2.144.0",
     "groups": [

Tasks/AppCenterTestV1/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 221,
-    "Patch": 0
+    "Patch": 1
   },
   "minimumAgentVersion": "2.144.0",
   "groups": [

Tasks/MavenV2/Strings/resources.resjson/en-US/resources.resjson

@@ -48,8 +48,8 @@
   "loc.input.help.mavenSetM2Home": "Sets the M2_HOME variable to a custom Maven installation path.",
   "loc.input.label.mavenOpts": "Set MAVEN_OPTS to",
   "loc.input.help.mavenOpts": "Sets the MAVEN_OPTS environment variable, which is used to send command-line arguments to start the JVM. The -Xmx flag specifies the maximum memory available to the JVM.",
-  "loc.input.label.mavenFeedAuthenticate": "Authenticate built-in Maven feeds",
-  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds.",
+  "loc.input.label.mavenFeedAuthenticate": "Authenticate with Artifacts feeds",
+  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds.",
   "loc.input.label.sqAnalysisEnabled": "Run SonarQube or SonarCloud analysis",
   "loc.input.help.sqAnalysisEnabled": "This option has changed from version 1 of the **Maven** task to use the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) and [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) marketplace extensions.  Enable this option to run [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing goals in the **Goals** field. The **install** or **package** goal should run first. You must also add a **Prepare Analysis Configuration** task from one of the extensions to the build pipeline before this Maven task.",
   "loc.input.label.isJacocoCoverageReportXML": "Use XML Jacoco reports for SonarQube analysis",
@@ -96,6 +96,6 @@
   "loc.messages.NoCodeCoverage": "No code coverage results were found to publish.",
   "loc.messages.EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
   "loc.messages.EffectivePomInvalid": "Could not parse the effective POM.",
-  "loc.messages.AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-  "loc.messages.UsingAuthFeed": "Using built-in feed: "
+  "loc.messages.AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+  "loc.messages.UsingAuthFeed": "Using Artifacts feed: "
 }

Tasks/MavenV2/task.json

@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 220,
+        "Minor": 221,
         "Patch": 0
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
@@ -323,11 +323,11 @@
                 "mavenAuthenticateFeed"
             ],
             "type": "boolean",
-            "label": "Authenticate built-in Maven feeds",
+            "label": "Authenticate with Artifacts feeds",
             "required": true,
             "defaultValue": "true",
             "groupName": "advanced",
-            "helpMarkDown": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds."
+            "helpMarkDown": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds."
         },
         {
             "name": "sqAnalysisEnabled",
@@ -447,7 +447,7 @@
         "NoCodeCoverage": "No code coverage results were found to publish.",
         "EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
         "EffectivePomInvalid": "Could not parse the effective POM.",
-        "AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-        "UsingAuthFeed": "Using built-in feed: "
+        "AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+        "UsingAuthFeed": "Using Artifacts feed: "
     }
 }

Tasks/MavenV2/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 220,
+    "Minor": 221,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/MavenV3/Strings/resources.resjson/en-US/resources.resjson

@@ -48,10 +48,10 @@
   "loc.input.help.mavenSetM2Home": "Sets the M2_HOME variable to a custom Maven installation path.",
   "loc.input.label.mavenOpts": "Set MAVEN_OPTS to",
   "loc.input.help.mavenOpts": "Sets the MAVEN_OPTS environment variable, which is used to send command-line arguments to start the JVM. The -Xmx flag specifies the maximum memory available to the JVM.",
-  "loc.input.label.mavenFeedAuthenticate": "Authenticate built-in Maven feeds",
-  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds.",
-  "loc.input.label.skipEffectivePom": "Skip generating effective POM while authenticating built-in feeds",
-  "loc.input.help.skipEffectivePom": "Authenticate built-in Maven feeds using the POM only, allowing parent POMs in Azure Artifacts/Azure DevOps Server [Package Management] feeds.",
+  "loc.input.label.mavenFeedAuthenticate": "Authenticate with Artifacts feeds",
+  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds.",
+  "loc.input.label.skipEffectivePom": "Skip generating effective POM while authenticating with Artifacts feeds",
+  "loc.input.help.skipEffectivePom": "Authenticates with Artifacts feeds using the POM only.",
   "loc.input.label.sqAnalysisEnabled": "Run SonarQube or SonarCloud analysis",
   "loc.input.help.sqAnalysisEnabled": "This option has changed from version 1 of the **Maven** task to use the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) and [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) marketplace extensions.  Enable this option to run [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing goals in the **Goals** field. The **install** or **package** goal should run first. You must also add a **Prepare Analysis Configuration** task from one of the extensions to the build pipeline before this Maven task.",
   "loc.input.label.isJacocoCoverageReportXML": "Use XML Jacoco reports for SonarQube analysis",
@@ -106,7 +106,7 @@
   "loc.messages.NoCodeCoverage": "No code coverage results were found to publish.",
   "loc.messages.EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
   "loc.messages.EffectivePomInvalid": "Could not parse the effective POM.",
-  "loc.messages.AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-  "loc.messages.UsingAuthFeed": "Using built-in feed: ",
+  "loc.messages.AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+  "loc.messages.UsingAuthFeed": "Using Artifacts feed: ",
   "loc.messages.NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
 }

Tasks/MavenV3/task.json

@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 219,
+        "Minor": 221,
         "Patch": 0
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
@@ -323,23 +323,23 @@
                 "mavenAuthenticateFeed"
             ],
             "type": "boolean",
-            "label": "Authenticate built-in Maven feeds",
+            "label": "Authenticate with Artifacts feeds",
             "required": true,
             "defaultValue": "false",
             "groupName": "advanced",
-            "helpMarkDown": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds."
+            "helpMarkDown": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds."
         },
         {
             "name": "skipEffectivePom",
             "aliases": [
                 "effectivePomSkip"
             ],
             "type": "boolean",
-            "label": "Skip generating effective POM while authenticating built-in feeds",
+            "label": "Skip generating effective POM while authenticating with Artifacts feeds",
             "required": true,
             "defaultValue": "false",
             "groupName": "advanced",
-            "helpMarkDown": "Authenticate built-in Maven feeds using the POM only, allowing parent POMs in Azure Artifacts/Azure DevOps Server [Package Management] feeds."
+            "helpMarkDown": "Authenticates with Artifacts feeds using the POM only."
         },
         {
             "name": "sqAnalysisEnabled",
@@ -512,8 +512,8 @@
         "NoCodeCoverage": "No code coverage results were found to publish.",
         "EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
         "EffectivePomInvalid": "Could not parse the effective POM.",
-        "AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-        "UsingAuthFeed": "Using built-in feed: ",
+        "AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+        "UsingAuthFeed": "Using Artifacts feed: ",
         "NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
     }
 }

Tasks/MavenV3/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 219,
+    "Minor": 221,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/MavenV4/Strings/resources.resjson/en-US/resources.resjson

@@ -48,10 +48,10 @@
   "loc.input.help.mavenSetM2Home": "Sets the M2_HOME variable to a custom Maven installation path.",
   "loc.input.label.mavenOpts": "Set MAVEN_OPTS to",
   "loc.input.help.mavenOpts": "Sets the MAVEN_OPTS environment variable, which is used to send command-line arguments to start the JVM. The -Xmx flag specifies the maximum memory available to the JVM.",
-  "loc.input.label.mavenFeedAuthenticate": "Authenticate built-in Maven feeds",
-  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds.",
-  "loc.input.label.skipEffectivePom": "Skip generating effective POM while authenticating built-in feeds",
-  "loc.input.help.skipEffectivePom": "Authenticate built-in Maven feeds using the POM only, allowing parent POMs in Azure Artifacts/Azure DevOps Server [Package Management] feeds.",
+  "loc.input.label.mavenFeedAuthenticate": "Authenticate with Artifacts feeds",
+  "loc.input.help.mavenFeedAuthenticate": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds.",
+  "loc.input.label.skipEffectivePom": "Skip generating effective POM while authenticating with Artifacts feeds",
+  "loc.input.help.skipEffectivePom": "Authenticates with Artifacts feeds using the POM only.",
   "loc.input.label.sqAnalysisEnabled": "Run SonarQube or SonarCloud analysis",
   "loc.input.help.sqAnalysisEnabled": "This option has changed from version 1 of the **Maven** task to use the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) and [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) marketplace extensions.  Enable this option to run [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing goals in the **Goals** field. The **install** or **package** goal should run first. You must also add a **Prepare Analysis Configuration** task from one of the extensions to the build pipeline before this Maven task.",
   "loc.input.label.isJacocoCoverageReportXML": "Use XML Jacoco reports for SonarQube analysis",
@@ -106,7 +106,7 @@
   "loc.messages.NoCodeCoverage": "No code coverage results were found to publish.",
   "loc.messages.EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
   "loc.messages.EffectivePomInvalid": "Could not parse the effective POM.",
-  "loc.messages.AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-  "loc.messages.UsingAuthFeed": "Using built-in feed: ",
+  "loc.messages.AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+  "loc.messages.UsingAuthFeed": "Using Artifacts feed: ",
   "loc.messages.NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
 }

Tasks/MavenV4/task.json

@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 4,
-        "Minor": 219,
+        "Minor": 221,
         "Patch": 0
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
@@ -323,23 +323,23 @@
                 "mavenAuthenticateFeed"
             ],
             "type": "boolean",
-            "label": "Authenticate built-in Maven feeds",
+            "label": "Authenticate with Artifacts feeds",
             "required": true,
             "defaultValue": "false",
             "groupName": "advanced",
-            "helpMarkDown": "Automatically authenticate Maven feeds from Azure Artifacts. If built-in Maven feeds are not in use, deselect this option for faster builds."
+            "helpMarkDown": "Automatically authenticates with Azure Artifacts feeds. If Artifacts feeds are not in use, deselect this option for faster builds."
         },
         {
             "name": "skipEffectivePom",
             "aliases": [
                 "effectivePomSkip"
             ],
             "type": "boolean",
-            "label": "Skip generating effective POM while authenticating built-in feeds",
+            "label": "Skip generating effective POM while authenticating with Artifacts feeds",
             "required": true,
             "defaultValue": "false",
             "groupName": "advanced",
-            "helpMarkDown": "Authenticate built-in Maven feeds using the POM only, allowing parent POMs in Azure Artifacts/Azure DevOps Server [Package Management] feeds."
+            "helpMarkDown": "Authenticates with Artifacts feeds using the POM only."
         },
         {
             "name": "sqAnalysisEnabled",
@@ -512,8 +512,8 @@
         "NoCodeCoverage": "No code coverage results were found to publish.",
         "EntryAlreadyExists": "The settings for the feed or repository already exists in the xml file.",
         "EffectivePomInvalid": "Could not parse the effective POM.",
-        "AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
-        "UsingAuthFeed": "Using built-in feed: ",
+        "AuthenticationNotNecessary": "No Artifacts feeds requiring authentication were found. Disable 'Authenticate with Artifacts feeds' for faster builds.",
+        "UsingAuthFeed": "Using Artifacts feed: ",
         "NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
     }
 }

Tasks/MavenV4/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 219,
+    "Minor": 221,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/PublishToAzureServiceBusV1/Strings/resources.resjson/en-US/resources.resjson

@@ -18,6 +18,6 @@
   "loc.input.help.signatureKey": "Key where you want signature to be in Message Properties. If left Empty, default is 'signature' in message properties",
   "loc.input.label.waitForCompletion": "Wait for task completion",
   "loc.input.help.waitForCompletion": "If this is true, this task will wait for TaskCompleted event for the specified task timeout.",
-  "loc.input.label.useDataContractSerializer": "Use .NET data contract serailizer",
+  "loc.input.label.useDataContractSerializer": "Use .NET data contract serializer",
   "loc.input.help.useDataContractSerializer": "For more details go to task documentation"
 }

Tasks/PublishToAzureServiceBusV1/task.json

@@ -16,7 +16,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 220,
+        "Minor": 221,
         "Patch": 0
     },
     "groups": [
@@ -101,7 +101,7 @@
         {
             "name": "useDataContractSerializer",
             "type": "boolean",
-            "label": "Use .NET data contract serailizer",
+            "label": "Use .NET data contract serializer",
             "required": true,
             "defaultValue": "true",
             "helpMarkDown": "For more details go to task documentation"
@@ -138,4 +138,4 @@
             }
         }
     }
-}
+}