Skip to content

Commit 10976bb

Browse files
author
maddieclayton
committed
fix merge conflict
2 parents cad8fff + 361bbff commit 10976bb

File tree

78 files changed

+165
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+165
-840
lines changed

‎src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,7 @@
8888
<HintPath>..\..\..\src\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll</HintPath>
8989
<Private>True</Private>
9090
</Reference>
91-
<Reference Include="System.Net.Http.WebRequest" />
92-
<Reference Include="System.Runtime.Serialization" />
93-
<Reference Include="System.Xml.Linq" />
94-
<Reference Include="System.Data.DataSetExtensions" />
95-
<Reference Include="Microsoft.CSharp" />
96-
<Reference Include="System.Data" />
9791
<Reference Include="System.Net.Http" />
98-
<Reference Include="System.Xml" />
9992
</ItemGroup>
10093
<ItemGroup>
10194
<Compile Include="AuthenticationStore.cs" />

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,8 @@
111111
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
112112
<Private>True</Private>
113113
</Reference>
114-
<Reference Include="System.Net.Http.WebRequest" />
115-
<Reference Include="System.Runtime.Serialization" />
116114
<Reference Include="System.Security" />
117115
<Reference Include="System.Windows.Forms" />
118-
<Reference Include="System.Xml.Linq" />
119-
<Reference Include="System.Data.DataSetExtensions" />
120-
<Reference Include="Microsoft.CSharp" />
121-
<Reference Include="System.Data" />
122-
<Reference Include="System.Xml" />
123116
</ItemGroup>
124117
<ItemGroup>
125118
<Compile Include="Authentication\AuthenticationStoreTokenCache.cs" />

‎src/Common/Commands.Common.Authorization/Commands.Common.Authorization.csproj

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,7 @@
6060
<Reference Include="System" />
6161
<Reference Include="System.Core" />
6262
<Reference Include="System.Net" />
63-
<Reference Include="System.Net.Http.WebRequest" />
64-
<Reference Include="System.Runtime.Serialization" />
65-
<Reference Include="System.Xml.Linq" />
66-
<Reference Include="System.Data.DataSetExtensions" />
67-
<Reference Include="Microsoft.CSharp" />
68-
<Reference Include="System.Data" />
6963
<Reference Include="System.Net.Http" />
70-
<Reference Include="System.Xml" />
7164
</ItemGroup>
7265
<ItemGroup>
7366
<Compile Include="AuthorizationManagementClient.cs" />
@@ -109,20 +102,6 @@
109102
<ItemGroup>
110103
<None Include="packages.config" />
111104
</ItemGroup>
112-
<ItemGroup>
113-
<ProjectReference Include="..\..\ResourceManager\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
114-
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
115-
<Name>Commands.ResourceManager.Common</Name>
116-
</ProjectReference>
117-
<ProjectReference Include="..\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
118-
<Project>{70527617-7598-4aef-b5bd-db9186b8184b}</Project>
119-
<Name>Commands.Common.Authentication.Abstractions</Name>
120-
</ProjectReference>
121-
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
122-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
123-
<Name>Commands.Common</Name>
124-
</ProjectReference>
125-
</ItemGroup>
126105
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127106
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
128107
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Common/Commands.Common.Graph.RBAC/Commands.Common.Graph.RBAC.csproj

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,41 +53,14 @@
5353
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.10\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
60-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
6856
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6957
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
7058
<Private>True</Private>
7159
</Reference>
7260
<Reference Include="System" />
7361
<Reference Include="System.Core" />
7462
<Reference Include="System.Net" />
75-
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
77-
<Private>True</Private>
78-
</Reference>
79-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
81-
<Private>True</Private>
82-
</Reference>
83-
<Reference Include="System.Net.Http.WebRequest" />
84-
<Reference Include="System.Runtime.Serialization" />
85-
<Reference Include="System.Xml.Linq" />
86-
<Reference Include="System.Data.DataSetExtensions" />
87-
<Reference Include="Microsoft.CSharp" />
88-
<Reference Include="System.Data" />
8963
<Reference Include="System.Net.Http" />
90-
<Reference Include="System.Xml" />
9164
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
9265
</ItemGroup>
9366
<ItemGroup>

‎src/Common/Commands.Common.Graph.RBAC/packages.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
4-
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
5-
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
6-
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net452" />
73
<package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />
84
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net452" />
95
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />

