Skip to content

Commit cc22e2c

Browse files
committed
fix few API related issues, add build workflow
1 parent 8aad602 commit cc22e2c

File tree

5 files changed

+1179
-1119
lines changed

5 files changed

+1179
-1119
lines changed

.github/workflows/build.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Build C# Projects
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
build:
11+
runs-on: windows-latest
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
17+
- name: Setup .NET
18+
uses: actions/setup-dotnet@v4
19+
with:
20+
dotnet-version: '8.0.x'
21+
22+
- name: Restore dependencies
23+
run: dotnet restore
24+
25+
- name: Build solution
26+
run: dotnet build --no-restore --configuration Release
27+
28+
- name: Publish FloatTool project
29+
run: dotnet publish ./FloatTool/FloatTool.csproj --configuration Release /p:PublishProfile=FolderProfile --output ./publish
30+
31+
- name: Upload published artifacts
32+
uses: actions/upload-artifact@v4
33+
with:
34+
name: FloatTool-publish
35+
path: ./publish

FloatTool/Common/Utils.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,13 @@ public static partial class Utils
109109
/// </summary>
110110
public static void GetApiUrl()
111111
{
112-
string global_settings_url = "https://raw.githubusercontent.com/Prevter/Prevter/main/globals.json";
113-
string global_settings = Client.GetStringAsync(global_settings_url).Result;
114-
dynamic json = JsonConvert.DeserializeObject(global_settings);
115-
HOME_URL = json["home_url"] + "floattool";
116-
API_URL = json["home_url"] + "api/floattool";
112+
//string global_settings_url = "https://raw.githubusercontent.com/Prevter/Prevter/main/globals.json";
113+
//string global_settings = Client.GetStringAsync(global_settings_url).Result;
114+
//dynamic json = JsonConvert.DeserializeObject(global_settings);
115+
//HOME_URL = json["home_url"] + "floattool";
116+
//API_URL = json["home_url"] + "api/floattool";
117+
HOME_URL = "https://prevter.me/floattool";
118+
API_URL = "https://api.prevter.me/api/floattool";
117119
}
118120

119121
public static async Task<double> GetWearFromInspectURL(string inspect_url)
@@ -129,9 +131,6 @@ public static async Task<double> GetWearFromInspectURL(string inspect_url)
129131
var request = new HttpRequestMessage(HttpMethod.Get, url);
130132

131133
if (AppHelpers.Settings.FloatAPI == FloatAPI.CSFloat) {
132-
request.Version = HttpVersion.Version30;
133-
request.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
134-
135134
request.Headers.Add("authority", "api.csgofloat.com");
136135
request.Headers.Add("accept", "*/*");
137136
request.Headers.Add("accept-language", "uk");
@@ -142,7 +141,7 @@ public static async Task<double> GetWearFromInspectURL(string inspect_url)
142141
request.Headers.Add("sec-fetch-mode", "cors");
143142
request.Headers.Add("sec-fetch-site", "cross-site");
144143
request.Headers.Add("sec-gpc", "1");
145-
request.Headers.Add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36");
144+
request.Headers.Add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36");
146145
}
147146

148147
var result = await Client.SendAsync(request);

FloatTool/FloatTool.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<PlatformTarget>x64</PlatformTarget>
88
<Authors>Prevter</Authors>
9-
<PackageProjectUrl>https://prevter.tk/floattool</PackageProjectUrl>
9+
<PackageProjectUrl>https://prevter.me/floattool</PackageProjectUrl>
1010
<RepositoryUrl>https://github.com/prevter/floattool</RepositoryUrl>
1111
<NeutralLanguage>en</NeutralLanguage>
12-
<AssemblyVersion>1.5.0</AssemblyVersion>
12+
<AssemblyVersion>1.5.1</AssemblyVersion>
1313
<FileVersion>$(AssemblyVersion)</FileVersion>
1414
<ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
1515
<DebugType>embedded</DebugType>
1616
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
1717
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
1818
<Nullable>enable</Nullable>
19+
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
1920
</PropertyGroup>
2021

2122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -44,7 +45,7 @@
4445

4546
<ItemGroup>
4647
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
47-
<PackageReference Include="log4net" Version="2.0.17" />
48+
<PackageReference Include="log4net" Version="3.1.0" />
4849
<PackageReference Include="MdXaml_migfree" Version="1.15.0" />
4950
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
5051
</ItemGroup>

0 commit comments

Comments
 (0)