Update the Beta Sample SDK version to 1.2.0.9882 (#701)

* Update the beta version on beta sample * Dependency changes * Dependency changes for upgrade * Bump version to 9882 --------- Co-authored-by: Samarth Asthana <sasthana@microsoft.com>
microsoftgraph · Feb 13, 2024 · 8b1107e · 8b1107e
1 parent 87aa1b2
commit 8b1107e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/FrontEnd/CRFrontEnd.csproj b/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/FrontEnd/CRFrontEnd.csproj
@@ -58,7 +58,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.7" />
-    <PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0-beta.9113" TargetFramework="net472"/>
+    <PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0-beta.9882" TargetFramework="net472"/>
     <PackageReference Include="Microsoft.Owin.Hosting" Version="4.2.2" />
     <PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.26.0.94-alpha" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2.0" />

diff --git a/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/WorkerRole/WorkerRole.cs b/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/WorkerRole/WorkerRole.cs
@@ -15,6 +15,7 @@ namespace Sample.PolicyRecordingBot.WorkerRole
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Graph.Communications.Common.Telemetry;
+    using Microsoft.Graph.Communications.Common.Telemetry.Obfuscation;
     using Microsoft.WindowsAzure.ServiceRuntime;
     using Sample.PolicyRecordingBot.FrontEnd;
 
@@ -43,7 +44,7 @@ public class WorkerRole : RoleEntryPoint
         /// </summary>
         public WorkerRole()
         {
-            this.logger = new GraphLogger(typeof(WorkerRole).Assembly.GetName().Name, redirectToTrace: true);
+            this.logger = new GraphLogger(typeof(WorkerRole).Assembly.GetName().Name, redirectToTrace: true, obfuscationConfiguration: new HashingObfuscationConfiguration());
         }
 
         /// <summary>

diff --git a/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/WorkerRole/app.config b/Samples/BetaSamples/LocalMediaSamples/PolicyRecordingBot/WorkerRole/app.config
@@ -68,7 +68,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.32.1" newVersion="6.32.1" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.3.0" newVersion="7.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -80,20 +80,28 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.32.1.0" newVersion="6.32.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.3.0" newVersion="7.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Kiota.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.3.0" newVersion="1.3.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Kiota.Http.HttpClientLibrary" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.3.0" newVersion="1.3.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 

diff --git a/Samples/Common/Sample.Common.Beta/Authentication/AuthenticationProvider.cs b/Samples/Common/Sample.Common.Beta/Authentication/AuthenticationProvider.cs
@@ -93,7 +93,7 @@ public async Task AuthenticateOutboundRequestAsync(HttpRequestMessage request, s
             const string schema = "Bearer";
             const string replaceString = "{tenant}";
             const string oauthV2TokenLink = "https://login.microsoftonline.com/{tenant}";
-            const string resource = "https://graph.microsoft.com/beta";
+            const string resource = @"https://graph.microsoft.com";
 
             // If no tenant was specified, we craft the token link using the common tenant.
             // https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints

diff --git a/Samples/Common/Sample.Common.Beta/Sample.Common.Beta.csproj b/Samples/Common/Sample.Common.Beta/Sample.Common.Beta.csproj
@@ -11,16 +11,16 @@
 
   <ItemGroup>
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0-beta.9113" TargetFramework="net472"/>
-    <PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0-beta.9113" TargetFramework="net472"/>
-    <PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0-beta.9113" TargetFramework="net472"/>
-    <PackageReference Include="Microsoft.Graph.Communications.Common" Version="1.2.0-beta.9113" TargetFramework="net472"/>
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.32.1" />
+    <PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0-beta.9882" TargetFramework="net472"/>
+    <PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0-beta.9882" TargetFramework="net472"/>
+    <PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0-beta.9882" TargetFramework="net472"/>
+    <PackageReference Include="Microsoft.Graph.Communications.Common" Version="1.2.0-beta.9882" TargetFramework="net472"/>
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2.0" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0.0" />   
     <PackageReference Include="System.Text.Json" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="6.32.1.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">