‎src/Common/Commands.Common.Network/Commands.Common.Network.csproj

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,7 @@
6060
<Reference Include="System" />
6161
<Reference Include="System.Core" />
6262
<Reference Include="System.Net" />
63-
<Reference Include="System.Net.Http.WebRequest" />
64-
<Reference Include="System.Runtime.Serialization" />
65-
<Reference Include="System.Xml.Linq" />
66-
<Reference Include="System.Data.DataSetExtensions" />
67-
<Reference Include="Microsoft.CSharp" />
68-
<Reference Include="System.Data" />
6963
<Reference Include="System.Net.Http" />
70-
<Reference Include="System.Xml" />
7164
</ItemGroup>
7265
<ItemGroup>
7366
<Compile Include="Common\INetworkInterfaceReference.cs" />
@@ -488,10 +481,6 @@
488481
<None Include="packages.config" />
489482
</ItemGroup>
490483
<ItemGroup>
491-
<ProjectReference Include="..\..\ResourceManager\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
492-
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
493-
<Name>Commands.ResourceManager.Common</Name>
494-
</ProjectReference>
495484
<ProjectReference Include="..\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
496485
<Project>{70527617-7598-4aef-b5bd-db9186b8184b}</Project>
497486
<Name>Commands.Common.Authentication.Abstractions</Name>

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -47,66 +47,9 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
69-
</Reference>
70-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
74-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
77-
</Reference>
78-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
81-
</Reference>
82-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
85-
</Reference>
86-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87-
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
89-
</Reference>
9050
<Reference Include="System" />
9151
<Reference Include="System.Core" />
92-
<Reference Include="System.Data.Services.Client" />
9352
<Reference Include="System.Net" />
94-
<Reference Include="System.Net.Http" />
95-
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96-
<SpecificVersion>False</SpecificVersion>
97-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
98-
</Reference>
99-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100-
<SpecificVersion>False</SpecificVersion>
101-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
102-
</Reference>
103-
<Reference Include="System.Net.Http.WebRequest" />
104-
<Reference Include="System.Runtime.Serialization" />
105-
<Reference Include="System.Xml.Linq" />
106-
<Reference Include="System.Data.DataSetExtensions" />
107-
<Reference Include="Microsoft.CSharp" />
108-
<Reference Include="System.Data" />
109-
<Reference Include="System.Xml" />
11053
</ItemGroup>
11154
<ItemGroup>
11255
<Compile Include="IStorageService.cs" />
@@ -126,20 +69,11 @@
12669
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
12770
</EmbeddedResource>
12871
</ItemGroup>
129-
<ItemGroup>
130-
<None Include="packages.config">
131-
<SubType>Designer</SubType>
132-
</None>
133-
</ItemGroup>
13472
<ItemGroup>
13573
<ProjectReference Include="..\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
13674
<Project>{70527617-7598-4aef-b5bd-db9186b8184b}</Project>
13775
<Name>Commands.Common.Authentication.Abstractions</Name>
13876
</ProjectReference>
139-
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
140-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
141-
<Name>Commands.Common</Name>
142-
</ProjectReference>
14377
</ItemGroup>
14478
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
14579
</Project>

‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
16+
using System;
17+
1518
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1619
{
17-
using Azure.Commands.Common.Authentication.Abstractions;
18-
using Microsoft.WindowsAzure.Commands.Common.Storage;
19-
using System;
20-
2120
/// <summary>
2221
/// Base class for all azure storage object
2322
/// </summary>

‎src/Common/Commands.Common.Storage/packages.config

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

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,7 @@
107107
<SpecificVersion>False</SpecificVersion>
108108
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
109109
</Reference>
110-
<Reference Include="System.Net.Http.WebRequest" />
111-
<Reference Include="System.Runtime.Serialization" />
112-
<Reference Include="System.Security" />
113-
<Reference Include="System.ServiceModel" />
114-
<Reference Include="System.ServiceModel.Channels" />
115-
<Reference Include="System.ServiceModel.Web" />
116-
<Reference Include="System.Web.Extensions" />
117-
<Reference Include="System.Windows.Forms" />
118110
<Reference Include="System.Xml.Linq" />
119-
<Reference Include="System.Data.DataSetExtensions" />
120-
<Reference Include="Microsoft.CSharp" />
121-
<Reference Include="System.Data" />
122111
<Reference Include="System.Xml" />
123112
</ItemGroup>
124113
<ItemGroup>

‎src/ResourceManager/ApiManagement/ApiManagement.sln

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
3-
VisualStudioVersion = 14.0.25420.1
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.27130.2027
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
66
EndProject
@@ -139,4 +139,7 @@ Global
139139
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
140140
{3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
141141
EndGlobalSection
142+
GlobalSection(ExtensibilityGlobals) = postSolution
143+
SolutionGuid = {0343A2B3-2962-4236-9F71-9A7C109720B8}
144+
EndGlobalSection
142145
EndGlobal

0 commit comments

Comments
 (0)