Skip to content

Commit 40edb36

Browse files
author
Hovsep Mkrtchyan
committed
Fixed Resource solution complain for BCL and ServiceManagement reference in Commands.ScenarioTests.ResourceManager.Common.csproj
1 parent 32debb4 commit 40edb36

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Commands.Common.Authentication</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
14+
<TargetFrameworkProfile />
1515
<RestorePackages>true</RestorePackages>
1616
<CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
1717
<NuGetPackageImportStamp>06e19c11</NuGetPackageImportStamp>
@@ -51,7 +51,8 @@
5151
</PropertyGroup>
5252
<ItemGroup>
5353
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
5556
<Private>True</Private>
5657
</Reference>
5758
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -178,5 +179,4 @@
178179
<None Include="packages.config" />
179180
</ItemGroup>
180181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
181-
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
182182
</Project>

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<Compile Include="Mocks\MockClientFactory.cs" />
141141
<Compile Include="Mocks\MockCommandRuntime.cs" />
142142
<Compile Include="PermissiveRecordMatcherWithApiExclusion.cs" />
143+
<Compile Include="ProfileClient.cs" />
143144
<Compile Include="PSCmdletExtensions.cs" />
144145
<Compile Include="Constants.cs" />
145146
<Compile Include="Mocks\MockAccessToken.cs" />
@@ -171,10 +172,6 @@
171172
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
172173
<Name>Commands.Common</Name>
173174
</ProjectReference>
174-
<ProjectReference Include="..\..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj">
175-
<Project>{cff09e81-1e31-444e-b4d4-a21e946c29e2}</Project>
176-
<Name>Commands.ServiceManagement.Common</Name>
177-
</ProjectReference>
178175
<ProjectReference Include="..\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
179176
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
180177
<Name>Commands.ResourceManager.Common</Name>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ public EnvironmentSetupHelper()
6161
rmprofile.Context.Subscription.Environment = "foo";
6262
if (AzureRmProfileProvider.Instance.Profile == null)
6363
{
64-
AzureRmProfileProvider.Instance.Profile = rmprofile; }
64+
AzureRmProfileProvider.Instance.Profile = rmprofile;
65+
}
6566

66-
AzureSession.DataStore = datastore; ProfileClient = new ProfileClient(profile);
67+
AzureSession.DataStore = datastore;
68+
ProfileClient = new ProfileClient(profile);
6769

6870
// Ignore SSL errors
6971
System.Net.ServicePointManager.ServerCertificateValidationCallback += (se, cert, chain, sslerror) => true;

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
using Microsoft.Azure.Commands.Common.Authentication.Factories;
3030
using Microsoft.Azure.Commands.Common.Authentication.Models;
3131
using Microsoft.Azure.ServiceManagemenet.Common;
32+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
3233

3334
namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
3435
{

0 commit comments

Comments
 (0)