Kasikors/fix (microsoftgraph#87)

* Fix to binding redirect and IdentityModel version. * Couple more fixes.
satyakonmsft · Jun 25, 2019 · 9db883a · 9db883a
1 parent 7da64b2
commit 9db883a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 49 deletions.
diff --git a/Samples/BetaSamples/RemoteMediaSamples/IncidentBot/README Release Notes.md b/Samples/BetaSamples/RemoteMediaSamples/IncidentBot/README Release Notes.md
diff --git a/Samples/Common/Sample.Common/Sample.Common.csproj b/Samples/Common/Sample.Common/Sample.Common.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.1.0-prerelease.581" />
     <PackageReference Include="Microsoft.Graph.Communications.Core.Calls" Version="1.1.0-prerelease.581" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.1.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot.sln b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot.sln
@@ -1,19 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36341412-BFDE-495F-8216-7736CE191F39}"
 	ProjectSection(SolutionItems) = preProject
 		configure_cloud.ps1 = configure_cloud.ps1
 		E-SDK Samples.postman_collection.json = E-SDK Samples.postman_collection.json
-		Getting Started with the Local Media Samples.md = Getting Started with the Local Media Samples.md
-		..\Graph.props = ..\Graph.props
-		..\nuget.config = ..\nuget.config
-		AudioVideoPlaybackBot\README Release Notes.md = AudioVideoPlaybackBot\README Release Notes.md
-		AudioVideoPlaybackBot\README.md = AudioVideoPlaybackBot\README.md
-		..\stylecop.json = ..\stylecop.json
-		..\StyleCop.ruleset = ..\StyleCop.ruleset
+		..\..\Graph.props = ..\..\Graph.props
+		..\..\nuget.config = ..\..\nuget.config
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "AudioVideoPlaybackBot", "AudioVideoPlaybackBot\AudioVideoPlaybackBot.ccproj", "{386504C0-3BC0-41DB-8096-7110A5F1D434}"

diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/FrontEnd/FrontEnd.csproj b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/FrontEnd/FrontEnd.csproj
@@ -73,7 +73,7 @@
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.1.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" />
     <PackageReference Include="System.Linq" Version="4.3.0" />
     <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />

diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/WorkerRole/app.config b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/WorkerRole/app.config
@@ -60,7 +60,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Skype.Bots.Media" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot.sln b/Samples/V1.0Samples/LocalMediaSamples/HueBot.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "HueBotSF", "HueBot\HueBotSF\HueBotSF.sfproj", "{24E33708-FB5C-45F8-81CA-B0C857435FFB}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -12,6 +12,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HueBot", "HueBot\HueBot\Hue
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "..\..\Common\Sample.Common\Sample.Common.csproj", "{3268E59C-90DC-4D7B-97EA-A1DBB2716DF3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{977FD4D0-6930-4F7E-A065-5C26CDE78403}"
+	ProjectSection(SolutionItems) = preProject
+		configure_cloud.ps1 = configure_cloud.ps1
+		E-SDK Samples.postman_collection.json = E-SDK Samples.postman_collection.json
+		..\..\Graph.props = ..\..\Graph.props
+		..\..\nuget.config = ..\..\nuget.config
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU