glax/CShock
1
0
Fork 0
Code Releases Wiki Activity

Compare commits

base: glax:c55592cd90d84b1f6cad703b4be15d8d2a05575f
Branches Tags
glax:master
...
compare: glax:385dba1cf3bfb58135670d6d4a64830b8e251c53
Branches Tags
glax:master

2 Commits
c55592cd90 ... 385dba1cf3

Author SHA1 Message Date
glax
385dba1cf3 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	CShocker/Devices/Additional/ApiHttpClient.cs
 2025-01-16 21:47:48 +01:00
glax
1ff67a5b8b Fix Assembly string empty on Publish 2025-01-16 21:46:13 +01:00
2 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
CShocker/CShocker.csproj
View File

@ -6,7 +6,7 @@
<Authors>Glax</Authors> <Authors>Glax</Authors>
<RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl> <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<Version>3.0.1</Version> <Version>3.0.2</Version>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks> <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latestmajor</LangVersion> <LangVersion>latestmajor</LangVersion>
<PackageProjectUrl>https://github.com/C9Glax/CShocker</PackageProjectUrl> <PackageProjectUrl>https://github.com/C9Glax/CShocker</PackageProjectUrl>

8
CShocker/Devices/Additional/ApiHttpClient.cs
View File

@ -13,15 +13,19 @@ public static class ApiHttpClient
private static ProductInfoHeaderValue GetUserAgent() private static ProductInfoHeaderValue GetUserAgent()
{ {
Assembly assembly = Assembly.GetExecutingAssembly(); Assembly assembly = Assembly.GetExecutingAssembly();
FileVersionInfo fvi;
if (assembly.Location == String.Empty) if (assembly.Location == String.Empty)
{ {
DirectoryInfo dir = new (AppContext.BaseDirectory); DirectoryInfo dir = new (AppContext.BaseDirectory);
FileInfo? f = dir.GetFiles("*.exe").FirstOrDefault(); FileInfo? f = dir.GetFiles("*.exe").FirstOrDefault();
if (f is null) if (f is null)
return new("CShocker", "Release"); return new("CShocker", "Release");
assembly = Assembly.LoadFrom(f.FullName); fvi = FileVersionInfo.GetVersionInfo(f.FullName);
}
else
{
fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
} }
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
return new (fvi.ProductName ?? fvi.FileName, fvi.ProductVersion); return new (fvi.ProductName ?? fvi.FileName, fvi.ProductVersion);
} }