Skip to content

Commit

Permalink
Merge pull request #153 from twilio-labs/revert-151-niels/use-latest-…
Browse files Browse the repository at this point in the history
…twilio-lib

Change order to resolve merge conflict
  • Loading branch information
AJLange authored Dec 6, 2024
2 parents eea8a89 + e624ac2 commit eee6fd1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Twilio.AspNet.Core/Twilio.AspNet.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Twilio" Version="7.8.0" />
<PackageReference Include="Twilio" Version="7.7.0" />
<PackageReference Include="Twilio.AspNet.Common" Version="0.0.0-alpha" />

<FrameworkReference Include="Microsoft.AspNetCore.App" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Twilio" Version="7.8.0" />
<PackageReference Include="Twilio" Version="7.7.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.17.0">
Expand Down
2 changes: 1 addition & 1 deletion src/Twilio.AspNet.Mvc/Twilio.AspNet.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Twilio" Version="7.8.0" />
<PackageReference Include="Twilio" Version="7.7.0" />
<PackageReference Include="Twilio.AspNet.Common" Version="0.0.0-alpha" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down

0 comments on commit eee6fd1

Please sign in to comment.