Skip to content

Commit 32e5971

Browse files
kisantiakisantia
committed
Fixed merge issues
1 parent 82511d9 commit 32e5971

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@
16271627
<Component Id="cmpC67F14F377421F1BCD74EC5A579D43CB" Guid="*">
16281628
<File Id="filE9553CEC1D67AB3D4B77759239D60B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll-Help.xml" />
16291629
</Component>
1630-
<Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
1630+
<Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
16311631
<File Id="filB571C170B96736E7EE17BBF869A203A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
16321632
</Component>
16331633
<Component Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" Guid="*">

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public EnvironmentSetupHelper()
6565
TestExecutionHelpers.SetUpSessionAndProfile();
6666
var datastore = new MemoryDataStore();
6767
AzureSession.Instance.DataStore = datastore;
68-
var rmprofile = new AzureRmProfile(Path.Combine(AzureSession.Instance.ARMProfileDirectory, AzureSession.Instance.ARMProfileFile));
68+
var rmprofile = new AzureRmProfile(Path.Combine(AzureSession.Instance.ProfileDirectory, AzureSession.Instance.ProfileFile));
6969
rmprofile.EnvironmentTable.Add("foo", new AzureEnvironment(AzureEnvironment.PublicEnvironments.Values.FirstOrDefault()));
7070
rmprofile.DefaultContext = new AzureContext(new AzureSubscription(), new AzureAccount(), rmprofile.EnvironmentTable["foo"], new AzureTenant());
7171
rmprofile.DefaultContext.Subscription.SetEnvironment("foo");
@@ -265,12 +265,12 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
265265
private void SetAuthenticationFactory(AzureModule mode, TestEnvironment environment)
266266
{
267267
#if !NETSTANDARD
268-
if(environment.AuthorizationContext.Certificate != null)
268+
if (environment.AuthorizationContext.Certificate != null)
269269
{
270270
AzureSession.Instance.AuthenticationFactory = new MockCertificateAuthenticationFactory(environment.UserName,
271271
environment.AuthorizationContext.Certificate);
272272
}
273-
else if(environment.AuthorizationContext.TokenCredentials.ContainsKey(TokenAudience.Management))
273+
else if (environment.AuthorizationContext.TokenCredentials.ContainsKey(TokenAudience.Management))
274274
{
275275
var httpMessage = new HttpRequestMessage();
276276
environment.AuthorizationContext.TokenCredentials[TokenAudience.Management]

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
80-
<Reference Include="Microsoft.Azure.Management.Network">
81-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.12.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
80+
<Reference Include="Microsoft.Azure.Management.Network">
81+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.14.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Sql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8484
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.6.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
@@ -402,7 +402,7 @@
402402
</None>
403403
<None Include="ScenarioTests\VirtualNetworkRuleTest.ps1">
404404
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
405-
</None>
405+
</None>
406406
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AdvisorTests\TestGetElasticPoolAdvisor.json">
407407
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
408408
</None>
@@ -949,13 +949,13 @@
949949
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeWithUpgradeHint.json">
950950
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
951951
</None>
952-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleCreateAndUpdate.json">
952+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleCreateAndUpdate.json">
953953
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
954954
</None>
955-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleGet.json">
955+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleGet.json">
956956
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
957957
</None>
958-
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleRemove.json">
958+
<None Include=".\SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualNetworkRuleTest\TestVirtualNetworkRuleRemove.json">
959959
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
960960
</None>
961961
</ItemGroup>

‎src/ResourceManager/Sql/Commands.Sql.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.2.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="12.0.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="14.0.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Sql" version="1.6.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />

‎src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@
416416
<Compile Include="VirtualNetworkRule\Cmdlet\SetAzureSqlServerVirtualNetworkRule.cs" />
417417
<Compile Include="VirtualNetworkRule\Model\AzureSqlServerVirtualNetworkRuleModel.cs" />
418418
<Compile Include="VirtualNetworkRule\Services\AzureSqlServerVirtualNetworkRuleAdapter.cs" />
419-
<Compile Include="VirtualNetworkRule\Services\AzureSqlServerVirtualNetworkRuleCommunicator.cs" />
419+
<Compile Include="VirtualNetworkRule\Services\AzureSqlServerVirtualNetworkRuleCommunicator.cs" />
420420
<None Include="SqlStartup.ps1">
421421
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
422422
</None>
@@ -449,9 +449,6 @@
449449
</Reference>
450450
<Reference Include="Microsoft.Azure.Management.Storage">
451451
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
452-
</Reference>
453-
<Reference Include="Microsoft.Azure.Management.Network">
454-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.12.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
455452
</Reference>
456453
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
457454
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎src/ResourceManager/Sql/Commands.Sql/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
44
<package id="Microsoft.Azure.Management.Sql" version="1.6.0-preview" targetFramework="net452" />
55
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
6-
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
76
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
87
</packages>

0 commit comments

Comments
 (0)