Skip to content

Commit 1c98bd0

Browse files
dingmeng-xuedingmeng-xue
authored
Update common libs to 1.3.62 (#19609)
* Update common libs to 1.3.62 * fix test cases * update lib * update changelog * update AI sdk version * changelog * update local feed * use published libs * update code
1 parent fb24126 commit 1c98bd0

File tree

13 files changed

+30
-51
lines changed

13 files changed

+30
-51
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Connect-AzAccount
5252
Connect-AzAccount -ServicePrincipal -ApplicationId 'http://my-app' -Credential $PSCredential -TenantId $TenantId
5353
```
5454

55-
To log into a specific cloud (_AzureChinaCloud_, _AzureCloud_, _AzureGermanCloud_, _AzureUSGovernment_), use the `-Environment` parameter:
55+
To log into a specific cloud (_AzureChinaCloud_, _AzureCloud_, _AzureUSGovernment_), use the `-Environment` parameter:
5656

5757
```powershell
5858
# Specific cloud login - Logs into the Azure China cloud

‎documentation/internal/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ An account is the representation of the principal used for authentication. This
2727
A subscription represents a subscription in Azure, it has properties indicating ID, Name, and State. The default subscription (that is the description in the `Default` context) will be the target of all cmdlets.
2828

2929
### Environment
30-
An Environment is a particular Azure cloud that is targeted for commands. 'AzureCloud' is the default environment if none is selected. Built-in clouds also include 'AzureChinaCloud', 'AzureGermanCloud', and 'AzureUSGovernment' cloud. Each environment contains the endpoints for services on that cloud, the 'resourceId' that is required when authenticating for that service, and a set of domain suffixes that can be used to determine data plane service endpoints (for example, the StorageEndpointSuffix can be appended to a storage account name to get the default domain name of the endpoints for that storage account).
30+
An Environment is a particular Azure cloud that is targeted for commands. 'AzureCloud' is the default environment if none is selected. Built-in clouds also include 'AzureChinaCloud' and 'AzureUSGovernment' cloud. Each environment contains the endpoints for services on that cloud, the 'resourceId' that is required when authenticating for that service, and a set of domain suffixes that can be used to determine data plane service endpoints (for example, the StorageEndpointSuffix can be appended to a storage account name to get the default domain name of the endpoints for that storage account).
3131

3232
### Tenant
3333
A Tenant represents an Active Directory tenant that may contain one or more subscriptions. When authenticating, a user may have access to multiple tenants, and the default ContextContainer will contain all of the tenants (and associated subscriptions) the user has access to.

‎documentation/testing-docs/test-matrix-for-az-accounts.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ It should be fine to run these test cases in just one platform, e.g. Windows Pow
7878
|Azure Global Instance|P0||
7979
|Azure US Instance|P2|Will be covered by dedicated team|
8080
|Azure China Instance|P2|Will be covered by dedicated team|
81-
|Azure German Instance|P2|Will be covered by dedicated team|
8281
|ADFS Environment|P1|Ask Azure Stack team to help|
8382

8483
### PowerShell Platforms

‎src/Accounts/Accounts.Test/AzureRMProfileTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ public void LoadingProfileWorks()
11631163
AzureSession.Instance.DataStore = dataStore;
11641164
dataStore.WriteFile(path, contents);
11651165
var profile = new AzureRmProfile(path);
1166-
Assert.Equal(5, profile.Environments.Count());
1166+
Assert.Equal(4, profile.Environments.Count());
11671167
Assert.Equal("3c0ff8a7-e8bb-40e8-ae66-271343379af6", profile.DefaultContext.Tenant.Id.ToString());
11681168
Assert.Equal("00000000-0000-0000-0000-000000000000", profile.DefaultContext.Subscription.Id.ToString());
11691169
Assert.Equal("testCloud", profile.DefaultContext.Environment.Name);

‎src/Accounts/Accounts.Test/ContextCmdletTests.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ public void ImportContextNoDefaultKey()
783783
Assert.Equal(Guid.Empty.ToString(), subscription.Id);
784784
Assert.NotNull(context.Environment);
785785
Assert.Equal("testCloud", context.Environment.Name);
786-
Assert.Equal(5, profile.EnvironmentTable.Count);
786+
Assert.Equal(4, profile.EnvironmentTable.Count);
787787
}
788788
finally
789789
{
@@ -843,12 +843,6 @@ AzureRmProfile CreateMultipleContextProfile()
843843
.WithTenant(new AzureTenant { Id = Guid.NewGuid().ToString(), Directory = "contoso.cn" })
844844
.WithSubscription(new AzureSubscription { Id = Guid.NewGuid().ToString(), Name = "Contoso Subscription 2" });
845845
profile.TryAddContext(context2, out contextName2);
846-
string contextName3;
847-
var context3 = (new AzureContext { Environment = AzureEnvironment.PublicEnvironments[EnvironmentName.AzureGermanCloud] })
848-
.WithAccount(new AzureAccount { Id = "[email protected]" })
849-
.WithTenant(new AzureTenant { Id = Guid.NewGuid().ToString(), Directory = "contoso.de" })
850-
.WithSubscription(new AzureSubscription { Id = Guid.NewGuid().ToString(), Name = "Contoso Subscription 3" });
851-
profile.TryAddContext(context3, out contextName3);
852846
profile.TrySetDefaultContext(context1);
853847
return profile;
854848
}

