Browse Source

Remove references to labs

pull/1923/head
quin lynch 3 years ago
parent
commit
0bff21ffc1
8 changed files with 42 additions and 187 deletions
  1. +4
    -16
      Discord.Net.sln
  2. +3
    -22
      src/Discord.Net.Commands/Discord.Net.Commands.csproj
  3. +3
    -25
      src/Discord.Net.Core/Discord.Net.Core.csproj
  4. +3
    -24
      src/Discord.Net.Rest/Discord.Net.Rest.csproj
  5. +0
    -27
      src/Discord.Net.WebSocket/Discord - Backup.Net.WebSocket.csproj
  6. +3
    -28
      src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
  7. +3
    -22
      src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
  8. +23
    -23
      src/Discord.Net/Discord.Net.nuspec

+ 4
- 16
Discord.Net.sln View File

@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31521.260
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Core", "src\Discord.Net.Core\Discord.Net.Core.csproj", "{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}"
EndProject
@@ -40,7 +40,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Analyzers.Tests
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Examples", "src\Discord.Net.Examples\Discord.Net.Examples.csproj", "{47820065-3CFB-401C-ACEA-862BD564A404}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "idn", "samples\idn\idn.csproj", "{4A03840B-9EBE-47E3-89AB-E0914DF21AFB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "idn", "samples\idn\idn.csproj", "{4A03840B-9EBE-47E3-89AB-E0914DF21AFB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -232,18 +232,6 @@ Global
{4A03840B-9EBE-47E3-89AB-E0914DF21AFB}.Release|x64.Build.0 = Release|Any CPU
{4A03840B-9EBE-47E3-89AB-E0914DF21AFB}.Release|x86.ActiveCfg = Release|Any CPU
{4A03840B-9EBE-47E3-89AB-E0914DF21AFB}.Release|x86.Build.0 = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|x64.ActiveCfg = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|x64.Build.0 = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|x86.ActiveCfg = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Debug|x86.Build.0 = Debug|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|Any CPU.Build.0 = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|x64.ActiveCfg = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|x64.Build.0 = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|x86.ActiveCfg = Release|Any CPU
{0CC57A32-3AC7-489D-8DF5-C431925E4675}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -270,4 +258,4 @@ Global
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = a45217b4-a401-4dbf-8654-34d2ec034cd9
EndGlobalSection
EndGlobal
EndGlobal

+ 3
- 22
src/Discord.Net.Commands/Discord.Net.Commands.csproj View File

@@ -1,34 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<Import Project="../../StyleAnalyzer.targets"/>
<PropertyGroup>
<AssemblyName>Discord.Net.Commands</AssemblyName>
<RootNamespace>Discord.Commands</RootNamespace>
<Description>A Discord.Net Labs extension adding support for bot commands.</Description>
<Description>A Discord.Net extension adding support for bot commands.</Description>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>3.0.0</Version>
<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>Temporary.png</PackageIcon>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.Commands\Discord.Net.Commands.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Discord.Net.Commands.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</Project>

+ 3
- 25
src/Discord.Net.Core/Discord.Net.Core.csproj View File

@@ -1,23 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<Import Project="../../StyleAnalyzer.targets"/>
<PropertyGroup>
<AssemblyName>Discord.Net.Core</AssemblyName>
<RootNamespace>Discord</RootNamespace>
<Description>The core components for the Discord.Net Labs library.</Description>
<Description>The core components for the Discord.Net library.</Description>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>Discord.Net.Labs.Core</PackageId>
<Version>3.1.0</Version>
<Product>Discord.Net.Labs.Core</Product>
<RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
<PackageIcon>Temporary.png</PackageIcon>
<AssemblyVersion>3.1.0</AssemblyVersion>
<FileVersion>3.1.0</FileVersion>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.Core\Discord.Net.Core.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
@@ -27,15 +16,4 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Discord.Net.Core.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>

+ 3
- 24
src/Discord.Net.Rest/Discord.Net.Rest.csproj View File

@@ -1,22 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<Import Project="../../StyleAnalyzer.targets"/>
<PropertyGroup>
<AssemblyName>Discord.Net.Rest</AssemblyName>
<RootNamespace>Discord.Rest</RootNamespace>
<Description>A core Discord.Net Labs library containing the REST client and models.</Description>
<Description>A core Discord.Net library containing the REST client and models.</Description>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageIcon>Temporary.png</PackageIcon>
<PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
<Version>3.1.0</Version>
<PackageId>Discord.Net.Labs.Rest</PackageId>
<RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
<AssemblyVersion>3.1.0</AssemblyVersion>
<FileVersion>3.1.0</FileVersion>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.Rest\Discord.Net.Rest.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -24,15 +14,4 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Discord.Net.Rest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>

+ 0
- 27
src/Discord.Net.WebSocket/Discord - Backup.Net.WebSocket.csproj View File

@@ -1,27 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<PropertyGroup>
<AssemblyName>Discord.Net.WebSocket</AssemblyName>
<RootNamespace>Discord.WebSocket</RootNamespace>
<Description>A core Discord.Net Labs library containing the WebSocket client and models.</Description>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>2.3.1</Version>
<RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
<PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
<PackageIcon>Temporary.png</PackageIcon>
<PackageId>Discord.Net.Labs.WebSocket</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
<ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>

+ 3
- 28
src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj View File

@@ -1,41 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<Import Project="../../StyleAnalyzer.targets"/>
<PropertyGroup>
<AssemblyName>Discord.Net.WebSocket</AssemblyName>
<RootNamespace>Discord.WebSocket</RootNamespace>
<Description>A core Discord.Net Labs library containing the WebSocket client and models.</Description>
<Description>A core Discord.Net library containing the WebSocket client and models.</Description>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>3.1.0</Version>
<RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
<PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
<PackageIcon>Temporary.png</PackageIcon>
<PackageId>Discord.Net.Labs.WebSocket</PackageId>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.WebSocket\Discord.Net.WebSocket.xml</DocumentationFile>
<AssemblyVersion>3.1.0</AssemblyVersion>
<FileVersion>3.1.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
<ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Discord.Net.WebSocket.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>

+ 3
- 22
src/Discord.Net.Webhook/Discord.Net.Webhook.csproj View File

@@ -1,33 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Discord.Net.targets" />
<Import Project="../../StyleAnalyzer.targets" />
<Import Project="../../StyleAnalyzer.targets"/>
<PropertyGroup>
<AssemblyName>Discord.Net.Webhook</AssemblyName>
<RootNamespace>Discord.Webhook</RootNamespace>
<Description>A core Discord.Net Labs library containing the Webhook client and models.</Description>
<Description>A core Discord.Net library containing the Webhook client and models.</Description>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>3.0.0</Version>
<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>Temporary.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 Include="..\..\..\..\..\..\Downloads\Temporary.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Discord.Net.Webhook.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>

+ 23
- 23
src/Discord.Net/Discord.Net.nuspec View File

@@ -1,39 +1,39 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Discord.Net.Labs</id>
<version>3.1.0$suffix$</version>
<title>Discord.Net Labs</title>
<id>Discord.Net</id>
<version>3.0.0-dev$suffix$</version>
<title>Discord.Net</title>
<authors>Discord.Net Contributors</authors>
<owners>quinchs</owners>
<description>An experimental fork of Discord.NET that adds all the new discord features to play around with! This metapackage includes all of the optional Discord.Net Labs components.</description>
<owners>foxbot</owners>
<description>An asynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.</description>
<tags>discord;discordapp</tags>
<projectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</projectUrl>
<projectUrl>https://github.com/RogueException/Discord.Net</projectUrl>
<licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://avatars.githubusercontent.com/u/84047264</iconUrl>
<iconUrl>https://github.com/RogueException/Discord.Net/raw/dev/docs/marketing/logo/PackageLogo.png</iconUrl>
<dependencies>
<group targetFramework="net461">
<dependency id="Discord.Net.Labs.Core" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Core" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.WebSocket" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Commands" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="3.0.0-dev$suffix$" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Discord.Net.Labs.Core" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Core" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.WebSocket" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Commands" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="3.0.0-dev$suffix$" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="Discord.Net.Labs.Core" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.1.0$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Core" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.WebSocket" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Commands" version="3.0.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="3.0.0-dev$suffix$" />
</group>
</dependencies>
</metadata>
</package>
</package>

Loading…
Cancel
Save