Merge branch 'release/dev17.6' into darc-release/dev17.6-f1969d28-bf05-4aad-988c-dc5bd3651ad8

Author: JoeRobich

eng/InternalTools.props

@@ -12,10 +12,11 @@
         </RestoreSources>
     </PropertyGroup>
 
-    <ItemGroup>
-        <!-- Add explicit Newtonsoft.Json dependency to override the implicit 10.0.1 version brought in by Microsoft.DevDiv.Optimization.Data.PowerShell -->
-        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'" />
-        <PackageReference Include="Microsoft.DevDiv.Optimization.Data.PowerShell" Version="$(MicrosoftDevDivOptimizationDataPowerShellVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
+    <ItemGroup Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
+        <!-- Add explicit top-level dependencies to override the implicit versions brought in by Microsoft.DevDiv.Optimization.Data.PowerShell -->
+        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)"/>
+        <PackageReference Include="Microsoft.DevDiv.Optimization.Data.PowerShell" Version="$(MicrosoftDevDivOptimizationDataPowerShellVersion)" ExcludeAssets="all"/>
     </ItemGroup>
 
 </Project>

eng/Versions.props

@@ -301,6 +301,7 @@
       create a test insertion in Visual Studio to validate.
     -->
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
+    <MicrosoftIdentityModelJsonWebTokensVersion>6.34.0</MicrosoftIdentityModelJsonWebTokensVersion>
     <StreamJsonRpcVersion>2.15.26</StreamJsonRpcVersion>
     <!--
       When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they