‎src/Accounts/Accounts.Test/EnvironmentCmdletTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ public void GetsAzureEnvironments()
521521
cmdlet.ExecuteCmdlet();
522522
cmdlet.InvokeEndProcessing();
523523

524-
Assert.Equal(4, environments.Count);
524+
Assert.Equal(3, environments.Count);
525525
}
526526

527527
[Fact]

‎src/Accounts/Accounts.Test/ModuleAdapterTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public void TestPatchDnsSuffixNegative()
7474

7575
[Theory]
7676
[InlineData(EnvironmentName.AzureChinaCloud)]
77-
[InlineData(EnvironmentName.AzureGermanCloud)]
7877
[InlineData(EnvironmentName.AzureUSGovernment)]
7978
[InlineData(EnvironmentName.AzureCloud)]
8079
[Trait(Category.AcceptanceType, Category.CheckIn)]
@@ -165,7 +164,6 @@ public void TestCustomEnvironmentEndpointUpdate()
165164

166165
[Theory]
167166
[InlineData(EnvironmentName.AzureChinaCloud)]
168-
[InlineData(EnvironmentName.AzureGermanCloud)]
169167
[InlineData(EnvironmentName.AzureUSGovernment)]
170168
[InlineData(EnvironmentName.AzureCloud)]
171169
[Trait(Category.AcceptanceType, Category.CheckIn)]
@@ -256,7 +254,6 @@ public void TestCustomEnvironmentAudienceUpdate()
256254

257255
[Theory]
258256
[InlineData(EnvironmentName.AzureChinaCloud)]
259-
[InlineData(EnvironmentName.AzureGermanCloud)]
260257
[InlineData(EnvironmentName.AzureUSGovernment)]
261258
[InlineData(EnvironmentName.AzureCloud)]
262259
[Trait(Category.AcceptanceType, Category.CheckIn)]

‎src/Accounts/Accounts/ChangeLog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020

