Skip to content

Commit 2f6f908

Browse files
author
Samuel Anudeep
committed
Merge pull request #321 from Azure/dev
Pull from upstream dev to origin release
2 parents bf09620 + 24eebc9 commit 2f6f908

File tree

197 files changed

+51467
-22317
lines changed

Some content is hidden

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

197 files changed

+51467
-22317
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,6 +2148,9 @@
21482148
<Component Id="cmp97DCE18753534AD69AF7E7D8D9E44502" Guid="*">
21492149
<File Id="fil90907D4E09BBD5280D1418AC997233C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
21502150
</Component>
2151+
<Component Id="cmpB32ADC3C63EDA08D6532967360D34D43" Guid="*">
2152+
<File Id="filE08640EF6FC290EA9D7AE25D975604D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.Azure.dll" />
2153+
</Component>
21512154
<Component Id="cmpDE6C92AC2ECEED1C03C8D6728B42EA70" Guid="*">
21522155
<File Id="filB8103ADF161FDE5CAC0F8629BB53738D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.dll" />
21532156
</Component>
@@ -2627,8 +2630,8 @@
26272630
<Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
26282631
<File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
26292632
</Component>
2630-
<Component Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" Guid="*">
2631-
<File Id="fil6C5492894C2F4DDD80E710891D53B6D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
2633+
<Component Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" Guid="*">
2634+
<File Id="fil6844E5CF8B2186F0D283DF52A5892125" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
26322635
</Component>
26332636
<Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
26342637
<File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
@@ -3015,6 +3018,9 @@
30153018
<Component Id="cmp8F839B12289A46E7A8870014F8111911" Guid="*">
30163019
<File Id="fil449FE2073F074013C18B88473DD9F75D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll" />
30173020
</Component>
3021+
<Component Id="cmpAC5BC334718546D9DDEBC02E08A4532E" Guid="*">
3022+
<File Id="fil0058CD8D090E7A70802FC54C74FADBEE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll-Help.xml" />
3023+
</Component>
30183024
<Component Id="cmp2488ACCABA4CB85A6B69DBB1D9FDD233" Guid="*">
30193025
<File Id="fil021881BAF48E9A0C07D3E790AA0F5590" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Common.dll" />
30203026
</Component>
@@ -4074,12 +4080,12 @@
40744080
<Component Id="cmpB379F478799A33A4B4343BA15AC89F48" Guid="*">
40754081
<File Id="fil0239F2F240D028259DDB85300C39829C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
40764082
</Component>
4077-
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
4078-
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
4079-
</Component>
40804083
<Component Id="cmpB69D649FD24EBC270A2013375C2AF99B" Guid="*">
40814084
<File Id="fil8C7BE3D686B22FA7B371793DE9DFCCDD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll" />
40824085
</Component>
4086+
<Component Id="cmpC1D7C834CACA385FC5B0D004675BC3BA" Guid="*">
4087+
<File Id="filF8B866285975B9616E0830999DFCE229" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll-help.xml" />
4088+
</Component>
40834089
<Component Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" Guid="*">
40844090
<File Id="filD24F4EB26C2FA956CA7A93BCAF4A2AD7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.dll" />
40854091
</Component>
@@ -5762,6 +5768,7 @@
57625768
<ComponentRef Id="cmpD5D6E28B9232D19A4D3FC543B56214DB" />
57635769
<ComponentRef Id="cmp6DCD11F46E1DCE998C423CD0BC09CD15" />
57645770
<ComponentRef Id="cmp97DCE18753534AD69AF7E7D8D9E44502" />
5771+
<ComponentRef Id="cmpB32ADC3C63EDA08D6532967360D34D43" />
57655772
<ComponentRef Id="cmpDE6C92AC2ECEED1C03C8D6728B42EA70" />
57665773
<ComponentRef Id="cmpC601580257AEA8DA8522AD7F32FE545C" />
57675774
<ComponentRef Id="cmp1BF396A297DE4BB9EFCE53AA38D5EF41" />
@@ -5919,7 +5926,7 @@
59195926
<ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
59205927
<ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
59215928
<ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
5922-
<ComponentRef Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" />
5929+
<ComponentRef Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" />
59235930
<ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
59245931
<ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
59255932
<ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />
@@ -6045,6 +6052,7 @@
60456052
<ComponentRef Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" />
60466053
<ComponentRef Id="cmpC3F5E35306467501723E692635390B24" />
60476054
<ComponentRef Id="cmp8F839B12289A46E7A8870014F8111911" />
6055+
<ComponentRef Id="cmpAC5BC334718546D9DDEBC02E08A4532E" />
60486056
<ComponentRef Id="cmp2488ACCABA4CB85A6B69DBB1D9FDD233" />
60496057
<ComponentRef Id="cmp67AFEBC05483435B1BCA6071E6B47F01" />
60506058
<ComponentRef Id="cmp2C2622C3604F560651F9A1522DE2A835" />
@@ -6382,8 +6390,8 @@
63826390
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
63836391
<ComponentRef Id="cmpC0EA9433103A723191792448380E84AB" />
63846392
<ComponentRef Id="cmpB379F478799A33A4B4343BA15AC89F48" />
6385-
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
63866393
<ComponentRef Id="cmpB69D649FD24EBC270A2013375C2AF99B" />
6394+
<ComponentRef Id="cmpC1D7C834CACA385FC5B0D004675BC3BA" />
63876395
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
63886396
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />
63896397
<ComponentRef Id="cmp6842A5697846B92CCF6ED50688A26C1A" />

