File tree 3 files changed +13
-2
lines changed
3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change 12
12
<FrameworkReference Include =" Microsoft.AspNetCore.App" />
13
13
</ItemGroup >
14
14
<ItemGroup >
15
+ <<<<<<< Updated upstream
15
16
<PackageReference Include =" Microsoft.AspNetCore.TestHost" Version =" 5.0.0-preview.1.20124.5" />
16
17
<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
17
22
<PackageReference Include =" xunit" Version =" 2.4.1" />
18
23
<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 " >
20
25
<PrivateAssets >all</PrivateAssets >
21
26
<IncludeAssets >runtime; build; native; contentfiles; analyzers</IncludeAssets >
22
27
</PackageReference >
Original file line number Diff line number Diff line change 12
12
using Microsoft . Extensions . Hosting ;
13
13
using System . Text . Json ;
14
14
using CSDiscordService . Infrastructure . JsonFormatters ;
15
- using System . Reflection ;
16
15
using System . Collections . Generic ;
17
16
using System . IO ;
18
17
Original file line number Diff line number Diff line change 10
10
11
11
<ItemGroup >
12
12
<PackageReference Include =" ICSharpCode.Decompiler" Version =" 3.2.0.3856" />
13
+ <<<<<<< Updated upstream
13
14
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Scripting" Version =" 3.6.0-2.20166.4" />
14
15
<PackageReference Include =" Microsoft.Extensions.Logging.Debug" Version =" 5.0.0-preview.1.20120.4" />
15
16
<PackageReference Include =" Newtonsoft.Json" Version =" 12.0.3" />
16
17
<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
17
24
<PackageReference Include =" System.ValueTuple" Version =" 4.5.0" />
18
25
<PackageReference Include =" System.Memory" Version =" 4.5.3" />
19
26
</ItemGroup >
You can’t perform that action at this time.
0 commit comments