Browse Source

Fix immutabe builders and bump versions

pull/1923/head
quin lynch 3 years ago
parent
commit
6aaaf681b0
5 changed files with 24 additions and 16 deletions
  1. +3
    -3
      src/Discord.Net.Rest/Discord.Net.Rest.csproj
  2. +3
    -3
      src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
  3. +6
    -2
      src/Discord.Net.WebSocket/DiscordShardedClient.cs
  4. +5
    -1
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  5. +7
    -7
      src/Discord.Net/Discord.Net.nuspec

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

@@ -9,11 +9,11 @@
<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.0.0</Version>
<Version>3.0.1</Version>
<PackageId>Discord.Net.Labs.Rest</PackageId>
<RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
<AssemblyVersion>3.0.0</AssemblyVersion>
<FileVersion>3.0.0</FileVersion>
<AssemblyVersion>3.0.1</AssemblyVersion>
<FileVersion>3.0.1</FileVersion>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.Rest\Discord.Net.Rest.xml</DocumentationFile>


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

@@ -8,7 +8,7 @@
<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.0.0</Version>
<Version>3.0.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>
@@ -16,8 +16,8 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>..\Discord.Net.WebSocket\Discord.Net.WebSocket.xml</DocumentationFile>
<AssemblyVersion>3.0.0</AssemblyVersion>
<FileVersion>3.0.0</FileVersion>
<AssemblyVersion>3.0.1</AssemblyVersion>
<FileVersion>3.0.1</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>


+ 6
- 2
src/Discord.Net.WebSocket/DiscordShardedClient.cs View File

@@ -298,7 +298,9 @@ namespace Discord.WebSocket
{
var models = await ApiClient.ListNitroStickerPacksAsync().ConfigureAwait(false);

foreach(var model in models.StickerPacks)
var builder = ImmutableArray.CreateBuilder<StickerPack<SocketSticker>>();

foreach (var model in models.StickerPacks)
{
var stickers = model.Stickers.Select(x => SocketSticker.Create(_shards[0], x));

@@ -312,8 +314,10 @@ namespace Discord.WebSocket
stickers
);

_defaultStickers.Add(pack);
builder.Add(pack);
}

_defaultStickers = builder.ToImmutable();
}

/// <inheritdoc />


+ 5
- 1
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -214,6 +214,8 @@ namespace Discord.WebSocket
{
var models = await ApiClient.ListNitroStickerPacksAsync().ConfigureAwait(false);

var builder = ImmutableArray.CreateBuilder<StickerPack<SocketSticker>>();

foreach (var model in models.StickerPacks)
{
var stickers = model.Stickers.Select(x => SocketSticker.Create(this, x));
@@ -228,8 +230,10 @@ namespace Discord.WebSocket
stickers
);

_defaultStickers.Add(pack);
builder.Add(pack);
}

_defaultStickers = builder.ToImmutable();
}
}



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

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Discord.Net.Labs</id>
<version>3.0.0$suffix$</version>
<version>3.0.1$suffix$</version>
<title>Discord.Net Labs</title>
<authors>Discord.Net Contributors</authors>
<owners>quinchs</owners>
@@ -15,22 +15,22 @@
<dependencies>
<group targetFramework="net461">
<dependency id="Discord.Net.Labs.Core" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Discord.Net.Labs.Core" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="Discord.Net.Labs.Core" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Rest" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.WebSocket" version="3.0.1$suffix$" />
<dependency id="Discord.Net.Labs.Commands" version="3.0.0$suffix$" />
<dependency id="Discord.Net.Labs.Webhook" version="3.0.0$suffix$" />
</group>


Loading…
Cancel
Save