Skip to content

Commit 5b4557f

Browse files
MikhailTryakhovMikhailTryakhov
committed
Merge branch 'preview' into local-october
# Conflicts: # src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj # src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj # src/ResourceManager/Compute/Commands.Compute.Test/packages.config # src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj # src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj # src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj # src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj # src/ResourceManager/Dns/Commands.Dns.Test/packages.config # src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj # src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj # src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config # src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.Netcore.csproj # src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj # src/ResourceManager/Network/Commands.Network.Test/packages.config # src/ResourceManager/Network/Commands.Network/ChangeLog.md # src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj # src/ResourceManager/Network/Commands.Network/Commands.Network.csproj # src/ResourceManager/Network/Commands.Network/packages.config # src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.Netcore.csproj # src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj # src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/packages.config # src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj # src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj # src/ResourceManager/Sql/Commands.Sql.Test/packages.config # tools/AzureRM/AzureRM.psm1
2 parents 166c362 + bc834a0 commit 5b4557f

File tree

9 files changed

+10
-13
lines changed

9 files changed

+10
-13
lines changed

‎AzureRM/AzureRM.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# RootModule
12-
RootModule = "AzureRM.psm1"
12+
# RootModule = ''
1313

1414
# Version number of this module.
1515
ModuleVersion = '2.3.0.1'

‎AzureRM/AzureRM.psm1

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎AzureStack/AzureStack.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Root Module
12-
RootModule = "AzureStack.psm1"
12+
# RootModule = ''
1313

1414
# Version number of this module.
1515
ModuleVersion = '1.5.1'

‎AzureStack/AzureStack.psm1

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Compute/Commands.Compute.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1717
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
19-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
20-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.16" targetFramework="net452" />
19+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
20+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net452" />
2121
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net45" />
2222
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.2" targetFramework="net452" />
2323
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />

‎Resources/Commands.Resources.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1717
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1818
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
19-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
19+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2222
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />

‎Storage.Management/SDK/StorageSDK.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<Reference Include="System.Net.Http" />
5757
<Reference Include="System.Runtime.Serialization" />
5858
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.14\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
59+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.17\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.16\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
62+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.18\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
6363
</Reference>
6464
</ItemGroup>
6565
<ItemGroup>

‎Storage.Management/SDK/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
4-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
5-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.16" targetFramework="net452" />>
4+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
5+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net452" />>
66
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
77
</packages>

‎Storage/Commands.Storage.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
18-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
18+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
1919
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />

0 commit comments

Comments
 (0)