diff --git a/docs/docfx.json b/docs/docfx.json index 759dc174f..424b951bc 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -1,19 +1,22 @@ { - "metadata": [{ - "src": [{ - "src": "../src", - "files": [ - "**.csproj" - ] - }], - "dest": "api", - "filter": "filterConfig.yml", - "properties": { - "TargetFramework": "netstandard2.0" + "metadata": [ + { + "src": [ + { + "src": "../src", + "files": ["**.csproj"] + } + ], + "dest": "api", + "filter": "filterConfig.yml", + "properties": { + "TargetFramework": "net5.0" + } } - }], + ], "build": { - "content": [{ + "content": [ + { "files": ["api/**.yml", "api/index.md"] }, { @@ -27,19 +30,21 @@ }, { "src": "../", - "files": [ "CHANGELOG.md" ] + "files": ["CHANGELOG.md"] + } + ], + "resource": [ + { + "files": [ + "**/images/**", + "**/samples/**", + "langwordMapping.yml", + "marketing/logo/**.svg", + "marketing/logo/**.png", + "favicon.ico" + ] } ], - "resource": [{ - "files": [ - "**/images/**", - "**/samples/**", - "langwordMapping.yml", - "marketing/logo/**.svg", - "marketing/logo/**.png", - "favicon.ico" - ] - }], "dest": "_site", "template": [ "default", @@ -47,17 +52,19 @@ "_template/last-modified", "_template/description-generator" ], - "postProcessors": ["ExtractSearchIndex", "LastModifiedPostProcessor", "DescriptionPostProcessor"], + "postProcessors": [ + "ExtractSearchIndex", + "LastModifiedPostProcessor", + "DescriptionPostProcessor" + ], "overwrite": "_overwrites/**/**.md", "globalMetadata": { "_appTitle": "Discord.Net Documentation", "_appFooter": "Discord.Net (c) 2015-2020 2.2.0", "_enableSearch": true, "_appLogoPath": "marketing/logo/SVG/Logomark Purple.svg", - "_appFaviconPath": "favicon.ico" + "_appFaviconPath": "favicon.ico" }, - "xrefService": [ - "https://xref.docs.microsoft.com/query?uid={uid}" - ] + "xrefService": ["https://xref.docs.microsoft.com/query?uid={uid}"] } } diff --git a/samples/02_commands_framework/02_commands_framework.csproj b/samples/02_commands_framework/02_commands_framework.csproj index 151e546a2..83a62f8d7 100644 --- a/samples/02_commands_framework/02_commands_framework.csproj +++ b/samples/02_commands_framework/02_commands_framework.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/03_sharded_client/03_sharded_client.csproj b/samples/03_sharded_client/03_sharded_client.csproj index 24f9942f9..91cacef64 100644 --- a/samples/03_sharded_client/03_sharded_client.csproj +++ b/samples/03_sharded_client/03_sharded_client.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/idn/idn.csproj b/samples/idn/idn.csproj index 984c86383..f982ff86d 100644 --- a/samples/idn/idn.csproj +++ b/samples/idn/idn.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj index cfaf67d34..ae4f7a78c 100644 --- a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj +++ b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj @@ -1,4 +1,4 @@ - + Discord.Net.Analyzers @@ -10,7 +10,7 @@ ..\Discord.Net.Analyzers\Discord.Net.Analyzers.xml - + diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj index 4f6a47c15..ce4d0dd3d 100644 --- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj +++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj @@ -5,8 +5,8 @@ Discord.Net.Commands Discord.Commands A Discord.Net Labs extension adding support for bot commands. - net461;netstandard2.0;netstandard2.1 - netstandard2.0;netstandard2.1 + net5.0;net461;netstandard2.0;netstandard2.1 + net5.0;netstandard2.0;netstandard2.1 Discord.Net.Labs.Commands https://github.com/Discord-Net-Labs/Discord.Net-Labs https://github.com/Discord-Net-Labs/Discord.Net-Labs diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj index 036717e8d..8888332ae 100644 --- a/src/Discord.Net.Core/Discord.Net.Core.csproj +++ b/src/Discord.Net.Core/Discord.Net.Core.csproj @@ -1,12 +1,12 @@ - + Discord.Net.Core Discord The core components for the Discord.Net Labs library. - net461;netstandard2.0;netstandard2.1 - netstandard2.0;netstandard2.1 + net5.0;net461;netstandard2.0;netstandard2.1 + net5.0;netstandard2.0;netstandard2.1 Discord.Net.Labs.Core Discord.Net.Labs.Core https://github.com/Discord-Net-Labs/Discord.Net-Labs @@ -17,12 +17,21 @@ ..\Discord.Net.Core\Discord.Net.Core.xml - - - - + + + all + + + + + + + + + + diff --git a/src/Discord.Net.Examples/Discord.Net.Examples.csproj b/src/Discord.Net.Examples/Discord.Net.Examples.csproj index ec0253428..3371432b8 100644 --- a/src/Discord.Net.Examples/Discord.Net.Examples.csproj +++ b/src/Discord.Net.Examples/Discord.Net.Examples.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj index 725feb766..b280cfd4f 100644 --- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj +++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj @@ -1,12 +1,12 @@ - + Discord.Net.Rest Discord.Rest A core Discord.Net Labs library containing the REST client and models. - net461;netstandard2.0;netstandard2.1 - netstandard2.0;netstandard2.1 + net5.0;net461;netstandard2.0;netstandard2.1 + net5.0;netstandard2.0;netstandard2.1 Temporary.png https://github.com/Discord-Net-Labs/Discord.Net-Labs Discord.Net.Labs.Rest diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj index 992c789c5..f6af62a12 100644 --- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj +++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj @@ -1,17 +1,19 @@ - + Discord.Net.WebSocket Discord.WebSocket A core Discord.Net Labs library containing the WebSocket client and models. - net461;netstandard2.0;netstandard2.1 - netstandard2.0;netstandard2.1 + net5.0;net461;netstandard2.0;netstandard2.1 + net5.0;netstandard2.0;netstandard2.1 true https://github.com/Discord-Net-Labs/Discord.Net-Labs https://github.com/Discord-Net-Labs/Discord.Net-Labs Temporary.png Discord.Net.Labs.WebSocket + PackageReference + true ..\Discord.Net.WebSocket\Discord.Net.WebSocket.xml diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj index ac654d4a6..7ccc7cfb9 100644 --- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj +++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj @@ -1,11 +1,12 @@ - + Discord.Net.Webhook Discord.Webhook A core Discord.Net Labs library containing the Webhook client and models. - netstandard2.0;netstandard2.1 + net5.0;net461;netstandard2.0;netstandard2.1 + net5.0;netstandard2.0;netstandard2.1 Discord.Net.Labs.Webhook https://github.com/Discord-Net-Labs/Discord.Net-Labs https://github.com/Discord-Net-Labs/Discord.Net-Labs 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 8f69672f9..1257041e4 100644 --- a/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj +++ b/test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj @@ -15,10 +15,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 c571059ef..8b16b2971 100644 --- a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj +++ b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj @@ -15,9 +15,9 @@ - + - + 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 866041696..716c3ebc4 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,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive