Skip to content

Commit

Permalink
Revert Discord.NET to 3.7.2 to fix NullReference in SlashCommand Builder
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasloupe committed Sep 9, 2022
1 parent 98c89c6 commit 6f4819a
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 15 deletions.
Binary file modified Slackord_Mac_Linux/.vs/ProjectEvaluation/slackord.metadata.v5.1
Binary file not shown.
Binary file modified Slackord_Mac_Linux/.vs/ProjectEvaluation/slackord.projects.v5.1
Binary file not shown.
Binary file modified Slackord_Mac_Linux/.vs/Slackord/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file modified Slackord_Mac_Linux/.vs/Slackord/v17/.futdcache.v2
Binary file not shown.
Binary file modified Slackord_Mac_Linux/.vs/Slackord/v17/.suo
Binary file not shown.
2 changes: 1 addition & 1 deletion Slackord_Mac_Linux/Slackord/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Slackord
{
internal class Slackord
{
private const string CurrentVersion = "v2.2.5.1";
private const string CurrentVersion = "v2.2.5.2";
private DiscordSocketClient _discordClient;
private string _discordToken;
private bool _isFileParsed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-09-07T01:03:26.8708312Z;True|2022-09-06T18:04:01.1476860-05:00;True|2022-09-06T17:57:43.7189984-05:00;True|2022-09-04T18:13:17.0640993-05:00;True|2022-09-04T15:13:24.9245143-05:00;True|2022-09-03T12:11:25.9090446-05:00;True|2022-09-02T06:34:34.9234318-05:00;True|2022-09-01T18:21:11.7930268-05:00;True|2022-08-28T06:37:02.2882076-05:00;</History>
<History>True|2022-09-09T16:20:37.8936142Z;True|2022-09-07T09:21:44.8560331-05:00;True|2022-09-06T20:03:26.8708312-05:00;True|2022-09-06T18:04:01.1476860-05:00;True|2022-09-06T17:57:43.7189984-05:00;True|2022-09-04T18:13:17.0640993-05:00;True|2022-09-04T15:13:24.9245143-05:00;True|2022-09-03T12:11:25.9090446-05:00;True|2022-09-02T06:34:34.9234318-05:00;True|2022-09-01T18:21:11.7930268-05:00;True|2022-08-28T06:37:02.2882076-05:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-09-07T01:03:31.7927375Z;True|2022-09-06T18:03:54.5007647-05:00;True|2022-09-06T17:57:52.4538451-05:00;True|2022-09-04T18:13:10.9335352-05:00;True|2022-09-04T15:13:30.2220771-05:00;True|2022-09-03T12:11:20.8350468-05:00;True|2022-09-02T06:34:28.4239943-05:00;True|2022-09-01T18:21:37.3336024-05:00;True|2022-08-29T13:50:52.3720125-05:00;False|2022-08-29T13:41:04.3514375-05:00;False|2022-08-29T13:40:55.1297764-05:00;True|2022-08-28T06:34:09.4345835-05:00;</History>
<History>True|2022-09-09T16:20:43.9506630Z;True|2022-09-07T09:20:31.8437641-05:00;True|2022-09-06T20:03:31.7927375-05:00;True|2022-09-06T18:03:54.5007647-05:00;True|2022-09-06T17:57:52.4538451-05:00;True|2022-09-04T18:13:10.9335352-05:00;True|2022-09-04T15:13:30.2220771-05:00;True|2022-09-03T12:11:20.8350468-05:00;True|2022-09-02T06:34:28.4239943-05:00;True|2022-09-01T18:21:37.3336024-05:00;True|2022-08-29T13:50:52.3720125-05:00;False|2022-08-29T13:41:04.3514375-05:00;False|2022-08-29T13:40:55.1297764-05:00;True|2022-08-28T06:34:09.4345835-05:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions Slackord_Mac_Linux/Slackord/Slackord.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Discord.Net.Core" Version="3.8.0" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.8.0" />
<PackageReference Include="Discord.Net.Core" Version="3.7.2" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.7.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Octokit" Version="2.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Slackord_Mac_Linux/Slackord/Slackord.csproj.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>Z:\Development\Git Repositories\Slackord2\Slackord_Mac_Linux\Slackord\Properties\PublishProfiles\Mac OSx x64.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>Z:\Development\Git Repositories\Slackord2\Slackord_Mac_Linux\Slackord\Properties\PublishProfiles\Linux x64.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-09-07T01:04:04.0696943Z;True|2022-09-06T18:04:29.8922842-05:00;True|2022-09-06T17:57:55.0056945-05:00;True|2022-09-04T18:18:52.9490277-05:00;True|2022-09-04T15:13:27.5345134-05:00;True|2022-09-03T12:10:48.0630446-05:00;True|2022-09-03T11:19:47.2927887-05:00;True|2022-09-02T06:34:28.1204978-05:00;True|2022-09-02T06:29:43.9201252-05:00;True|2022-09-01T18:19:47.6243330-05:00;True|2022-09-01T18:19:27.5036763-05:00;True|2022-08-12T03:32:20.8996556-05:00;True|2022-08-12T01:26:03.8424861-05:00;</History>
<History>True|2022-09-09T16:20:36.8206191Z;True|2022-09-07T09:21:28.3527150-05:00;True|2022-09-06T20:04:04.0696943-05:00;True|2022-09-06T18:04:29.8922842-05:00;True|2022-09-06T17:57:55.0056945-05:00;True|2022-09-04T18:18:52.9490277-05:00;True|2022-09-04T15:13:27.5345134-05:00;True|2022-09-03T12:10:48.0630446-05:00;True|2022-09-03T11:19:47.2927887-05:00;True|2022-09-02T06:34:28.1204978-05:00;True|2022-09-02T06:29:43.9201252-05:00;True|2022-09-01T18:19:47.6243330-05:00;True|2022-09-01T18:19:27.5036763-05:00;True|2022-08-12T03:32:20.8996556-05:00;True|2022-08-12T01:26:03.8424861-05:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Slackord_Win/Slackord/Slackord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Slackord
{
public partial class Slackord : MaterialForm
{
private const string CurrentVersion = "v2.2.5.1";
private const string CurrentVersion = "v2.2.5.2";
private DiscordSocketClient _discordClient;
private OpenFileDialog _ofd;
private string _discordToken;
Expand Down
9 changes: 2 additions & 7 deletions Slackord_Win/Slackord/Slackord.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Discord.Net" Version="3.8.0" />
<PackageReference Include="Discord.Net.Commands" Version="3.8.0" />
<PackageReference Include="Discord.Net.Core" Version="3.8.0" />
<PackageReference Include="Discord.Net.Interactions" Version="3.8.0" />
<PackageReference Include="Discord.Net.Rest" Version="3.8.0" />
<PackageReference Include="Discord.Net.Webhook" Version="3.8.0" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.8.0" />
<PackageReference Include="Discord.Net.Core" Version="3.7.2" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.7.2" />
<PackageReference Include="MaterialSkin.2" Version="2.3.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Octokit" Version="2.0.1" />
Expand Down

0 comments on commit 6f4819a

Please sign in to comment.