Skip to content

Commit 6b01b12

Browse files
committed
Updates nuget packagesm
1 parent 9cd3b17 commit 6b01b12

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CSDiscordService.Tests/CSDiscordService.Tests.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1313
</ItemGroup>
1414
<ItemGroup>
15+
<<<<<<< Updated upstream
1516
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.1.20124.5" />
1617
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200310-03" />
18+
=======
19+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.7.20365.19" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200812-03" />
21+
>>>>>>> Stashed changes
1722
<PackageReference Include="xunit" Version="2.4.1" />
1823
<PackageReference Include="xunit.runner.reporters" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2025
<PrivateAssets>all</PrivateAssets>
2126
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2227
</PackageReference>

CSDiscordService.Tests/EvalTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using Microsoft.Extensions.Hosting;
1313
using System.Text.Json;
1414
using CSDiscordService.Infrastructure.JsonFormatters;
15-
using System.Reflection;
1615
using System.Collections.Generic;
1716
using System.IO;
1817

CSDiscordService/CSDiscordService.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="ICSharpCode.Decompiler" Version="3.2.0.3856" />
13+
<<<<<<< Updated upstream
1314
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.6.0-2.20166.4" />
1415
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.1.20120.4" />
1516
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
1617
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.1.20120.5" />
18+
=======
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.7.20364.11" />
21+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
22+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.7.20364.11" />
23+
>>>>>>> Stashed changes
1724
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
1825
<PackageReference Include="System.Memory" Version="4.5.3" />
1926
</ItemGroup>

0 commit comments

Comments
 (0)