general clean up and slns updated to vs2015

Author: matthew-rollitt

src/ResourceManager/AzureBatch/AzureBatch.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
 EndProject

src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BatchModelGenerator", "BatchModelGenerator.csproj", "{374701E4-539A-459A-9A00-B04E51652997}"
 EndProject

src/ResourceManager/AzureBatch/BatchModelGenerator/Program.cs

@@ -31,8 +31,7 @@ public class Program
 
         private static readonly Dictionary<string, string> OMtoPSClassMappings = new Dictionary<string, string>()
         {
-            {"Microsoft.Azure.Batch.NodeAgentSku", "PSNodeAgentSku"},
-            {"Microsoft.Azure.Batch.ImageReference", "PSImageReference"},
+            {"Microsoft.Azure.Batch.AffinityInformation", "PSAffinityInformation"},
             {"Microsoft.Azure.Batch.AutoPoolSpecification", "PSAutoPoolSpecification"},
             {"Microsoft.Azure.Batch.AutoScaleRun", "PSAutoScaleRun"},
             {"Microsoft.Azure.Batch.AutoScaleRunError", "PSAutoScaleRunError"},
@@ -55,6 +54,7 @@ public class Program
             {"Microsoft.Azure.Batch.ExitCodeMapping", "PSExitCodeMapping"},
             {"Microsoft.Azure.Batch.ExitOptions", "PSExitOptions"},
             {"Microsoft.Azure.Batch.FileProperties", "PSFileProperties"},
+            {"Microsoft.Azure.Batch.ImageReference", "PSImageReference"},
             {"Microsoft.Azure.Batch.RemoteLoginSettings", "PSRemoteLoginSettings"},
             {"Microsoft.Azure.Batch.JobConstraints", "PSJobConstraints"},
             {"Microsoft.Azure.Batch.JobExecutionInformation", "PSJobExecutionInformation"},
@@ -72,8 +72,9 @@ public class Program
             {"Microsoft.Azure.Batch.MetadataItem", "PSMetadataItem"},
             {"Microsoft.Azure.Batch.MultiInstanceSettings", "PSMultiInstanceSettings"},
             {"Microsoft.Azure.Batch.NameValuePair", "PSNameValuePair"},
-            {"Microsoft.Azure.Batch.NodeFile", "PSNodeFile"},
             {"Microsoft.Azure.Batch.NetworkConfiguration", "PSNetworkConfiguration"},
+            {"Microsoft.Azure.Batch.NodeAgentSku", "PSNodeAgentSku"},
+            {"Microsoft.Azure.Batch.NodeFile", "PSNodeFile"},
             {"Microsoft.Azure.Batch.PoolInformation", "PSPoolInformation"},
             {"Microsoft.Azure.Batch.PoolSpecification", "PSPoolSpecification"},
             {"Microsoft.Azure.Batch.PoolStatistics", "PSPoolStatistics"},
@@ -95,7 +96,6 @@ public class Program
             {"Microsoft.Azure.Batch.TaskSchedulingPolicy", "PSTaskSchedulingPolicy"},
             {"Microsoft.Azure.Batch.TaskStatistics", "PSTaskStatistics"},
             {"Microsoft.Azure.Batch.UsageStatistics", "PSUsageStatistics"},
-            {"Microsoft.Azure.Batch.AffinityInformation", "PSAffinityInformation"},
             {"Microsoft.Azure.Batch.VirtualMachineConfiguration", "PSVirtualMachineConfiguration"},
             {"Microsoft.Azure.Batch.WindowsConfiguration", "PSWindowsConfiguration"},
         };

src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/SetBatchJobCommandTests.cs

@@ -23,6 +23,7 @@
 using System.Management.Automation;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
+using CloudJob = Microsoft.Azure.Batch.Protocol.Models.CloudJob;
 using OnAllTasksComplete = Microsoft.Azure.Batch.Common.OnAllTasksComplete;
 
 namespace Microsoft.Azure.Commands.Batch.Test.Jobs
@@ -55,38 +56,27 @@ public void AutoCompletionSettingIsSentToService()
 
             Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
 
-<<<<<<< HEAD
             CloudJob cloudJob = new Azure.Batch.Protocol.Models.CloudJob(
                 id: "job-id",
                 poolInfo: new Azure.Batch.Protocol.Models.PoolInformation(),
                 onAllTasksComplete: (Azure.Batch.Protocol.Models.OnAllTasksComplete?)OnAllTasksComplete.TerminateJob);
 
             cmdlet.Job = new PSCloudJob(BatchTestHelpers.CreateFakeBoundJob(context, cloudJob));
             cmdlet.Job.OnAllTasksComplete = OnAllTasksComplete.TerminateJob;
-=======
-            var cloudJob = new Azure.Batch.Protocol.Models.CloudJob(
-                id: "job-id",
-                poolInfo: new Azure.Batch.Protocol.Models.PoolInformation(),
-                onAllTasksComplete: OnAllTasksComplete.TerminateJob);
-
-            cmdlet.Job = new PSCloudJob(BatchTestHelpers.CreateFakeBoundJob(context, cloudJob));
->>>>>>> hotfix/batch-tests-fixup
 
             RequestInterceptor interceptor =
                 BatchTestHelpers.CreateFakeServiceResponseInterceptor<JobUpdateParameter, JobUpdateOptions, AzureOperationHeaderResponse<JobUpdateHeaders>>(
                     new AzureOperationHeaderResponse<JobUpdateHeaders>(),
                     request =>
-                        {
-<<<<<<< HEAD
-                            Assert.Equal((OnAllTasksComplete)request.Parameters.OnAllTasksComplete, OnAllTasksComplete.TerminateJob);
-=======
-                            Assert.Equal(request.Parameters.OnAllTasksComplete, OnAllTasksComplete.TerminateJob);
->>>>>>> hotfix/batch-tests-fixup
-                        });
+                    {
+                        Assert.Equal((OnAllTasksComplete)request.Parameters.OnAllTasksComplete, OnAllTasksComplete.TerminateJob);
+                    });
 
             cmdlet.AdditionalBehaviors = new BatchClientBehavior[] { interceptor };
 
             // Verify that no exceptions occur
             cmdlet.ExecuteCmdlet();
+        }
     }
 }
+

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

@@ -266,15 +266,15 @@ public static string WaitForOSVersionChange(BatchController controller, BatchAcc
                 PoolId = poolId
             };
 
-            DateTime timeout = DateTime.Now.AddMinutes(20);
+            DateTime timeout = DateTime.Now.AddMinutes(5);
             PSCloudPool pool = client.ListPools(options).First();
             while (pool.CloudServiceConfiguration.CurrentOSVersion != pool.CloudServiceConfiguration.TargetOSVersion)
             {
                 if (DateTime.Now > timeout)
                 {
                     throw new TimeoutException("Timed out waiting for active state pool");
                 }
-                Sleep(15000);
+                Sleep(5000);
                 pool = client.ListPools(options).First();
             }
 
@@ -302,15 +302,15 @@ public static void WaitForSteadyPoolAllocation(BatchController controller, Batch
                 PoolId = poolId
             };
 
-            DateTime timeout = DateTime.Now.AddMinutes(15);
+            DateTime timeout = DateTime.Now.AddMinutes(5);
             PSCloudPool pool = client.ListPools(options).First();
             while (pool.AllocationState != AllocationState.Steady)
             {
                 if (DateTime.Now > timeout)
                 {
                     throw new TimeoutException("Timed out waiting for steady allocation state");
                 }
-                Sleep(10000);
+                Sleep(5000);
                 pool = client.ListPools(options).First();
             }
         }