Merge pull request #2 from Azure/master

Sync

Author: bashahee

.azure-pipelines/powershell-core.yml

@@ -1,8 +1,8 @@
 variables:
   WindowsName: windows
-  WindowsImage: VS2017-Win2016
+  WindowsImage: vs2017-win2016
   LinuxName: linux
-  LinuxImage: Ubuntu-18.04
+  LinuxImage: ubuntu-18.04
   MacOSName: macOS
   MacOSImage: macOS-10.13
   TestFramework: netcoreapp2.1

.azure-pipelines/util/test-steps.yml

@@ -16,6 +16,11 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
 
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
+
 - template: publish-artifacts-steps.yml
   parameters:
     artifactName: test-${{ parameters.osName }}

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,13 +6,13 @@
 
 ## Checklist
 
-- [ ] I have read the [_Submitting Changes_](../CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../CONTRIBUTING.md)
+- [ ] I have read the [_Submitting Changes_](../blob/master/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/master/CONTRIBUTING.md)
 - [ ] The title of the PR is clear and informative
 - [ ] The appropriate `ChangeLog.md` file(s) has been updated:
     - For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
     - A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header -- no new version header should be added
-- [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
+- [ ] The PR does not introduce [breaking changes](../blob/master/documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
     - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
-    - [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
+    - [ ] the markdown help files have been regenerated using the commands listed [here](../blob/master/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add a deprecation message for `Resolve-Error` alias.
 
 ## Version 1.6.3
 * Update telemetry and url rewriting for generated modules, fix windows unit tests.

src/Accounts/Accounts/Errors/ResolveError.cs

@@ -19,9 +19,11 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using System.Collections;
 using Microsoft.Azure.Commands.ResourceManager.Common;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.Profile.Errors
 {
+    [GenericBreakingChange("The `Resolve-Error` alias will be removed in a future release.  Please change any scripts that use this alias to use `Resolve-AzError` instead.")]
     [Alias("Resolve-Error")]
     [Cmdlet("Resolve", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Error", DefaultParameterSetName = ResolveError.AnyErrorParameterSet)]
     [OutputType(typeof(AzureErrorRecord))]

src/Batch/Batch.Test/ApplicationPackages/GetBatchApplicationPackageCommandTests.cs

@@ -43,15 +43,15 @@ public void GetBatchApplicationPackageTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "test";
+            string applicationName = "test";
             string applicationVersion = "foo";
 
-            PSApplicationPackage expected = new PSApplicationPackage() { Id = applicationId, Version = applicationVersion };
-            batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationId, applicationVersion)).Returns(expected);
+            PSApplicationPackage expected = new PSApplicationPackage() { Name = applicationVersion };
+            batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationName, applicationVersion)).Returns(expected);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.ApplicationVersion = applicationVersion;
 
             cmdlet.ExecuteCmdlet();

src/Batch/Batch.Test/ApplicationPackages/NewBatchApplicationPackageCommandTests.cs

@@ -44,18 +44,18 @@ public void UploadBatchApplicationPackageTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string filePath = "~/fake/filepath";
             string version = "version";
             string format = "zip";
 
             PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();
 
-            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, false)).Returns(applicationPackageResponse);
+            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, filePath, format, false)).Returns(applicationPackageResponse);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.FilePath = filePath;
             cmdlet.ApplicationVersion = version;
             cmdlet.Format = format;
@@ -64,7 +64,7 @@ public void UploadBatchApplicationPackageTest()
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, false), Times.Once());
+            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, filePath, format, false), Times.Once());
         }
 
         [Fact]
@@ -73,7 +73,7 @@ public void UploadBatchApplicationPackageNoFilePathProvidedTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string version = "version";
             string format = "zip";
             string filePath = "";
@@ -82,7 +82,7 @@ public void UploadBatchApplicationPackageNoFilePathProvidedTest()
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.ApplicationVersion = version;
             cmdlet.FilePath = filePath;
             cmdlet.Format = format;
@@ -98,17 +98,17 @@ public void ActivateApplicationPackageOnly()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string version = "version";
             string format = "zip";
 
             PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();
 