‎src/Common/Commands.Common.Authentication.Test/AzureRMProfileTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void LoadingProfileWorks()
217217
AzureSession.DataStore = dataStore;
218218
dataStore.WriteFile(path, contents);
219219
var profile = new AzureRMProfile(path);
220-
Assert.Equal(4, profile.Environments.Count);
220+
Assert.Equal(5, profile.Environments.Count);
221221
Assert.Equal("3c0ff8a7-e8bb-40e8-ae66-271343379af6", profile.Context.Tenant.Id.ToString());
222222
Assert.Equal("contoso.com", profile.Context.Tenant.Domain);
223223
Assert.Equal("00000000-0000-0000-0000-000000000000", profile.Context.Subscription.Id.ToString());

‎src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,32 @@ private string StorageFileEndpointFormat()
154154
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
155155
}
156156
}
157+
},
158+
{
159+
EnvironmentName.AzureGermanCloud,
160+
new AzureEnvironment
161+
{
162+
Name = EnvironmentName.AzureGermanCloud,
163+
Endpoints = new Dictionary<AzureEnvironment.Endpoint, string>
164+
{
165+
{ AzureEnvironment.Endpoint.PublishSettingsFileUrl, AzureEnvironmentConstants.GermanPublishSettingsFileUrl },
166+
{ AzureEnvironment.Endpoint.ServiceManagement, AzureEnvironmentConstants.GermanServiceEndpoint },
167+
{ AzureEnvironment.Endpoint.ResourceManager, AzureEnvironmentConstants.GermanResourceManagerEndpoint },
168+
{ AzureEnvironment.Endpoint.ManagementPortalUrl, AzureEnvironmentConstants.GermanManagementPortalUrl },
169+
{ AzureEnvironment.Endpoint.ActiveDirectory, AzureEnvironmentConstants.GermanActiveDirectoryEndpoint },
170+
{ AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId, AzureEnvironmentConstants.GermanServiceEndpoint },
171+
{ AzureEnvironment.Endpoint.StorageEndpointSuffix, AzureEnvironmentConstants.GermanStorageEndpointSuffix },
172+
{ AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.GermanGalleryEndpoint },
173+
{ AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.GermanSqlDatabaseDnsSuffix },
174+
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.GermanGraphEndpoint },
175+
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.GermanTrafficManagerDnsSuffix },
176+
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.GermanKeyVaultDnsSuffix },
177+
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId },
178+
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.GermanGraphEndpoint }
179+
}
180+
}
157181
}
182+
158183
};
159184

160185
public Uri GetEndpointAsUri(AzureEnvironment.Endpoint endpoint)
@@ -337,88 +362,74 @@ public enum Endpoint
337362
public static class EnvironmentName
338363
{
339364
public const string AzureCloud = "AzureCloud";
340-
341365
public const string AzureChinaCloud = "AzureChinaCloud";
342-
343366
public const string AzureUSGovernment = "AzureUSGovernment";
367+
public const string AzureGermanCloud = "AzureGermanCloud";
344368
}
345369

