Skip to content

Commit 5c68570

Browse files
author
Hovsep
committed
Merge pull request #1882 from begoldsm/dev
ADL Upgrade to AutoRest
2 parents a823ef3 + 0c080bd commit 5c68570

File tree

75 files changed

+9970
-9378
lines changed

Some content is hidden

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

75 files changed

+9970
-9378
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -950,12 +950,6 @@
950950
<Component Id="cmpC7E6FE59FD9BE2336B79DB8ECBF17046" Guid="*">
951951
<File Id="fil61CA47DE019E9D104047A04BBE4CBBA4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.Analytics.dll" />
952952
</Component>
953-
<Component Id="cmp1716E926BEC9E4B94246B9900677763C" Guid="*">
954-
<File Id="filB2C061924D5D27E442FDE93A7A09790E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.dll" />
955-
</Component>
956-
<Component Id="cmp448D2FD66CAEA24E2C585380D499D515" Guid="*">
957-
<File Id="fil4CC549396754C1149F25FC77C029162B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll" />
958-
</Component>
959953
<Component Id="cmp6427B43273FAE59C682B8F34631AABF9" Guid="*">
960954
<File Id="filC8094B88A4FF44526C50F20B85B999A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.ResourceManager.dll" />
961955
</Component>
@@ -968,6 +962,9 @@
968962
<Component Id="cmp33ACC536D3148134079F201DDFE77041" Guid="*">
969963
<File Id="fil68134395180424CF926E86CA852D5A17" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
970964
</Component>
965+
<Component Id="cmp7AF20CAE2005123323E3D9C0F8709408" Guid="*">
966+
<File Id="filBD917B281F92F71FE5811C63D626F43C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.Azure.dll" />
967+
</Component>
971968
<Component Id="cmp155DD45DF9686335F29475E5BE19C042" Guid="*">
972969
<File Id="filC5793429BA209EBCED9CBEC92DDAA3EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.dll" />
973970
</Component>
@@ -1033,9 +1030,6 @@
10331030
<Component Id="cmp3C96010EFA751762A76B66B811613835" Guid="*">
10341031
<File Id="fil509D1E7494560B2BB3462B8FAD7954CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.Store.dll" />
10351032
</Component>
1036-
<Component Id="cmp575B392ACE04250894FE0A0AEAED1076" Guid="*">
1037-
<File Id="fil75BC3F0D21F16D610A43BF71C4478822" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.StoreFileSystem.dll" />
1038-
</Component>
10391033
<Component Id="cmpFECE1A517C9182672B042869C46847FC" Guid="*">
10401034
<File Id="fil00C18C352C99B9BCFA42EFFACE0AEFF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.StoreUploader.dll" />
10411035
</Component>
@@ -1051,6 +1045,9 @@
10511045
<Component Id="cmpE013952E5C0092DEF16E1BCB8554E2BD" Guid="*">
10521046
<File Id="fil1157E8777215834782623202281C662C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
10531047
</Component>
1048+
<Component Id="cmpC546D5383D0250C9E75D98657182CA83" Guid="*">
1049+
<File Id="fil422766278FCD5D4120A80E0F929D3237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.Azure.dll" />
1050+
</Component>
10541051
<Component Id="cmp4428C8FD56C2C743D3C60DBE1C2A78EF" Guid="*">
10551052
<File Id="fil09973D8B858AB058ED76A7C02BF404A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.dll" />
10561053
</Component>
@@ -5318,12 +5315,11 @@
53185315
<ComponentRef Id="cmpD3A3362A8365705FDC0C19B312EB61FC" />
53195316
<ComponentRef Id="cmp096EEC3ACF260985958CED2DC04BD9A9" />
53205317
<ComponentRef Id="cmpC7E6FE59FD9BE2336B79DB8ECBF17046" />
5321-
<ComponentRef Id="cmp1716E926BEC9E4B94246B9900677763C" />
5322-
<ComponentRef Id="cmp448D2FD66CAEA24E2C585380D499D515" />
53235318
<ComponentRef Id="cmp6427B43273FAE59C682B8F34631AABF9" />
53245319
<ComponentRef Id="cmpF037C3CB01A53CACE3DEE2967867A5A8" />
53255320
<ComponentRef Id="cmpBF55514F4254BD001BBD9F655C72947C" />
53265321
<ComponentRef Id="cmp33ACC536D3148134079F201DDFE77041" />
5322+
<ComponentRef Id="cmp7AF20CAE2005123323E3D9C0F8709408" />
53275323
<ComponentRef Id="cmp155DD45DF9686335F29475E5BE19C042" />
53285324
<ComponentRef Id="cmpA98C0F8AD11679264AD00A82F52281C2" />
53295325
<ComponentRef Id="cmpD778BFD40FC787AEB2416D7011E33D4C" />
@@ -5345,12 +5341,12 @@
53455341
<ComponentRef Id="cmp87FB43928F7A2ECF62C0141446D21A9F" />
53465342
<ComponentRef Id="cmpD2292657EF3D9CEAC5D4FA7DEB3E7E8E" />
53475343
<ComponentRef Id="cmp3C96010EFA751762A76B66B811613835" />
5348-
<ComponentRef Id="cmp575B392ACE04250894FE0A0AEAED1076" />
53495344
<ComponentRef Id="cmpFECE1A517C9182672B042869C46847FC" />
53505345
<ComponentRef Id="cmpFCFE1AC675F0BA7336B392A419D70042" />
53515346
<ComponentRef Id="cmpB41201E194E7639BC9C33ADECC894426" />
53525347
<ComponentRef Id="cmpCA3408E9E612E4D3DFDE66EDA04DB4C8" />
53535348
<ComponentRef Id="cmpE013952E5C0092DEF16E1BCB8554E2BD" />
5349+
<ComponentRef Id="cmpC546D5383D0250C9E75D98657182CA83" />
53545350
<ComponentRef Id="cmp4428C8FD56C2C743D3C60DBE1C2A78EF" />
53555351
<ComponentRef Id="cmp6A9835F3E1B5DC12D06838385F1FB63A" />
53565352
<ComponentRef Id="cmpE1A83F89536BF9BE1BE6D50E2EB117F7" />

