Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

env:
PLUGIN_NAME: "CS2Interface"
DOTNET_SDK_VERSION: 9.0
DOTNET_SDK_VERSION: 10.0

jobs:
publish:
Expand Down
2 changes: 1 addition & 1 deletion ArchiSteamFarm
Submodule ArchiSteamFarm updated 129 files
7 changes: 4 additions & 3 deletions CS2Interface/CS2Interface.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@

<PropertyGroup>
<Authors>Citrinate</Authors>
<AssemblyVersion>1.1.1.8</AssemblyVersion>
<AssemblyVersion>1.1.2.0</AssemblyVersion>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Deterministic>true</Deterministic>
<CoreCompileDependsOn>PrepareResources;$(CompileDependsOn)</CoreCompileDependsOn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.24508.2" PrivateAssets="all" />
<PackageReference Include="System.Composition.AttributedModel" Version="9.0.6" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" IncludeAssets="compile" />
<PackageReference Include="System.Composition.AttributedModel" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions CS2Interface/GameData/GameDataResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ internal GameDataResource(string url) {
Dictionary<string, string> kvp = new();
using (Stream response = await httpClient.GetStreamAsync(Url).ConfigureAwait(false)) {
using (StreamReader sr = new StreamReader(response)) {
// https://github.com/dotnet/runtime/issues/68983
while (!sr.EndOfStream) {
string[]? kv = sr.ReadLine()?.Split("=");
if (kv?.Length == 2) {
string? line;
while ((line = await sr.ReadLineAsync().ConfigureAwait(false)) != null) {
string[] kv = line.Split("=");
if (kv.Length == 2) {
kvp[kv[0]] = kv[1];
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if exist out rmdir /Q /S out

rem release generic version

dotnet publish CS2Interface -c "Release" -f "net9.0" -o "out/generic" "/p:LinkDuringPublish=false"
dotnet publish CS2Interface -c "Release" -f "net10.0" -o "out/generic" "/p:LinkDuringPublish=false"
mkdir .\out\%CurrDirName%
copy .\out\generic\%CurrDirName%.dll .\out\%CurrDirName%
rem comment section below (downto :zip label) if you don't want to include documentation
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fi
## release generic version
dotnet restore
sync
dotnet publish CS2Interface -c "Release" -f net9.0 -o "out/generic" "/p:LinkDuringPublish=false"
dotnet publish CS2Interface -c "Release" -f net10.0 -o "out/generic" "/p:LinkDuringPublish=false"
mkdir ./out/$plugin_name
cp ./out/generic/$plugin_name.dll ./out/$plugin_name
( cd ./out/generic ; cp --parents ./*/$plugin_name.resources.dll ../../out/$plugin_name || : )
Expand Down