RPCS3/discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2025-04-03 21:01:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade dotnet sdk to 3.1

Browse Source
This commit is contained in:
13xforever 2019-12-04 01:21:36 +05:00
parent 4181e19029
commit 6a65a76fc2
9 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Clients/AppveyorClient/AppveyorClient.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

2
Clients/GithubClient/GithubClient.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
</ItemGroup>
<ItemGroup>

2
Clients/PsnClient/PsnClient.csproj
View File

@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.3.2" />
</ItemGroup>

24
CompatBot/CompatBot.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<RootNamespace>CompatBot</RootNamespace>
<UserSecretsId>c2e6548b-b215-4a18-a010-958ef294b310</UserSecretsId>
@ -29,31 +29,31 @@
<PackageReference Include="DSharpPlus.CommandsNext" Version="4.0.0-nightly-00635" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.0.0-nightly-00635" />
<PackageReference Include="DuoVia.FuzzyStrings" Version="2.0.1" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.42.0.1750" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.42.0.1772" />
<PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
<PackageReference Include="MathParser.org-mXparser" Version="4.3.3" />
<PackageReference Include="MegaApiClient" Version="1.7.1" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.3.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
<PackageReference Include="Nerdbank.Streams" Version="2.4.46" />
<PackageReference Include="Nerdbank.Streams" Version="2.4.48" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.6.8" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.1" />
<PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.0.2" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
<PackageReference Include="System.IO.Pipelines" Version="4.6.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.IO.Pipelines" Version="4.7.0" />
</ItemGroup>
<ItemGroup>

6
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
View File

@ -295,7 +295,7 @@ namespace CompatBot.Utils.ResultFormatters
}
string reformatDecoder(string dec)
static string reformatDecoder(string dec)
{
if (string.IsNullOrEmpty(dec))
return dec;
@ -303,9 +303,7 @@ namespace CompatBot.Utils.ResultFormatters
var match = Regex.Match(dec, @"(?<name>[^(]+)(\((?<type>.+)\))?", RegexOptions.ExplicitCapture | RegexOptions.Singleline);
var n = match.Groups["name"].Value.TrimEnd();
var t = match.Groups["type"].Value;
if (string.IsNullOrEmpty(t))
return n;
return $"{n}/{t}";
return string.IsNullOrEmpty(t) ? n : $"{n}/{t}";
}
items["ppu_decoder"] = reformatDecoder(items["ppu_decoder"]);

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS base
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base
# Native libgdiplus dependencies
RUN apt-get update
RUN apt-get install -y --allow-unauthenticated libc6-dev libgdiplus libx11-dev

6
README.md
View File

@ -9,7 +9,7 @@ You can read the design and implementation notes by visiting the folders in the
Development Requirements
------------------------
* [.NET Core 3.0 SDK](https://dotnet.microsoft.com/download) or newer
* [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or newer
* Any text editor, but here are some recommends:
* [Visual Studio](https://visualstudio.microsoft.com/) (Windows and Mac only, has free Community edition)
* [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free)
@ -17,9 +17,9 @@ Development Requirements
Runtime Requirements
--------------------
* [.NET Core 3.0 SDK](https://dotnet.microsoft.com/download) or newer to run from sources
* [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or newer to run from sources
* needs `dotnet` command available (i.e. alias for the Snap package)
* [.NET Core 3.0 Runtime for server apps](https://dotnet.microsoft.com/download) or newer for compiled version
* [.NET Core 3.1 Runtime for server apps](https://dotnet.microsoft.com/download) or newer for compiled version
* Optionally Google API credentials to access Google Drive:
* Create new project in the [Google Cloud Resource Manager](https://console.developers.google.com/cloud-resource-manager)
* Select the project and enable [Google Drive API](https://console.developers.google.com/apis/library/drive.googleapis.com)

2
Tests/Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

10
azure-pipelines.yml
View File

@ -4,6 +4,11 @@ jobs:
pool:
vmImage: 'ubuntu-latest'
steps:
- task: UseDotNet@2
displayName: 'update dotnet core sdk'
inputs:
version: 3.1.x
- script: dotnet restore --ignore-failed-sources
displayName: 'dotnet restore (first try)'
@ -35,6 +40,11 @@ jobs:
- script: git clean -dfx
displayName: 'clean build artifacts'
- task: UseDotNet@2
displayName: 'update dotnet core sdk'
inputs:
version: 3.1.x
- script: dotnet restore --ignore-failed-sources
displayName: 'dotnet restore (first try)'