Skip to content

Commit

Permalink
Merge branch 'microsoftgraph:master' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
InDieTasten authored Jan 9, 2025
2 parents edaeb38 + 02875f9 commit 2f2b4cf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down
16 changes: 8 additions & 8 deletions Samples/Common/Sample.Common.V1/Sample.Common.V1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@

<ItemGroup>
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
<PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0.10115" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0.10115" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.10115" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Common" Version="1.2.0.10115" TargetFramework="net472" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.1" />
<PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0.10563" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0.10563" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.10563" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Common" Version="1.2.0.10563" TargetFramework="net472" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="7.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.10115" TargetFramework="net472" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.10563" 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.3" />
<PackageReference Include="System.Text.Encodings.Web">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<Reference Include="System.Data.Entity" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="System.Text.Encodings.Web">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.1" />
<PackageReference Include="WindowsAzure.Storage">
<Version>9.3.3</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
<bindingRedirect oldVersion="0.0.0.0-6.32.1" newVersion="6.32.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.3.0" newVersion="7.0.3.0" />
<assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<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" />
Expand All @@ -96,7 +96,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down

0 comments on commit 2f2b4cf

Please sign in to comment.