‎src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,19 @@ public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureEnviro
119119
}
120120

121121
/// <summary>
122+
/// Creates the client.
122123
/// </summary>
123-
/// <typeparam name="TClient"></typeparam>
124-
/// <param name="subscription"></param>
125-
/// <param name="endpoint"></param>
124+
/// <typeparam name="TClient">The type of the client.</typeparam>
125+
/// <param name="profile">The profile.</param>
126+
/// <param name="subscription">The subscription.</param>
127+
/// <param name="endpoint">The endpoint.</param>
126128
/// <returns></returns>
129+
/// <exception cref="System.ApplicationException"></exception>
130+
/// <exception cref="System.ArgumentException">
131+
/// accountName
132+
/// or
133+
/// environment
134+
/// </exception>
127135
public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
128136
{
129137
if (subscription == null)
@@ -287,7 +295,7 @@ public void AddUserAgent(string productName)
287295

288296
public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
289297

290-
private DelegatingHandler[] GetCustomHandlers()
298+
public DelegatingHandler[] GetCustomHandlers()
291299
{
292300
List<DelegatingHandler> newHandlers = new List<DelegatingHandler>();
293301
var enumerator = _handlers.GetEnumerator();

‎src/Common/Commands.Common.Authentication/Interfaces/IClientFactory.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ public interface IClientFactory
5454
/// <param name="productName">Product name.</param>
5555
void AddUserAgent(string productName);
5656

57+
/// <summary>
58+
/// Gets the custom handlers.
59+
/// </summary>
60+
/// <returns>An array of custom handlers</returns>
61+
DelegatingHandler[] GetCustomHandlers();
62+
5763
/// <summary>
5864
/// Adds user agent to UserAgents collection.
5965
/// </summary>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
176176
// Do nothing
177177
}
178178

179+
public DelegatingHandler[] GetCustomHandlers()
180+
{
181+
// the equivalent of doing nothing
182+
return new DelegatingHandler[0];
183+
}
184+
179185
public void AddUserAgent(string productName, string productVersion)
180186
{
181187
this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

‎src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
44
<add key="AzureStackMachineName" value="azstackvm"/>
@@ -11,4 +11,4 @@
1111
<add key="AadLoginUri" value="https://login.windows.net/"/>
1212
<add key="AadGraphUri" value="https://graph.windows.net/"/>
1313
</appSettings>
14-
</configuration>
14+
</configuration>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@
172172
</ProjectReference>
173173
</ItemGroup>
174174
<ItemGroup>
175-
<None Include="App.config">
176-
<SubType>Designer</SubType>
177-
</None>
175+
<None Include="App.config" />
178176
<None Include="AzureStackTests.ps1">
179177
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
180178
</None>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
169169
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
170170
environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
171171
environment.Endpoints[AzureEnvironment.Endpoint.Graph] = currentEnvironment.Endpoints.GraphUri.AbsoluteUri;
172+
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix] = currentEnvironment.Endpoints.DataLakeAnalyticsJobAndCatalogServiceUri.OriginalString.Replace("https://",""); // because it is just a sufix
173+
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix] = currentEnvironment.Endpoints.DataLakeStoreServiceUri.OriginalString.Replace("https://", ""); // because it is just a sufix
172174

