Deprecate old package definitions in favor for target file

Discord.Net.targets

@@ -1,15 +1,14 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>3.0.0</VersionPrefix>
-        <VersionSuffix>dev</VersionSuffix>
+        <VersionPrefix>3.1.2</VersionPrefix>
         <LangVersion>latest</LangVersion>
         <Authors>Discord.Net Contributors</Authors>
         <PackageTags>discord;discordapp</PackageTags>
-        <PackageProjectUrl>https://github.com/Discord-Net/Discord.Net</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
         <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-        <PackageIconUrl>https://github.com/Discord-Net/Discord.Net/raw/dev/docs/marketing/logo/PackageLogo.png</PackageIconUrl>
+        <PackageIconUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs/raw/dev/docs/marketing/logo/PackageLogo.png</PackageIconUrl>
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>git://github.com/Discord-Net/Discord.Net</RepositoryUrl>
+        <RepositoryUrl>git://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(BuildNumber)' == '' ">
         <VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>

src/Discord.Net.Commands/Discord.Net.Commands.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
   <Import Project="../../StyleAnalyzer.targets" />
   <PropertyGroup>
@@ -7,26 +7,8 @@
     <Description>A Discord.Net Labs extension adding support for bot commands.</Description>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <PackageId>Discord.Net.Labs.Commands</PackageId>
-    <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
-    <PackageIcon>PackageLogo.png</PackageIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>..\Discord.Net.Commands\Discord.Net.Commands.xml</DocumentationFile>
-    <PackageIconUrl />
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Discord.Net.Commands.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\docs\marketing\logo\PackageLogo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>

src/Discord.Net.Core/Discord.Net.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
   <Import Project="../../StyleAnalyzer.targets" />
   <PropertyGroup>
@@ -7,14 +7,6 @@
     <Description>The core components for the Discord.Net Labs library.</Description>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <PackageId>Discord.Net.Labs.Core</PackageId>
-    <Product>Discord.Net.Labs.Core</Product>
-    <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
-    <PackageIcon>PackageLogo.png</PackageIcon>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>..\Discord.Net.Core\Discord.Net.Core.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -33,13 +25,4 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Discord.Net.Core.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\docs\marketing\logo\PackageLogo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
 </Project>

src/Discord.Net.Rest/Discord.Net.Rest.csproj

@@ -7,13 +7,6 @@
     <Description>A core Discord.Net Labs library containing the REST client and models.</Description>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <PackageIcon>PackageLogo.png</PackageIcon>
-    <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
-    <PackageId>Discord.Net.Labs.Rest</PackageId>
-    <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>..\Discord.Net.Rest\Discord.Net.Rest.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -21,13 +14,4 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Discord.Net.Rest.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\docs\marketing\logo\PackageLogo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
 </Project>

src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj

@@ -8,31 +8,9 @@
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
-    <PackageIcon>PackageLogo.png</PackageIcon>
-    <PackageId>Discord.Net.Labs.WebSocket</PackageId>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>..\Discord.Net.WebSocket\Discord.Net.WebSocket.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  
+  </PropertyGroup>  
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
     <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Discord.Net.WebSocket.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\docs\marketing\logo\PackageLogo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
 </Project>

src/Discord.Net.Webhook/Discord.Net.Webhook.csproj

@@ -7,25 +7,9 @@
     <Description>A core Discord.Net Labs library containing the Webhook client and models.</Description>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <PackageId>Discord.Net.Labs.Webhook</PackageId>
-    <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
-    <PackageIcon>PackageLogo.png</PackageIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>..\Discord.Net.Webhook\Discord.Net.Webhook.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
     <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Discord.Net.Webhook.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\docs\marketing\logo\PackageLogo.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
 </Project>

src/Discord.Net.Webhook/Discord.Net.Webhook.xml