346370
public static class AzureEnvironmentConstants
347371
{
348372
public const string AzureServiceEndpoint = "https://management.core.windows.net/";
349-
350373
public const string ChinaServiceEndpoint = "https://management.core.chinacloudapi.cn/";
351-
352374
public const string USGovernmentServiceEndpoint = "https://management.core.usgovcloudapi.net/";
375+
public const string GermanServiceEndpoint = "https://management.core.cloudapi.de/";
353376

354377
public const string AzureResourceManagerEndpoint = "https://management.azure.com/";
355-
356378
public const string ChinaResourceManagerEndpoint = "https://management.chinacloudapi.cn/";
357-
358379
public const string USGovernmentResourceManagerEndpoint = "https://management.usgovcloudapi.net/";
380+
public const string GermanResourceManagerEndpoint = "https://management.microsoftazure.de/";
359381

360382
public const string GalleryEndpoint = "https://gallery.azure.com/";
361-
362383
public const string ChinaGalleryEndpoint = "https://gallery.chinacloudapi.cn/";
363-
364384
public const string USGovernmentGalleryEndpoint = "https://gallery.usgovcloudapi.net/";
385+
public const string GermanGalleryEndpoint = "https://gallery.cloudapi.de/";
365386

366387
public const string AzurePublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301775";
367-
368388
public const string ChinaPublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301776";
369-
370389
public const string USGovernmentPublishSettingsFileUrl = "https://manage.windowsazure.us/publishsettings/index";
390+
public const string GermanPublishSettingsFileUrl = "https://manage.microsoftazure.de/publishsettings/index";
371391

372392
public const string AzureManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=254433";
373-
374393
public const string ChinaManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=301902";
375-
376394
public const string USGovernmentManagementPortalUrl = "https://manage.windowsazure.us";
395+
public const string GermanManagementPortalUrl = "http://portal.microsoftazure.de/";
377396

378397
public const string AzureStorageEndpointSuffix = "core.windows.net";
379-
380398
public const string ChinaStorageEndpointSuffix = "core.chinacloudapi.cn";
381-
382399
public const string USGovernmentStorageEndpointSuffix = "core.usgovcloudapi.net";
400+
public const string GermanStorageEndpointSuffix = "core.cloudapi.de";
383401

384402
public const string AzureSqlDatabaseDnsSuffix = ".database.windows.net";
385-
386403
public const string ChinaSqlDatabaseDnsSuffix = ".database.chinacloudapi.cn";
387-
388404
public const string USGovernmentSqlDatabaseDnsSuffix = ".database.usgovcloudapi.net";
405+
public const string GermanSqlDatabaseDnsSuffix = ".database.cloudapi.de";
389406

390407
public const string AzureActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
391-
392408
public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
393-
394409
public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
410+
public const string GermanActiveDirectoryEndpoint = "https://login.microsoftonline.de/";
395411

396412
public const string AzureGraphEndpoint = "https://graph.windows.net/";
397-
398413
public const string ChinaGraphEndpoint = "https://graph.chinacloudapi.cn/";
399-
400414
public const string USGovernmentGraphEndpoint = "https://graph.windows.net/";
415+
public const string GermanGraphEndpoint = "https://graph.cloudapi.de/";
401416

402417
public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net";
403-
404418
public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
405-
406419
public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
420+
public const string GermanTrafficManagerDnsSuffix = "azuretrafficmanager.de";
407421

408422
public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
409-
410423
public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";
411-
412424
public const string USGovernmentKeyVaultDnsSuffix = "vault.usgovcloudapi.net";
425+
public const string GermanKeyVaultDnsSuffix = "vault.microsoftazure.de";
413426

414427
public const string AzureKeyVaultServiceEndpointResourceId = "https://vault.azure.net";
415-
416428
public const string ChinaKeyVaultServiceEndpointResourceId = "https://vault.azure.cn";
417-
418429
public const string USGovernmentKeyVaultServiceEndpointResourceId = "https://vault.usgovcloudapi.net";
430+
public const string GermanAzureKeyVaultServiceEndpointResourceId = "https://vault.microsoftazure.de";
419431

420432
public const string AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "azuredatalakeanalytics.net";
421-
422433
public const string AzureDataLakeStoreFileSystemEndpointSuffix = "azuredatalakestore.net";
423434
}
424435
}

‎src/Common/Commands.Common.Authentication/stuff/Authentication/AadAuthenticationException.cs

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

0 commit comments

Comments
 (0)