Use Network SDK from NuGet (Azure#12114)

anton-evseev · Shyam Dharmarajan · commit 0706e068eab9 · 2020-06-11T09:59:56.000-07:00
* Use Network SDK from NuGet

* Additional mappings
diff --git a/src/Batch/Batch.Test/Batch.Test.csproj b/src/Batch/Batch.Test/Batch.Test.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Batch" Version="10.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj b/src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.1.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Compute/Compute.Test/Compute.Test.csproj b/src/Compute/Compute.Test/Compute.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj b/src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj
@@ -5,6 +5,6 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
 </ItemGroup>
 </Project>
diff --git a/src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj b/src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Dns/Dns.Test/Dns.Test.csproj b/src/Dns/Dns.Test/Dns.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/src/KeyVault/KeyVault.Test/KeyVault.Test.csproj b/src/KeyVault/KeyVault.Test/KeyVault.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Monitor/Monitor.Test/Monitor.Test.csproj b/src/Monitor/Monitor.Test/Monitor.Test.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.20.0-preview" />
   </ItemGroup>
 
diff --git a/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj b/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
diff --git a/src/Network/Network/Common/NetworkResourceManagerProfile.cs b/src/Network/Network/Common/NetworkResourceManagerProfile.cs
@@ -385,12 +385,14 @@ private static void Initialize()
 
                 // VirtualNetwork
                 // CNM to MNM
+                cfg.CreateMap<CNM.PSVirtualNetwork, MNM.SubResource>();
                 cfg.CreateMap<CNM.PSAddressSpace, MNM.AddressSpace>();
                 cfg.CreateMap<CNM.PSVirtualNetwork, MNM.VirtualNetwork>();
                 cfg.CreateMap<CNM.PSVirtualNetworkUsage, MNM.VirtualNetworkUsage>();
                 cfg.CreateMap<CNM.PSUsageName, MNM.VirtualNetworkUsageName>();
 
                 // MNM to CNM
+                cfg.CreateMap<MNM.SubResource, CNM.PSVirtualNetwork>();
                 cfg.CreateMap<MNM.AddressSpace, CNM.PSAddressSpace>();
                 cfg.CreateMap<MNM.VirtualNetwork, CNM.PSVirtualNetwork>();
                 cfg.CreateMap<MNM.VirtualNetworkUsage, CNM.PSVirtualNetworkUsage>();
@@ -428,12 +430,14 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSNetworkInterfaceDnsSettings, MNM.NetworkInterfaceDnsSettings>();
                 cfg.CreateMap<CNM.PSNetworkInterfaceIPConfiguration, MNM.NetworkInterfaceIPConfiguration>();
                 cfg.CreateMap<CNM.PSNetworkInterfaceTapConfiguration, MNM.NetworkInterfaceTapConfiguration>();
+                cfg.CreateMap<CNM.PSNetworkInterfaceIPConfiguration, MNM.SubResource>();
 
                 // MNM to CNM
                 cfg.CreateMap<MNM.NetworkInterface, CNM.PSNetworkInterface>();
                 cfg.CreateMap<MNM.NetworkInterfaceDnsSettings, CNM.PSNetworkInterfaceDnsSettings>();
                 cfg.CreateMap<MNM.NetworkInterfaceIPConfiguration, CNM.PSNetworkInterfaceIPConfiguration>();
                 cfg.CreateMap<MNM.NetworkInterfaceTapConfiguration, CNM.PSNetworkInterfaceTapConfiguration>();
+                cfg.CreateMap<MNM.SubResource, CNM.PSNetworkInterfaceIPConfiguration>();
 
                 // Usage
                 cfg.CreateMap<CNM.PSUsage, MNM.Usage>();
diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/PrivateDns/PrivateDns.Test/PrivateDns.Test.csproj b/src/PrivateDns/PrivateDns.Test/PrivateDns.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.8-preview" />
diff --git a/src/Sql/Sql.Test/Sql.Test.csproj b/src/Sql/Sql.Test/Sql.Test.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.2.0-preview" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
diff --git a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.7.1-preview" />
   </ItemGroup>
diff --git a/tools/LocalFeed/Microsoft.Azure.Management.Network.20.0.0-preview.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.Network.20.0.0-preview.nupkg
diff --git a/tools/LocalFeed/Microsoft.Azure.Management.Network.20.0.0-preview.snupkg b/tools/LocalFeed/Microsoft.Azure.Management.Network.20.0.0-preview.snupkg
