From 30747d55fb918cbefefad187b2692ec80bb99f42 Mon Sep 17 00:00:00 2001
From: gkostal <gkostal@microsoft.com>
Date: Wed, 4 Mar 2020 11:23:06 -0800
Subject: [PATCH 1/2] Added three required assemblies for the AzAttestation
 PowerShell cmdlets.  (Microsoft.IdentityModel.*)

---
 src/Attestation/Attestation.Test/App.config           | 11 +++++++++++
 .../Attestation.Test/Attestation.Test.csproj          |  8 +++-----
 src/Attestation/Attestation/Az.Attestation.psd1       | 11 +++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 src/Attestation/Attestation.Test/App.config

diff --git a/src/Attestation/Attestation.Test/App.config b/src/Attestation/Attestation.Test/App.config
new file mode 100644
index 000000000000..697f91fa361c
--- /dev/null
+++ b/src/Attestation/Attestation.Test/App.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+          <dependentAssembly>
+              <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+              <bindingRedirect oldVersion="5.1.2.0-5.6.0.0" newVersion="5.6.0.0" />
+          </dependentAssembly>
+      </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Attestation/Attestation.Test/Attestation.Test.csproj b/src/Attestation/Attestation.Test/Attestation.Test.csproj
index 597542a4e94e..c85644685ea4 100644
--- a/src/Attestation/Attestation.Test/Attestation.Test.csproj
+++ b/src/Attestation/Attestation.Test/Attestation.Test.csproj
@@ -13,13 +13,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Attestation" Version="0.10.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Attestation" Version="0.11.0-preview" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0">
+      <NoWarn>NU1608</NoWarn>
+    </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.Attestation">
-    </Reference>
-  </ItemGroup>
-   
   <ItemGroup>
     <None Update="PemFiles\*.*" CopyToOutputDirectory="PreserveNewest" />
     <None Update="SamplePolicyFiles\*.*" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/Attestation/Attestation/Az.Attestation.psd1 b/src/Attestation/Attestation/Az.Attestation.psd1
index a59057b01110..8e0ad8bf62df 100644
--- a/src/Attestation/Attestation/Az.Attestation.psd1
+++ b/src/Attestation/Attestation/Az.Attestation.psd1
@@ -56,8 +56,11 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.Management.Attestation.dll', 
-               'Microsoft.Azure.Attestation.dll'
+RequiredAssemblies = 'Microsoft.Azure.Management.Attestation.dll',
+               'Microsoft.Azure.Attestation.dll',
+               'Microsoft.IdentityModel.JsonWebTokens.dll',
+               'Microsoft.IdentityModel.Tokens.dll',
+               'Microsoft.IdentityModel.Logging.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -75,8 +78,8 @@ NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.Attestation.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'New-AzAttestation', 'Get-AzAttestation', 'Remove-AzAttestation', 
-               'Get-AzAttestationPolicy', 'Set-AzAttestationPolicy', 
+CmdletsToExport = 'New-AzAttestation', 'Get-AzAttestation', 'Remove-AzAttestation',
+               'Get-AzAttestationPolicy', 'Set-AzAttestationPolicy',
 			   'Reset-AzAttestationPolicy',
 			   'Get-AzAttestationPolicySigners', 'Add-AzAttestationPolicySigner',
 			   'Remove-AzAttestationPolicySigner'

From ff5cc3bf27db3320b5db84d5952d57f4e0533fc6 Mon Sep 17 00:00:00 2001
From: gkostal <gkostal@microsoft.com>
Date: Wed, 4 Mar 2020 11:37:35 -0800
Subject: [PATCH 2/2] Updated ChangeLog.md

---
 src/Attestation/Attestation/ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Attestation/Attestation/ChangeLog.md b/src/Attestation/Attestation/ChangeLog.md
index ffe5a17381c7..4af02a998a5e 100644
--- a/src/Attestation/Attestation/ChangeLog.md
+++ b/src/Attestation/Attestation/ChangeLog.md
@@ -22,6 +22,7 @@
 ## Upcoming Release
 * Added policy signer management cmdlets to `Az.Attestation` module
 * Added `Location` and `Tag` to `New-AzAttestation`
+* Added three additional required assemblies to Az.Attestation.psd1
 
 ## Version 0.1.4
 * Added policy management cmdlets to `Az.Attestation` module