Merge remote-tracking branch 'upstream/dev' into dev

Author: Kamran Khan

CONTRIBUTING.md

@@ -115,6 +115,12 @@ For ServiceManagement services, the change log is located at `src\ServiceManagem
 
 For Storage, this change log is located at `src\Storage\ChangeLog.md`.
 
+#### Breaking Changes
+
+Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes.md).
+
+Whenever a service team announces a breaking change, they must add it to the `upcoming-breaking-changes.md` file in their respective service folder. When the service team is ready to release the module with the breaking change, they must move the corresponding information from `upcoming-breaking-changes.md` into the `current-breaking-changes.md` file located in their service folder.
+
 #### General guidelines
 
 The following guidelines must be followed in **EVERY** pull request that is opened.

documentation/breaking-change-template.md renamed to documentation/breaking-changes/breaking-change-template.md

@@ -0,0 +1 @@
+

documentation/breaking-changes.md renamed to documentation/breaking-changes/breaking-changes-definition.md

@@ -0,0 +1,28 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Upcoming Breaking Changes", and should adhere to the following format:
+
+    # Upcoming Breaking Changes
+
+    ## Release X.0.0 - January 2017
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above section follows the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+# Upcoming Breaking Changes

documentation/breaking-changes/current-breaking-changes.md

@@ -0,0 +1,41 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Current Breaking Changes", and should adhere to the following format:
+
+    ## Current Breaking Changes
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    ## Release X.0.0
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above sections follow the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+## Current Breaking Changes

documentation/breaking-changes/upcoming-breaking-changes.md

@@ -0,0 +1,28 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Upcoming Breaking Changes", and should adhere to the following format:
+
+    # Upcoming Breaking Changes
+
+    ## Release X.0.0 - January 2017
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above section follows the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+# Upcoming Breaking Changes

src/ResourceManager/ApiManagement/documentation/current-breaking-changes.md

@@ -0,0 +1,41 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Current Breaking Changes", and should adhere to the following format:
+
+    ## Current Breaking Changes
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    ## Release X.0.0
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above sections follow the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+## Current Breaking Changes

src/ResourceManager/ApiManagement/documentation/upcoming-breaking-changes.md

@@ -0,0 +1,28 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Upcoming Breaking Changes", and should adhere to the following format:
+
+    # Upcoming Breaking Changes
+
+    ## Release X.0.0 - January 2017
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above section follows the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+# Upcoming Breaking Changes

src/ResourceManager/Automation/documentation/current-breaking-changes.md

@@ -0,0 +1,41 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Current Breaking Changes", and should adhere to the following format:
+
+    ## Current Breaking Changes
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    ## Release X.0.0
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above sections follow the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+## Current Breaking Changes

src/ResourceManager/Automation/documentation/upcoming-breaking-changes.md

@@ -0,0 +1,28 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Upcoming Breaking Changes", and should adhere to the following format:
+
+    # Upcoming Breaking Changes
+
+    ## Release X.0.0 - January 2017
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above section follows the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+# Upcoming Breaking Changes

src/ResourceManager/AzureBackup/documentation/current-breaking-changes.md

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
@@ -24,42 +25,49 @@ public BatchAccountTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetNonExistingBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-GetNonExistingBatchAccount");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreatesNewBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-CreatesNewBatchAccount");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatesExistingBatchAccount()
         {
             BatchController.NewInstance.RunPsTest("Test-UpdatesExistingBatchAccount");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetBatchAccountsUnderResourceGroups()
         {
             BatchController.NewInstance.RunPsTest("Test-GetBatchAccountsUnderResourceGroups");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateAndRemoveBatchAccountViaPiping()
         {
             BatchController.NewInstance.RunPsTest("Test-CreateAndRemoveBatchAccountViaPiping");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestBatchAccountKeys()
         {
             BatchController.NewInstance.RunPsTest("Test-BatchAccountKeys");
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListNodeAgentSkus()
         {
             BatchController.NewInstance.RunPsTest("Test-GetBatchNodeAgentSkus");

src/ResourceManager/AzureBackup/documentation/upcoming-breaking-changes.md

@@ -16,6 +16,7 @@
 using Microsoft.Azure.Test;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
 {
@@ -25,6 +26,7 @@ public class BatchApplicationPackageTests : WindowsAzure.Commands.Test.Utilities
         private const string version = "foo";
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUploadApplicationPackage()
         {
             string id = "newApplicationPackage";
@@ -54,6 +56,7 @@ public void TestUploadApplicationPackage()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdateApplicationPackage()
         {
             string id = "updateApplicationPackage";
@@ -83,6 +86,7 @@ public void TestUpdateApplicationPackage()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreatePoolWithApplicationPackage()
         {
             string id = "createPoolWithApplicationPackage";
@@ -111,6 +115,7 @@ public void TestCreatePoolWithApplicationPackage()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUpdatePoolWithApplicationPackage()
         {
             string id = "updatePoolWithApplicationPackage";

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs

@@ -16,12 +16,14 @@
 using Microsoft.Azure.Test;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.Azure.Commands.Batch.Test.ScenarioTests
 {
     public class BatchApplicationTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAddApplication()
         {
             BatchController.NewInstance.RunPsTest(string.Format("Test-AddApplication"));

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationPackageTests.cs

@@ -35,6 +35,7 @@ public void TestCertificateCrudOperations()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCancelCertificateDelete()
         {
             BatchController controller = BatchController.NewInstance;