@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Discord.Net.Webhook</name>
-    </assembly>
-    <members>
-        <member name="T:Discord.Webhook.DiscordWebhookClient">
-            <summary> A client responsible for connecting as a Webhook. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(Discord.IWebhook)">
-            <summary> Creates a new Webhook Discord client. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(System.UInt64,System.String)">
-            <summary> Creates a new Webhook Discord client. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(System.String)">
-            <summary> Creates a new Webhook Discord client. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(System.UInt64,System.String,Discord.Rest.DiscordRestConfig)">
-            <summary> Creates a new Webhook Discord client. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(Discord.IWebhook,Discord.Rest.DiscordRestConfig)">
-            <summary> Creates a new Webhook Discord client. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.#ctor(System.String,Discord.Rest.DiscordRestConfig)">
-            <summary>
-                Creates a new Webhook Discord client.
-            </summary>
-            <param name="webhookUrl">The url of the webhook.</param>
-            <param name="config">The configuration options to use for this client.</param>
-            <exception cref="T:System.ArgumentException">Thrown if the <paramref name="webhookUrl"/> is an invalid format.</exception>
-            <exception cref="T:System.ArgumentNullException">Thrown if the <paramref name="webhookUrl"/> is null or whitespace.</exception>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.SendMessageAsync(System.String,System.Boolean,System.Collections.Generic.IEnumerable{Discord.Embed},System.String,System.String,Discord.RequestOptions,Discord.AllowedMentions,Discord.MessageComponent)">
-            <summary> Sends a message to the channel for this webhook. </summary>
-            <returns> Returns the ID of the created message. </returns>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.ModifyMessageAsync(System.UInt64,System.Action{Discord.Webhook.WebhookMessageProperties},Discord.RequestOptions)">
-            <summary>
-                Modifies a message posted using this webhook.
-            </summary>
-            <remarks>
-                This method can only modify messages that were sent using the same webhook.
-            </remarks>
-            <param name="messageId">ID of the modified message.</param>
-            <param name="func">A delegate containing the properties to modify the message with.</param>
-            <param name="options">The options to be used when sending the request.</param>
-            <returns>
-                A task that represents the asynchronous modification operation.
-            </returns>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.DeleteMessageAsync(System.UInt64,Discord.RequestOptions)">
-            <summary>
-                Deletes a message posted using this webhook.
-            </summary>
-            <remarks>
-                This method can only delete messages that were sent using the same webhook.
-            </remarks>
-            <param name="messageId">ID of the deleted message.</param>
-            <param name="options">The options to be used when sending the request.</param>
-            <returns>
-                A task that represents the asynchronous deletion operation.
-            </returns>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.SendFileAsync(System.String,System.String,System.Boolean,System.Collections.Generic.IEnumerable{Discord.Embed},System.String,System.String,Discord.RequestOptions,System.Boolean,Discord.AllowedMentions)">
-            <summary> Sends a message to the channel for this webhook with an attachment. </summary>
-            <returns> Returns the ID of the created message. </returns>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.SendFileAsync(System.IO.Stream,System.String,System.String,System.Boolean,System.Collections.Generic.IEnumerable{Discord.Embed},System.String,System.String,Discord.RequestOptions,System.Boolean,Discord.AllowedMentions)">
-            <summary> Sends a message to the channel for this webhook with an attachment. </summary>
-            <returns> Returns the ID of the created message. </returns>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.ModifyWebhookAsync(System.Action{Discord.WebhookProperties},Discord.RequestOptions)">
-            <summary> Modifies the properties of this webhook. </summary>
-        </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.DeleteWebhookAsync(Discord.RequestOptions)">
-            <summary> Deletes this webhook from Discord and disposes the client. </summary>
-        </member>
-        <member name="T:Discord.Webhook.WebhookMessageProperties">
-            <summary>
-                Properties that are used to modify an Webhook message with the specified changes.
-            </summary>
-        </member>
-        <member name="P:Discord.Webhook.WebhookMessageProperties.Content">
-            <summary>
-                Gets or sets the content of the message.
-            </summary>
-            <remarks>
-                This must be less than the constant defined by <see cref="F:Discord.DiscordConfig.MaxMessageSize"/>.
-            </remarks>
-        </member>
-        <member name="P:Discord.Webhook.WebhookMessageProperties.Embeds">
-            <summary>
-                Gets or sets the embed array that the message should display.
-            </summary>
-        </member>
-        <member name="P:Discord.Webhook.WebhookMessageProperties.AllowedMentions">
-            <summary>
-                Gets or sets the allowed mentions of the message.
-            </summary>
-        </member>
-        <member name="P:Discord.Webhook.WebhookMessageProperties.Components">
-            <summary>
-                Gets or sets the components that the message should display.
-            </summary>
-        </member>
-        <member name="M:Discord.Webhook.WebhookClientHelper.GetWebhookAsync(Discord.Webhook.DiscordWebhookClient,System.UInt64)">
-            <exception cref="T:System.InvalidOperationException">Could not find a webhook with the supplied credentials.</exception>
-        </member>
-    </members>
-</doc>