Skip to content

Commit e495a49

Browse files
yadavbyadavb
committed
Merge branch 'using_public_sdk' into dev
2 parents fe60f9f + b8e838d commit e495a49

File tree

4 files changed

+28
-22
lines changed

4 files changed

+28
-22
lines changed

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

Lines changed: 14 additions & 10 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>b95c7030</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>0a6b5a36</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -90,16 +90,20 @@
9090
<SpecificVersion>False</SpecificVersion>
9191
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
9292
</Reference>
93-
<Reference Include="Microsoft.Azure.Management.RemoteApp">
94-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.5-preview\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
93+
<Reference Include="Microsoft.Azure.Management.RemoteApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94+
<SpecificVersion>False</SpecificVersion>
95+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.6\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
9596
</Reference>
96-
<Reference Include="Microsoft.Threading.Tasks">
97+
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<SpecificVersion>False</SpecificVersion>
9799
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
98100
</Reference>
99-
<Reference Include="Microsoft.Threading.Tasks.Extensions">
101+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102+
<SpecificVersion>False</SpecificVersion>
100103
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
101104
</Reference>
102-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
105+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106+
<SpecificVersion>False</SpecificVersion>
103107
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
104108
</Reference>
105109
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -121,13 +125,13 @@
121125
</Reference>
122126
<Reference Include="System.Net" />
123127
<Reference Include="System.Net.Http" />
124-
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125129
<SpecificVersion>False</SpecificVersion>
126-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
130+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
127131
</Reference>
128-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
132+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
129133
<SpecificVersion>False</SpecificVersion>
130-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
134+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
131135
</Reference>
132136
<Reference Include="System.Net.Http.WebRequest" />
133137
</ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.RemoteApp" version="1.0.5-preview" targetFramework="net45" />
7-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Management.RemoteApp" version="1.0.6" targetFramework="net45" />
7+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
10-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
10+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
1111
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
1212
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1313
</packages>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
<SpecificVersion>False</SpecificVersion>
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Azure.Management.RemoteApp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<Reference Include="Microsoft.Azure.Management.RemoteApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.5-preview\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RemoteApp.1.0.6\lib\net40\Microsoft.Azure.Management.RemoteApp.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
@@ -105,11 +105,13 @@
105105
</Reference>
106106
<Reference Include="System.Net" />
107107
<Reference Include="System.Net.Http" />
108-
<Reference Include="System.Net.Http.Extensions">
109-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
108+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109+
<SpecificVersion>False</SpecificVersion>
110+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
110111
</Reference>
111-
<Reference Include="System.Net.Http.Primitives">
112-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
112+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
113+
<SpecificVersion>False</SpecificVersion>
114+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
113115
</Reference>
114116
<Reference Include="System.Net.Http.WebRequest" />
115117
<Reference Include="System.Runtime.Serialization" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.10-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Extensions" version="0.13.1-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.RemoteApp" version="1.0.5-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.RemoteApp" version="1.0.6" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
10-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
10+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
1313
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.0.110281957-alpha" targetFramework="net45" />
14-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
14+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.0" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1717
</packages>

0 commit comments

Comments
 (0)