2121
## Upcoming Release
2222
* Supported tenant domain as input while using `Connect-AzAccount` with parameter `Tenant`. [#19471]
23-
* Upgraded Azure.Identity to 1.6.1
23+
* Upgraded Azure.Core to 1.25.0 and Azure.Identity to 1.6.1
24+
* Upgraded Microsoft.ApplicationInsights to 2.13.1
2425
* Changed target framework of AuthenticationAssemblyLoadContext to netcoreapp3.1.
26+
* Removed built-in environment of Azure Germany
2527

2628
## Version 2.10.1
2729
* Deduplicated subscriptions belonging to multiple tenants while using `Get-AzSubscription` with parameter `SubscriptionName`. [#19427]

‎src/Accounts/Accounts/help/Get-AzEnvironment.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Get-AzEnvironment
3030
Name Resource Manager Url ActiveDirectory Authority Type
3131
---- -------------------- ------------------------- ----
3232
AzureUSGovernment https://management.usgovcloudapi.net/ https://login.microsoftonline.us/ Built-in
33-
AzureGermanCloud https://management.microsoftazure.de/ https://login.microsoftonline.de/ Built-in
3433
AzureCloud https://management.azure.com/ https://login.microsoftonline.com/ Built-in
3534
AzureChinaCloud https://management.chinacloudapi.cn/ https://login.chinacloudapi.cn/ Built-in
3635
```

‎src/Accounts/Authentication.Test/ClientFactoryHandlerTests.cs

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

15-
using Microsoft.Azure.Commands.Common.Authentication;
16-
using Microsoft.Azure.Commands.Common.Authentication.Models;
17-
using System;
18-
using System.Collections.Generic;
19-
using System.Net.Http;
20-
using System.Security;
2115
using Microsoft.Azure.Commands.Common.Authentication.Factories;
22-
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
23-
using Microsoft.WindowsAzure.Commands.ScenarioTest;
24-
using Xunit;
25-
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
16+
using System;
2617
using System.Linq;
27-
using Microsoft.Azure.Management.Internal.Resources;
18+
using System.Net.Http;
2819
using System.Threading;
2920
using System.Threading.Tasks;
3021
#if NETSTANDARD
31-
using Microsoft.Azure.Management.Storage.Version2017_10_01;
3222
#else
3323
using Microsoft.WindowsAzure.Management.Storage;
3424
#endif

‎src/Accounts/Authentication.Test/PSSerializationTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public void CanConvertProfieWithCustomEnvironment()
8484
Assert.Collection(profile.Environments.OrderBy(e=>e.Name),
8585
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureChinaCloud]),
8686
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud]),
87-
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureGermanCloud]),
8887
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureUSGovernment]),
8988
(e) => Assert.Equal(e, testEnvironment));
9089
});
@@ -178,7 +177,6 @@ void AssertStandardEnvironments(AzureRmProfile profile)
178177
Assert.Collection(profile.Environments.OrderBy(e => e.Name),
179178
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureChinaCloud]),
180179
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud]),
181-
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureGermanCloud]),
182180
(e) => Assert.Equal(e, AzureEnvironment.PublicEnvironments[EnvironmentName.AzureUSGovernment]));
183181
}
184182

@@ -225,7 +223,7 @@ IAzureTenant GetDefaultTenant()
225223

226224
IAzureEnvironment GetDefaultEnvironment()
227225
{
228-
var env = new AzureEnvironment(AzureEnvironment.PublicEnvironments[EnvironmentName.AzureGermanCloud]);
226+
var env = new AzureEnvironment(AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud]);
229227
env.Name = "CustomEnvironment1";
230228
env.SetProperty("FirstProperty", "FirstValue1", "FirstValue2");
231229
env.SetProperty("SecondProperty", "SecondValue");

‎tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For more information on Az Predictor, please visit the following: https://aka.ms
2222

2323
<ItemGroup>
2424
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
25-
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.61-preview" />
25+
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.62-preview" />
2626
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0">
2727
<ExcludeAssets>contentFiles</ExcludeAssets>
2828
</PackageReference>

‎tools/Common.Netcore.Dependencies.targets

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24"/>
55
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19"/>
6-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.61-preview"/>
7-
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.61-preview"/>
8-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.61-preview"/>
9-
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.61-preview"/>
10-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.61-preview"/>
11-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.61-preview"/>
12-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.61-preview"/>
13-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.61-preview"/>
14-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.61-preview"/>
15-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.61-preview"/>
16-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.61-preview"/>
17-
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.61-preview"/>
18-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.61-preview"/>
19-
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.61-preview"/>
20-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.61-preview"/>
21-
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.61-preview"/>
6+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.62-preview"/>
7+
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.62-preview"/>
8+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.62-preview"/>
9+
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.62-preview"/>
10+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.62-preview"/>
11+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.62-preview"/>
12+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.62-preview"/>
13+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.62-preview"/>
14+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.62-preview"/>
15+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.62-preview"/>
16+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.62-preview"/>
17+
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.62-preview"/>
18+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.62-preview"/>
19+
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.62-preview"/>
20+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.62-preview"/>
21+
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.62-preview"/>
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageReference Include="Azure.Core" Version="1.25.0"/>
2525
</ItemGroup>
2626
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
27-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.12.0">
27+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1">
2828
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
2929
</PackageReference>
3030
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.1">
@@ -36,7 +36,7 @@
3636
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
3737
</ItemGroup>
3838
<PropertyGroup>
39-
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.61-preview\tools\</StorageToolsPath>
39+
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.62-preview\tools\</StorageToolsPath>
4040
</PropertyGroup>
4141
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
4242
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>

0 commit comments

Comments
 (0)