Merge pull request #2467 from NonStatic2014/newsdk

Consume new SDK and add support to relative path in Import-, Export- and New-

Author: markcowl

src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.csproj

@@ -59,7 +59,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.0-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
+    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.3-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
       <Name>Microsoft.Azure.Management.MachineLearning</Name>
       <Private>True</Private>
     </Reference>

src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.0-preview" />
+  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.3-preview" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5945.28173-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.0-preview" targetFramework="net45" />

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/ExportWebServiceDefinition.cs

@@ -67,13 +67,19 @@ public override void ExecuteCmdlet()
 
             if (!string.IsNullOrWhiteSpace(this.OutputFile))
             {
-                bool fileExisting = File.Exists(this.OutputFile);
+                var currentPath = this.SessionState.Path.CurrentFileSystemLocation.Path;
+                var definitionFileFullPath =
+                        Path.IsPathRooted(this.OutputFile) ?
+                            this.OutputFile :
+                            Path.Combine(currentPath, this.OutputFile);
+
+                bool fileExisting = File.Exists(definitionFileFullPath);
                 this.ConfirmAction(
                     this.Force || !fileExisting,
                     "Want to overwriting the output file?",
                     "Overwriting the output file",
-                    this.OutputFile,
-                    () => File.WriteAllText(this.OutputFile, serializedDefinition));
+                    definitionFileFullPath,
+                    () => File.WriteAllText(definitionFileFullPath, serializedDefinition));
             }
             else
             {

src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.csproj

@@ -47,7 +47,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.0-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
+    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.3-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
       <Name>Microsoft.Azure.Management.MachineLearning</Name>
       <Private>True</Private>
     </Reference>

src/ResourceManager/MachineLearning/Commands.MachineLearning/Utilities/CmdletHelpers.cs

@@ -51,22 +51,17 @@ internal static bool TryParseMlWebServiceMetadataFromResourceId(
 
         internal static string GetWebServiceDefinitionFromFile(string currentPath, string definitionFilePath)
         {
-            string definitionFileFullPath;
-            if (Path.IsPathRooted(definitionFilePath))
-            {
-                definitionFileFullPath = definitionFilePath;
-            }
-            else
-            {
-                definitionFileFullPath = Path.Combine(currentPath, definitionFilePath);
-            }
+            var definitionFileFullPath = 
+                    Path.IsPathRooted(definitionFilePath) ? 
+                        definitionFilePath : 
+                        Path.Combine(currentPath, definitionFilePath);
 
-            if (!File.Exists(definitionFilePath))
+            if (!File.Exists(definitionFileFullPath))
             {
-                throw new FileNotFoundException(Resources.MissingDefinitionFile, definitionFilePath);
+                throw new FileNotFoundException(Resources.MissingDefinitionFile, definitionFileFullPath);
             }
 
-            return File.ReadAllText(definitionFilePath);
+            return File.ReadAllText(definitionFileFullPath);
         }
     }
 }

src/ResourceManager/MachineLearning/Commands.MachineLearning/packages.config

@@ -10,5 +10,5 @@
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.1.0" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.0-preview" />
+  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.3-preview" />
 </packages>