-            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true)).Returns(applicationPackageResponse);
+            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, null, format, true)).Returns(applicationPackageResponse);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.ApplicationVersion = version;
             cmdlet.Format = format;
             cmdlet.ActivateOnly = true;
@@ -117,7 +117,7 @@ public void ActivateApplicationPackageOnly()
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true), Times.Once());
+            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, null, format, true), Times.Once());
         }
     }
 }

src/Batch/Batch.Test/ApplicationPackages/RemoveBatchApplicationPackageCommandTests.cs

@@ -43,18 +43,18 @@ public void DeleteBatchApplicationPackageTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string version = "version";
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.ApplicationVersion = version;
 
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.DeleteApplicationPackage(resourceGroup, accountName, applicationId, version), Times.Once());
+            batchClientMock.Verify(b => b.DeleteApplicationPackage(resourceGroup, accountName, applicationName, version), Times.Once());
         }
     }
 }

src/Batch/Batch.Test/Applications/GetBatchApplicationCommandTests.cs

@@ -71,14 +71,14 @@ public void GetBatchApplicationTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
 
             PSApplication expected = new PSApplication();
-            batchClientMock.Setup(b => b.GetApplication(resourceGroup, accountName, applicationId)).Returns(expected);
+            batchClientMock.Setup(b => b.GetApplication(resourceGroup, accountName, applicationName)).Returns(expected);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
 
             cmdlet.ExecuteCmdlet();
 

src/Batch/Batch.Test/Applications/NewBatchApplicationCommandTests.cs

@@ -44,16 +44,16 @@ public void AddBatchApplicationTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string displayName = "displayName";
 
             PSApplication expected = new PSApplication();
 
-            batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationId, true, displayName)).Returns(expected);
+            batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationName, true, displayName)).Returns(expected);
 
             cmdlet.ResourceGroupName = resourceGroup;
             cmdlet.AccountName = accountName;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.AllowUpdates = true;
             cmdlet.DisplayName = displayName;
 
@@ -68,16 +68,16 @@ public void AddBatchApplicationTestWithoutAllowUpdates()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string displayName = "displayName";
 
             PSApplication expected = new PSApplication();
 
-            batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationId, null, displayName)).Returns(expected);
+            batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationName, null, displayName)).Returns(expected);
 
             cmdlet.ResourceGroupName = resourceGroup;
             cmdlet.AccountName = accountName;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
 
             cmdlet.DisplayName = displayName;
 

src/Batch/Batch.Test/Applications/RemoveBatchApplicationCommandTests.cs

@@ -43,16 +43,16 @@ public void DeleteBatchApplicationTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
 
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.DeleteApplication(resourceGroup, accountName, applicationId), Times.Once());
+            batchClientMock.Verify(b => b.DeleteApplication(resourceGroup, accountName, applicationName), Times.Once());
         }
     }
 }

src/Batch/Batch.Test/Applications/SetBatchApplicationCommandTests.cs

@@ -43,21 +43,21 @@ public void UpdateBatchApplicationTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
             string displayName = "name";
             string defaultVersion = "version";
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.AllowUpdates = true;
             cmdlet.DefaultVersion = defaultVersion;
             cmdlet.DisplayName = displayName;
 
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, true, defaultVersion, displayName), Times.Once());
+            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, true, defaultVersion, displayName), Times.Once());
         }
 
         [Fact]
@@ -66,17 +66,17 @@ public void UpdateBatchApplicationAllowUpdatesOnlyTest()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
             cmdlet.AllowUpdates = true;
 
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, true, null, null), Times.Once());
+            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, true, null, null), Times.Once());
         }
 
         [Fact]
@@ -85,16 +85,16 @@ public void UpdateBatchApplicationDefault()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
-            string applicationId = "applicationId";
+            string applicationName = "applicationName";
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
-            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationName = applicationName;
 
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, null, null, null), Times.Once());
+            batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, null, null, null), Times.Once());
         }
     }
 }

src/Batch/Batch.Test/Batch.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Batch</PsModuleName>
@@ -14,9 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Batch" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Azure.Batch" Version="12.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="9.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>