diff --git a/samples/01_basic_ping_bot/01_basic_ping_bot.csproj b/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
index 5484e3d55..bc79e33c6 100644
--- a/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
+++ b/samples/01_basic_ping_bot/01_basic_ping_bot.csproj
@@ -2,7 +2,7 @@
Exe
- netcoreapp2.0
+ netcoreapp2.1
diff --git a/samples/02_commands_framework/02_commands_framework.csproj b/samples/02_commands_framework/02_commands_framework.csproj
index f479ee0b0..35e63704c 100644
--- a/samples/02_commands_framework/02_commands_framework.csproj
+++ b/samples/02_commands_framework/02_commands_framework.csproj
@@ -2,11 +2,11 @@
Exe
- netcoreapp2.0
+ netcoreapp2.1
-
+
diff --git a/samples/03_sharded_client/03_sharded_client.csproj b/samples/03_sharded_client/03_sharded_client.csproj
index 5d76961cd..786567e2e 100644
--- a/samples/03_sharded_client/03_sharded_client.csproj
+++ b/samples/03_sharded_client/03_sharded_client.csproj
@@ -6,6 +6,10 @@
_03_sharded_client
+
+
+
+
diff --git a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
index 5da3d506d..05b9e8117 100644
--- a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
+++ b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
@@ -4,10 +4,10 @@
Discord.Net.Analyzers
Discord.Analyzers
A Discord.Net extension adding support for design-time analysis of the API usage.
- netstandard1.3
+ netstandard2.0
-
+
diff --git a/src/Discord.Net.Analyzers/GuildAccessAnalyzer.cs b/src/Discord.Net.Analyzers/GuildAccessAnalyzer.cs
index 0760d019f..38d3f39d4 100644
--- a/src/Discord.Net.Analyzers/GuildAccessAnalyzer.cs
+++ b/src/Discord.Net.Analyzers/GuildAccessAnalyzer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Immutable;
using System.Linq;
using Microsoft.CodeAnalysis;
@@ -24,6 +24,8 @@ namespace Discord.Analyzers
public override void Initialize(AnalysisContext context)
{
+ context.EnableConcurrentExecution();
+ context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
context.RegisterSyntaxNodeAction(AnalyzeMemberAccess, SyntaxKind.SimpleMemberAccessExpression);
}
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
index 1bef1bfea..1a7a73fb3 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -4,16 +4,11 @@
Discord.Net.Commands
Discord.Commands
A Discord.Net extension adding support for bot commands.
- net46;netstandard1.3;netstandard2.0
- netstandard1.3;netstandard2.0
+ net461;netstandard2.0
+ netstandard2.0
-
-
-
-
-
-
+
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index 20e57d346..39f5d0a2d 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -4,11 +4,11 @@
Discord.Net.Core
Discord
The core components for the Discord.Net library.
- net46;netstandard1.3;netstandard2.0
- netstandard1.3;netstandard2.0
+ net461;netstandard2.0
+ netstandard2.0
-
+
diff --git a/src/Discord.Net.Examples/Discord.Net.Examples.csproj b/src/Discord.Net.Examples/Discord.Net.Examples.csproj
index b02d2e6d8..ec0253428 100644
--- a/src/Discord.Net.Examples/Discord.Net.Examples.csproj
+++ b/src/Discord.Net.Examples/Discord.Net.Examples.csproj
@@ -1,4 +1,4 @@
-
+
netstandard2.0
@@ -15,7 +15,7 @@
-
+
diff --git a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
index bfd0983ce..e143340e1 100644
--- a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
+++ b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
@@ -1,10 +1,10 @@
-
+
Discord.Net.Providers.WS4Net
Discord.Providers.WS4Net
An optional WebSocket client provider for Discord.Net using WebSocket4Net
- netstandard1.3
+ netstandard2.0
diff --git a/src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs b/src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs
index 166e767d0..dd5eeaf63 100644
--- a/src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs
+++ b/src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs
@@ -1,9 +1,11 @@
-using Discord.Net.WebSockets;
+using System;
+using Discord.Net.WebSockets;
namespace Discord.Net.Providers.WS4Net
{
public static class WS4NetProvider
{
+ [Obsolete("Please target .NET Core 2.1 or above")]
public static readonly WebSocketProvider Instance = () => new WS4NetClient();
}
}
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 75b69bd04..0bcd5059e 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -4,16 +4,13 @@
Discord.Net.Rest
Discord.Rest
A core Discord.Net library containing the REST client and models.
- net46;netstandard1.3;netstandard2.0
- netstandard1.3;netstandard2.0
+ net461;netstandard2.0
+ netstandard2.0
-
-
-
-
+
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index ddd3b7954..b40617c43 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -4,15 +4,12 @@
Discord.Net.WebSocket
Discord.WebSocket
A core Discord.Net library containing the WebSocket client and models.
- net46;netstandard1.3;netstandard2.0
- netstandard1.3;netstandard2.0
+ net461;netstandard2.0
+ netstandard2.0
true
-
-
-
diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
index 58282d85b..c512a4aa8 100644
--- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
+++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
@@ -4,7 +4,7 @@
Discord.Net.Webhook
Discord.Webhook
A core Discord.Net library containing the Webhook client and models.
- netstandard1.3
+ netstandard2.0
diff --git a/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj b/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj
index 1ee986e8a..818a9cfff 100644
--- a/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj
+++ b/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.1
@@ -15,10 +15,15 @@
-
-
-
-
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/test/Discord.Net.Analyzers.Tests/Extensions/AppDomainPolyfill.cs b/test/Discord.Net.Analyzers.Tests/Extensions/AppDomainPolyfill.cs
index 729bc385c..20e8b3845 100644
--- a/test/Discord.Net.Analyzers.Tests/Extensions/AppDomainPolyfill.cs
+++ b/test/Discord.Net.Analyzers.Tests/Extensions/AppDomainPolyfill.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
using System.Reflection;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.Extensions.DependencyModel;
@@ -24,7 +24,7 @@ namespace System
var rid = RuntimeEnvironment.GetRuntimeIdentifier();
var ass = DependencyContext.Default.GetRuntimeAssemblyNames(rid);
- return ass.Select(xan => Assembly.Load(xan)).ToArray();
+ return ass.Select(Assembly.Load).ToArray();
}
}
-}
\ No newline at end of file
+}
diff --git a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
index cd4aafac0..c571059ef 100644
--- a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
+++ b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp2.1
@@ -15,9 +15,12 @@
-
-
-
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
index 4a7898b14..1202777f6 100644
--- a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
+++ b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
@@ -13,9 +13,12 @@
-
-
-
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+