youys
/
Discord.Net
Not watched
1
0
Fork 0
Code
Releases 34 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Added net5.0 targets, updated packages, and CI build time outdated packages check.

pull/1569/head
AraHaan 4 years ago
parent
93dd81ed6a
commit
900cb3d900
18 changed files with 37 additions and 26 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      azure/build.yml
  2. +1
    -1
      samples/01_basic_ping_bot/01_basic_ping_bot.csproj
  3. +2
    -2
      samples/02_commands_framework/02_commands_framework.csproj
  4. +2
    -2
      samples/03_sharded_client/03_sharded_client.csproj
  5. +1
    -1
      samples/04_webhook_client/04_webhook_client.csproj
  6. +2
    -2
      samples/idn/idn.csproj
  7. +1
    -1
      src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
  8. +2
    -2
      src/Discord.Net.Commands/Discord.Net.Commands.csproj
  9. +2
    -2
      src/Discord.Net.Core/Discord.Net.Core.csproj
  10. +1
    -1
      src/Discord.Net.Examples/Discord.Net.Examples.csproj
  11. +1
    -1
      src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
  12. +2
    -2
      src/Discord.Net.Rest/Discord.Net.Rest.csproj
  13. +2
    -2
      src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
  14. +1
    -1
      src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
  15. +10
    -2
      src/Discord.Net/Discord.Net.nuspec
  16. +2
    -2
      test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj
  17. +1
    -1
      test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
  18. +1
    -1
      test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj

+ 3
- 0
azure/build.yml View File

@@ -7,6 +7,9 @@ steps:
verbosityRestore: 'Minimal'
displayName: Restore packages

- script: dotnet list package --outdated
displayName: Outdated Package Check

- script: dotnet build "Discord.Net.sln" --no-restore -v minimal -c $(buildConfiguration) /p:BuildNumber=$(buildNumber) /p:IsTagBuild=$(buildTag)
displayName: Build projects



+ 1
- 1
samples/01_basic_ping_bot/01_basic_ping_bot.csproj View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>


+ 2
- 2
samples/02_commands_framework/02_commands_framework.csproj View File

@@ -3,11 +3,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
</ItemGroup>

<ItemGroup>


+ 2
- 2
samples/03_sharded_client/03_sharded_client.csproj View File

@@ -3,12 +3,12 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<RootNamespace>_03_sharded_client</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
</ItemGroup>

<ItemGroup>


+ 1
- 1
samples/04_webhook_client/04_webhook_client.csproj View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<RootNamespace>_04_webhook_client</RootNamespace>
</PropertyGroup>



+ 2
- 2
samples/idn/idn.csproj View File

@@ -3,11 +3,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
</ItemGroup>

<ItemGroup>


+ 1
- 1
src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj View File

@@ -8,7 +8,7 @@
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Commands\Discord.Net.Commands.csproj" />


+ 2
- 2
src/Discord.Net.Commands/Discord.Net.Commands.csproj View File

@@ -6,8 +6,8 @@
<RootNamespace>Discord.Commands</RootNamespace>
<Description>A Discord.Net extension adding support for bot commands.</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />


+ 2
- 2
src/Discord.Net.Core/Discord.Net.Core.csproj View File

@@ -6,8 +6,8 @@
<RootNamespace>Discord</RootNamespace>
<Description>The core components for the Discord.Net library.</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<!-- System.ValueTuple is in .NET Framework 4.7+, older versions need the package. -->


+ 1
- 1
src/Discord.Net.Examples/Discord.Net.Examples.csproj View File

@@ -2,7 +2,7 @@

<PropertyGroup>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>


+ 1
- 1
src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj View File

@@ -5,7 +5,7 @@
<RootNamespace>Discord.Providers.WS4Net</RootNamespace>
<Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />


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

@@ -6,8 +6,8 @@
<RootNamespace>Discord.Rest</RootNamespace>
<Description>A core Discord.Net library containing the REST client and models.</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />


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

@@ -6,8 +6,8 @@
<RootNamespace>Discord.WebSocket</RootNamespace>
<Description>A core Discord.Net library containing the WebSocket client and models.</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>


+ 1
- 1
src/Discord.Net.Webhook/Discord.Net.Webhook.csproj View File

@@ -6,7 +6,7 @@
<RootNamespace>Discord.Webhook</RootNamespace>
<Description>A core Discord.Net library containing the Webhook client and models.</Description>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />


+ 10
- 2
src/Discord.Net/Discord.Net.nuspec View File

@@ -19,7 +19,7 @@
<dependency id="Discord.Net.WebSocket" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Commands" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="2.3.0-dev$suffix$" />
</group>
</group>
<group targetFramework="netstandard2.0">
<dependency id="Discord.Net.Core" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="2.3.0-dev$suffix$" />
@@ -27,7 +27,15 @@
<dependency id="Discord.Net.Commands" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="2.3.0-dev$suffix$" />
</group>
<group targetFramework="netstandard2.1">
<group targetFramework="netstandard2.1">
<dependency id="Discord.Net.Core" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.WebSocket" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Commands" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Webhook" version="2.3.0-dev$suffix$" />
</group>
<!-- Added .NET 5.0. -->
<group targetFramework="net5.0">
<dependency id="Discord.Net.Core" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.Rest" version="2.3.0-dev$suffix$" />
<dependency id="Discord.Net.WebSocket" version="2.3.0-dev$suffix$" />


+ 2
- 2
test/Discord.Net.Analyzers.Tests/Discord.Net.Analyzers.Tests.csproj View File

@@ -15,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>


+ 1
- 1
test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj View File

@@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>


+ 1
- 1
test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj View File

@@ -13,7 +13,7 @@
<ProjectReference Include="../../src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit