Skip to content

Commit be48699

Browse files
robertlarobertla
committed
Fixed to use the common CommandRuntimeMock and project dependencies
1 parent 3d3a7ef commit be48699

File tree

4 files changed

+21
-177
lines changed

4 files changed

+21
-177
lines changed

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Commands.RemoteApp.Test.csproj

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16-
<NuGetPackageImportStamp>0a6b5a36</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>79105e11</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -40,7 +40,6 @@
4040
<ItemGroup>
4141
<Compile Include="Collection\RemoteAppCollection.cs" />
4242
<Compile Include="Common\CollectionObjects.cs" />
43-
<Compile Include="Common\MockCommandRuntime.cs" />
4443
<Compile Include="Common\MockObject.cs" />
4544
<Compile Include="Common\RemoteApp.cs" />
4645
<Compile Include="Common\RemoteAppClient.cs" />
@@ -79,6 +78,9 @@
7978
</ProjectReference>
8079
</ItemGroup>
8180
<ItemGroup>
81+
<!--<Reference Include="Microsoft.WindowsAzure.Common">
82+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
83+
</Reference>-->
8284
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8385
<SpecificVersion>False</SpecificVersion>
8486
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
@@ -107,32 +109,29 @@
107109
<SpecificVersion>False</SpecificVersion>
108110
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
109111
</Reference>
110-
<!--<Reference Include="Microsoft.WindowsAzure.Common">
111-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
112-
</Reference>-->
113112
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114113
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
114+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
116115
</Reference>
117116
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
118117
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
119118
<SpecificVersion>False</SpecificVersion>
120119
</Reference>
121120
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
122121
<SpecificVersion>False</SpecificVersion>
123-
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
122+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
124123
</Reference>
125124
<Reference Include="System" />
126125
<Reference Include="System.Management.Automation" />
127126
<Reference Include="System.Net" />
128127
<Reference Include="System.Net.Http" />
129-
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128+
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130129
<SpecificVersion>False</SpecificVersion>
131-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
130+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
132131
</Reference>
133-
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
132+
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134133
<SpecificVersion>False</SpecificVersion>
135-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
134+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
136135
</Reference>
137136
<Reference Include="System.Net.Http.WebRequest" />
138137
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
@@ -157,9 +156,12 @@
157156
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
158157
</PropertyGroup>
159158
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
160-
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
161159
</Target>
162-
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
160+
<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')" />
161+
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
162+
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
163+
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
164+
</Target>
163165
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164166
Other similar extension points exist, see Microsoft.Common.targets.
165167
<Target Name="BeforeBuild">

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/MockCommandRuntime.cs

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

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/RemoteAppClient.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp
1616
{
1717
using Microsoft.Azure.Management.RemoteApp;
1818
using Microsoft.Azure.Management.RemoteApp.Cmdlets;
19-
using Microsoft.WindowsAzure;
20-
using Microsoft.Azure.Commands.Test.RemoteApp.Common;
19+
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
2120
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2221
using Moq;
2322
using Moq.Language.Flow;

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.RemoteApp" version="1.0.8" targetFramework="net45" />
7-
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
7+
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
9-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
10-
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
11-
<package id="Microsoft.WindowsAzure.Management" version="4.1.0" targetFramework="net45" />
9+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
10+
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11+
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1212
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
13-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
13+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1414
<package id="xunit" version="1.9.2" targetFramework="net45" />
1515
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
1616
</packages>

0 commit comments

Comments
 (0)