Merge pull request #5367 from kalyanaj/preview

EventGrid: Updated to use the latest version of the .NET SDK

Author: cormacpayne

src/ResourceManager/EventGrid/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Updated to use the 2018-01-01 API version.
 
 ## Version 0.3.0
 * Added the following new cmdlet:

src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.csproj

@@ -57,7 +57,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.EventGrid">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.2.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.EventHub">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.3\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>

src/ResourceManager/EventGrid/Commands.EventGrid.Test/ScenarioTests/EventSubscriptionTests.ps1

@@ -158,8 +158,8 @@ function EventSubscriptionTests_ResourceGroup {
     $updateResult = Update-AzureRmEventGridSubscription -ResourceGroup $resourceGroupName -EventSubscriptionName $eventSubscriptionName -SubjectEndsWith "NewSuffix" -Label $newLabels
     Assert-True {$updateResult.ProvisioningState -eq "Succeeded"}
     Assert-True {$updateResult.Filter.SubjectEndsWith -eq "NewSuffix"}
-	$updatedLabels = $updateResult.Labels
-	Assert-AreEqual 2 $updatedLabels.Count;
+    $updatedLabels = $updateResult.Labels
+    Assert-AreEqual 2 $updatedLabels.Count;
     Assert-AreEqual "Marketing" $updatedLabels[0];
     Assert-AreEqual "Sales" $updatedLabels[1];
 

src/ResourceManager/EventGrid/Commands.EventGrid.Test/SessionRecords/Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToAzureSubscription.json

@@ -34,9 +34,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.EventGrid, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.EventGrid, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.2.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>

src/ResourceManager/EventGrid/Commands.EventGrid.Test/SessionRecords/Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToAzureSubscription2.json

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Commands.EventGrid")]

src/ResourceManager/EventGrid/Commands.EventGrid.Test/SessionRecords/Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToCustomTopics.json

@@ -178,7 +178,7 @@ public EventSubscription CreateEventSubscription(
                 eventSubscription.Labels = new List<string>(labels);
             }
 
-            return this.Client.EventSubscriptions.Create(scope, eventSubscriptionName, eventSubscription);
+            return this.Client.EventSubscriptions.CreateOrUpdate(scope, eventSubscriptionName, eventSubscription);
         }
 
         public EventSubscription UpdateEventSubscription(

src/ResourceManager/EventGrid/Commands.EventGrid.Test/SessionRecords/Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToCustomTopics2.json

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.Management.EventGrid" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.EventGrid" version="1.2.0-preview" targetFramework="net452" />
 </packages>