173175
if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
174176
{

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
176176
// Do nothing
177177
}
178178

179+
public DelegatingHandler[] GetCustomHandlers()
180+
{
181+
// the equivalent of doing nothing
182+
return new DelegatingHandler[0];
183+
}
184+
179185
public void AddUserAgent(string productName, string productVersion)
180186
{
181187
this.UniqueUserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

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

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,23 @@
5454
<Reference Include="Microsoft.Azure.Common.NetFramework">
5555
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.9.4-preview\lib\net40\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
57+
<Reference Include="Microsoft.Azure.Gallery">
58+
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
59+
<Private>True</Private>
6060
</Reference>
61-
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsCatalog, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.0.9.3-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.dll</HintPath>
61+
<Reference Include="Microsoft.Azure.Management.Authorization">
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
63+
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsJob, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.6-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
68+
<Private>True</Private>
6869
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7071
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.9.1-preview\lib\net40\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
73+
<Private>True</Private>
7274
</Reference>
7375
<Reference Include="Microsoft.Azure.Management.Storage">
7476
<SpecificVersion>False</SpecificVersion>
@@ -82,9 +84,10 @@
8284
<SpecificVersion>False</SpecificVersion>
8385
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
8486
</Reference>
85-
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
87+
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8688
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
89+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.0-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
90+
<Private>True</Private>
8891
</Reference>
8992
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9093
<SpecificVersion>False</SpecificVersion>
@@ -98,10 +101,20 @@
98101
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.0.1\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
99102
<Private>True</Private>
100103
</Reference>
104+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105+
<SpecificVersion>False</SpecificVersion>
106+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.0.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
107+
<Private>True</Private>
108+
</Reference>
101109
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102110
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
103111
<Private>True</Private>
104112
</Reference>
113+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<SpecificVersion>False</SpecificVersion>
115+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.2.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
116+
<Private>True</Private>
117+
</Reference>
105118
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106119
<SpecificVersion>False</SpecificVersion>
107120
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -142,6 +155,7 @@
142155
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
143156
</Reference>
144157
<Reference Include="System.Net.Http.WebRequest" />
158+
<Reference Include="System.Runtime.Serialization" />
145159
<Reference Include="System.Xml.Linq" />
146160
<Reference Include="System.Data.DataSetExtensions" />
147161
<Reference Include="Microsoft.CSharp" />
@@ -188,6 +202,9 @@
188202
<None Include="packages.config">
189203
<SubType>Designer</SubType>
190204
</None>
205+
<None Include="ScenarioTests\Common.ps1">
206+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
207+
</None>
191208
<None Include="ScenarioTests\AdlaTests.ps1">
192209
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
193210
</None>

0 commit comments

Comments
 (0)