Skip to content

Commit 6779ad0

Browse files
committed
Revert PR#13259 and update changelog of Az.Accounts
1 parent 3c2a9c2 commit 6779ad0

File tree

131 files changed

+1737
-18538
lines changed

Some content is hidden

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

131 files changed

+1737
-18538
lines changed

LICENSE.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,5 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
223223
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
224224
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
225225

226-
***************
227-
228-
The software includes BouncyCastle.NetCore. The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
229-
230-
BouncyCastle.NetCore
231-
232-
LICENSE
233-
Copyright (c) 2000 - 2020 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
234-
235-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
236-
237-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
238-
239-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
240226
-------------END OF THIRD PARTY NOTICE----------------------------------------
241227

src/Accounts/Accounts/ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-->
2020
## Upcoming Release
2121
* [Breaking Change] Removed `Get-AzProfile` and `Select-AzProfile`
22-
* Updated Azure.Core to 1.5.1
22+
* Replaced Azure Directory Authentication Library with Microsoft Authentication Library(MSAL)
2323

2424
## Version 1.9.5
2525
* Fixed DateTime parse issue in common libraries [#13045]

src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="39.0.0" />
16-
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
16+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
1717
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
1818
</ItemGroup>
1919

src/EventHub/EventHub.Test/EventHub.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1515
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.2" />
16-
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
16+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

src/HDInsight/HDInsight.Test/HDInsight.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1515
<PackageReference Include="Microsoft.Azure.Management.HDInsight" Version="5.6.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
17-
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
1919
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
2020
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />

src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
16-
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0">
18-
<NoWarn>NU1608</NoWarn>
19-
</PackageReference>
16+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
2017
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
2118
</ItemGroup>
2219

@@ -26,10 +23,7 @@
2623

2724
<ItemGroup>
2825
<None Update="Scripts\ControlPlane\KeyVaultManagementTests.ps1" CopyToOutputDirectory="PreserveNewest" />
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<Folder Include="ScenarioTests\PesterTests\" />
26+
<None Update="Resources\pshtest.pfx" CopyToOutputDirectory="PreserveNewest" />
3327
</ItemGroup>
3428

3529
</Project>

src/KeyVault/KeyVault.Test/Models/UtilitiesTests.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,22 @@ public void GetWebKeyFromByok()
5858
Assert.True(webKey.T.SequenceEqual(byokBlob));
5959
Assert.Equal(webKey.Kty, JsonWebKeyType.RsaHsm);
6060
}
61+
62+
[Fact]
63+
[Trait(Category.AcceptanceType, Category.CheckIn)]
64+
public void GetWebKeyFromCertificate()
65+
{
66+
string password = "123";
67+
// This allows the test to run in Visual Studio and in the console runner. The file will exist in one of the two locations depending on the environment.
68+
var consolePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? String.Empty, "Resources", "pshtest.pfx");
69+
var vsPath = Path.Combine(Directory.GetCurrentDirectory(), "Resources", "pshtest.pfx");
70+
71+
IWebKeyConverter converters = WebKeyConverterFactory.CreateConverterChain();
72+
var webKey = converters.ConvertKeyFromFile(new FileInfo(File.Exists(consolePath) ? consolePath : vsPath), password.ConvertToSecureString());
73+
74+
Assert.True(webKey.HasPrivateKey());
75+
Assert.True(webKey.IsValid());
76+
Assert.Equal(webKey.Kty, JsonWebKeyType.Rsa);
77+
}
6178
}
6279
}

src/KeyVault/KeyVault.Test/PesterTests/ManagedHsmDatePlaneTests.Tests.ps1

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

src/KeyVault/KeyVault.Test/PesterTests/ManagedHsmDatePlaneTests.ps1

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

src/KeyVault/KeyVault.Test/ScenarioTests/ManagedHsmManagementTests.cs

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

0 commit comments

Comments
 (0)