Skip to content

Commit

Permalink
Update to .Net8
Browse files Browse the repository at this point in the history
  • Loading branch information
@yasathedog123
yasathedog123 committed Dec 21, 2023
1 parent 76dc41f commit 2c85933
Show file tree
Hide file tree
Showing 993 changed files with 12,882 additions and 32,358 deletions.
24 changes: 12 additions & 12 deletions ArchiSteamFarm/ASF-ui/src/i18n/locale/de-DE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
"basic": "Grundlagen",
"bgr-background-queue": "Es {PLURAL:n|verbleibt {n} Spiel|verbleiben {n} Spiele} in der Hintergrundwarteschlange.",
"bgr-check": "Möchten Sie {PLURAL:n|den folgenden|die folgenden {n}} Produktschlüssel zum BGR hinzufügen?",
"bgr-keys-insert": "Fügen Sie hier ihre Produktschlüssel hinzu",
"bgr-keys-insert": "Fügen Sie hier Ihre Produktschlüssel hinzu",
"bgr-keys-insert-example": "Beispiel:\nAAAAA-BBBBB-CCCC0\nAAAAA-BBBBB-CCCC1\n\nSie können die Produktschlüssel mit Spiele-Namen versehen:\nAAAAA-BBBBB-CCCC2\tTurbo Pug\nAAAAA-BBBBB-CCCC3\tBad Rats",
"bgr-no-keys-detected": "Keine Produktschlüssel erkannt",
"bgr-reset": "Möchten Sie ihre key-Dateien zurücksetzen?",
"bgr-reset": "Möchten Sie Ihre key-Dateien zurücksetzen?",
"bgr-summary-success": "{PLURAL:n|Der folgende Produktschlüssel wurde|Die folgenden {n} Produktschlüssel wurden} erfolgreich zum BGR hinzugefügt",
"bgr-unused-keys": "Unbenutzte Produktschlüssel",
"bgr-unused-keys-count": "{PLURAL:n|{n} unbenutzt|{n} unbenutzt}",
"bgr-used-keys": "Benutzte Produktschlüssel",
"bgr-used-keys-count": "{PLURAL:n|{n} verwendet|{n} verwendet}",
"bot-copy": "Bot kopieren",
"bot-create-name": "Sie müssen einen Namen angeben",
"bot-create-name-asf": "Sie können ihren Bot nicht ASF nennen",
"bot-create-name-asf": "Sie können Ihren Bot nicht ASF nennen",
"bot-create-name-exist": "Ein Bot namens {name} existiert bereits",
"bot-delete-warning": "Diese Aktion kann <strong>nicht</strong> rückgängig gemacht werden. Der Bot <strong>{name}</strong> wird mit all seinen Dateien dauerhaft gelöscht.",
"bot-fav-buttons": "Schnell-Aktionsschaltfläche",
Expand All @@ -52,9 +52,9 @@
"bot-nicknames": "Namen",
"bot-nicknames-description": "Steam-Benutzernamen statt Botnamen anzeigen (sofern verfügbar).",
"bot-order-disabled": "Deaktivierte Bots am Ende anordnen",
"bot-order-disabled-description": "Dies sortiert deaktivierte Bots ans Ende der Liste, jeweils auf der Bot-Seite und dem Masseneditor.",
"bot-order-disabled-description": "Dies sortiert deaktivierte Bots ans Ende der Liste - jeweils auf den Seiten der Bots und der Stapel-Bearbeitung.",
"bot-order-numeric": "Bots numerisch sortieren",
"bot-order-numeric-description": "Anstatt der alphabetisch Reihenfolge werden die Bots jeweils numerisch auf der Bot-Seite und dem Masseneditor angeordnet.",
"bot-order-numeric-description": "Anstatt der alphabetisch Reihenfolge werden die Bots jeweils numerisch auf der Bot-Seite und der Stapel-Bearbeitung angeordnet.",
"bot-status-disabled": "Deaktiviert",
"bot-status-farming": "Sammeln",
"bot-status-input": "Eingabe erforderlich",
Expand Down Expand Up @@ -93,15 +93,15 @@
"display-categories-description": "Entscheiden Sie, ob Konfigurationseigenschaften kategorisiert werden sollen.",
"download-raw-config": "Unbearbeitete Konfigurationsdatei herunterladen",
"encrypt": "Verschlüsseln",
"encrypt-success": "Passwort erfolgreich verschlüsselt. Vergessen Sie nicht, ihre Konfiguration zu speichern.",
"encrypt-success": "Passwort erfolgreich verschlüsselt. Vergessen Sie nicht, Ihre Konfiguration zu speichern.",
"error": "Fehler",
"farming": "Sammeln",
"farming-info-cards": "verbleibende Karten",
"farming-info-games": "verbleibende Spiele",
"farming-info-time": "verbleibende Zeit",
"general": "Allgemein",
"hash": "Hash",
"hash-success": "Hash erfolgreich generiert. Denken Sie daran, ihre Konfiguration zu speichern.",
"hash-success": "Hash erfolgreich generiert. Denken Sie daran, Ihre Konfiguration zu speichern.",
"info": "Info",
"input-all-selected": "Alle Werte ausgewählt",
"input-info-login": "Sie haben keinen Anmeldenamen für dieses Konto gespeichert.",
Expand Down Expand Up @@ -136,7 +136,7 @@
"log-information": "Log-Information",
"log-information-description": "Wählen Sie, welche Log-Informationen angezeigt werden sollen",
"log-information-level": "Stufe",
"log-information-logger": "Protokollierung",
"log-information-logger": "Protokollführer",
"log-information-process": "Vorgang",
"log-information-time": "Zeit",
"log-previous": "Lade {amount} vorherige Zeilen",
Expand All @@ -149,10 +149,10 @@
"log-timestamp-time-date-locale": "Anzeigedatum und Zeit des regionalen Formats",
"log-timestamp-time-date-us": "MM/DD/YY HH:MM:SS PM/AM",
"log-timestamp-time-only-eu": "HH:MM:SS",
"log-timestamp-time-only-locale": "Zeige die Zeit im Format ihres Gebietsschemas an",
"log-timestamp-time-only-locale": "Zeige die Zeit im Format Ihres Gebietsschemas an",
"log-timestamp-time-only-us": "HH:MM:SS PM/AM",
"logout-title": "Von ASF-UI abmelden",
"mass-editor": "Masseneditor",
"mass-editor": "Stapel-Bearbeitung",
"mass-editor-bots": "Wählen Sie die Bots aus, deren Konfiguration geändert werden sollen",
"mass-editor-bots-deselect": "Auswahl aufheben",
"mass-editor-bots-disabled": "Wählen Sie mindestens einen Bot aus um fortzufahren",
Expand All @@ -171,7 +171,7 @@
"mass-editor-search-not-found": "Keine Einstellung gefunden, Überlegen Sie die Suchabfrage zu ändern",
"mass-editor-values": "Ausgewählte Konfigurations{PLURAL:n|Eigenschaft|Eigenschaften} bearbeiten",
"multiple-games": "Mehrere Spiele",
"name-description": "Typ <code>string</code> ohne Standardwert. Diese Eigenschaft (Property) ist erforderlich und definiert den Bot-Namen; er wird nur zur Identifizierung innerhalb von ASF verwendet und muss für jeden Bot der einzigartig sein.",
"name-description": "Typ <code>string</code> ohne Standardwert. Diese Variable ist erforderlich und definiert den Bot-Namen; er wird nur zur Identifizierung innerhalb von ASF verwendet und muss für jeden Bot der einzigartig sein.",
"next": "Weiter",
"none": "Keine",
"notification-position": "Benachrichtigungsposition",
Expand Down Expand Up @@ -212,7 +212,7 @@
"settings-saved": "Einstellungen gespeichert!",
"setup": "Einrichtung",
"setup-authenticated": "Alles konfiguriert. Weiterleiten...",
"setup-description": "Bitte geben Sie ihr IPC-Passwort ein",
"setup-description": "Bitte geben Sie Ihr IPC-Passwort ein",
"setup-gateway-timeout": "Gateway-Zeitüberschreitung. Es wird versucht, die Verbindung in {PLURAL:n|{n} Sekunde|{n} Sekunden} wiederherzustellen...",
"setup-network-error": "Verbindung zu ASF verloren. Es wird versucht, die Verbindung in {PLURAL:n|{n} Sekunde|{n} Sekunden} wiederherzustellen...",
"setup-no-ipc-password": "Sie haben vergessen <code>IPCPassword</code> in der ASF-Einstellung zu konfigurieren. Weiteres hierzu lesen Sie <a target='_blank' rel='noreferrer noopener' href='https://github.com/JustArchiNET/ArchiSteamFarm/wiki/IPC-de-DE#why-am-i-getting-403-forbidden-error-when-not-using-ipcpassword'>hier</a>.",
Expand Down
4 changes: 2 additions & 2 deletions ArchiSteamFarm/ASF-ui/src/utils/loadParameterDescriptions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ export default async function loadParameterDescriptions(version, locale) {

const configWiki = await fetchWiki('Configuration', version, locale);
const virtualDOM = createVirtualDOM(configWiki);
const parametersHTML = Array.from(virtualDOM.querySelectorAll('h3 > a > code'));
const parametersHTML = Array.from(virtualDOM.querySelectorAll('h3 > code'));

parametersHTML.forEach(parameterHTML => {
const parameterName = parameterHTML.innerText;

const parameterDescription = [];
let description = parameterHTML.parentElement.parentElement.nextElementSibling;
let description = parameterHTML.parentElement.nextElementSibling;

while (description && description.tagName.toLowerCase() !== 'hr') {
const wikiLinks = description.querySelectorAll('a[href^="#"]');
Expand Down
7 changes: 0 additions & 7 deletions ...hiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm.csproj" ExcludeAssets="all" Private="false" />
</ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions ArchiSteamFarm/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
using System;
using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using ArchiSteamFarm.Web;
using ArchiSteamFarm.Web.Responses;
Expand All @@ -34,12 +35,12 @@ namespace ArchiSteamFarm.CustomPlugins.ExamplePlugin;
internal static class CatAPI {
private const string URL = "https://api.thecatapi.com";

internal static async Task<Uri?> GetRandomCatURL(WebBrowser webBrowser) {
internal static async Task<Uri?> GetRandomCatURL(WebBrowser webBrowser, CancellationToken cancellationToken = default) {
ArgumentNullException.ThrowIfNull(webBrowser);

Uri request = new($"{URL}/v1/images/search");

ObjectResponse<ImmutableList<MeowResponse>>? response = await webBrowser.UrlGetToJsonObject<ImmutableList<MeowResponse>>(request).ConfigureAwait(false);
ObjectResponse<ImmutableList<MeowResponse>>? response = await webBrowser.UrlGetToJsonObject<ImmutableList<MeowResponse>>(request, cancellationToken: cancellationToken).ConfigureAwait(false);

return response?.Content?.FirstOrDefault()?.URL;
}
Expand Down
9 changes: 6 additions & 3 deletions ArchiSteamFarm/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

using System;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using ArchiSteamFarm.Core;
using ArchiSteamFarm.IPC.Controllers.Api;
Expand All @@ -38,14 +39,16 @@ public sealed class CatController : ArchiController {
/// Fetches URL of a random cat picture.
/// </summary>
[HttpGet]
[ProducesResponseType(typeof(GenericResponse<Uri>), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.ServiceUnavailable)]
[ProducesResponseType<GenericResponse<Uri>>((int) HttpStatusCode.OK)]
[ProducesResponseType<GenericResponse>((int) HttpStatusCode.ServiceUnavailable)]
public async Task<ActionResult<GenericResponse>> CatGet() {
if (ASF.WebBrowser == null) {
throw new InvalidOperationException(nameof(ASF.WebBrowser));
}

Uri? url = await CatAPI.GetRandomCatURL(ASF.WebBrowser).ConfigureAwait(false);
CancellationToken cancellationToken = HttpContext.RequestAborted;

Uri? url = await CatAPI.GetRandomCatURL(ASF.WebBrowser, cancellationToken).ConfigureAwait(false);

return url != null ? Ok(new GenericResponse<Uri>(url)) : StatusCode((int) HttpStatusCode.ServiceUnavailable, new GenericResponse(false));
}
Expand Down
5 changes: 0 additions & 5 deletions ...rm/ArchiSteamFarm.CustomPlugins.PeriodicGC/ArchiSteamFarm.CustomPlugins.PeriodicGC.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm.csproj" ExcludeAssets="all" Private="false" />
</ItemGroup>
Expand Down
11 changes: 0 additions & 11 deletions ...eamFarm.CustomPlugins.SignInWithSteam/ArchiSteamFarm.CustomPlugins.SignInWithSteam.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,6 @@
<PackageReference Include="System.Composition.AttributedModel" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<Reference Include="System.Net.Http" HintPath="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8.1\System.Net.Http.dll" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm.csproj" ExcludeAssets="all" Private="false" />
</ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion ArchiSteamFarm/ArchiSteamFarm.CustomPlugins.SignInWithSteam/Data/SignInWithSteamResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@ public sealed class SignInWithSteamResponse {
[JsonProperty(Required = Required.Always)]
public Uri ReturnURL { get; private set; }

internal SignInWithSteamResponse(Uri returnURL) => ReturnURL = returnURL ?? throw new ArgumentNullException(nameof(returnURL));
internal SignInWithSteamResponse(Uri returnURL) {
ArgumentNullException.ThrowIfNull(returnURL);

ReturnURL = returnURL;
}
}
11 changes: 4 additions & 7 deletions ArchiSteamFarm/ArchiSteamFarm.CustomPlugins.SignInWithSteam/SignInWithSteamController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,11 @@ namespace ArchiSteamFarm.CustomPlugins.SignInWithSteam;
[Route("/Api/Bot/{botName:required}/SignInWithSteam")]
public sealed class SignInWithSteamController : ArchiController {
[HttpPost]
[ProducesResponseType(typeof(GenericResponse<SignInWithSteamResponse>), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.ServiceUnavailable)]
[ProducesResponseType<GenericResponse<SignInWithSteamResponse>>((int) HttpStatusCode.OK)]
[ProducesResponseType<GenericResponse>((int) HttpStatusCode.BadRequest)]
[ProducesResponseType<GenericResponse>((int) HttpStatusCode.ServiceUnavailable)]
public async Task<ActionResult<GenericResponse>> Post(string botName, [FromBody] SignInWithSteamRequest request) {
if (string.IsNullOrEmpty(botName)) {
throw new ArgumentNullException(nameof(botName));
}

ArgumentException.ThrowIfNullOrEmpty(botName);
ArgumentNullException.ThrowIfNull(request);

Bot? bot = Bot.GetBot(botName);
Expand Down
9 changes: 0 additions & 9 deletions ...SteamFarm.OfficialPlugins.ItemsMatcher/ArchiSteamFarm.OfficialPlugins.ItemsMatcher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@
<PackageReference Include="System.Linq.Async" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">
<!-- Madness is already included in netf build of ASF, so we don't need to emit it ourselves -->
<PackageReference Update="JustArchiNET.Madness" IncludeAssets="compile" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<Reference Include="System.Net.Http" HintPath="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8.1\System.Net.Http.dll" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm.csproj" ExcludeAssets="all" Private="false" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 2c85933

Please sign in to comment.