Compare commits

..

No commits in common. "master" and "1.1.0.5" have entirely different histories.

10 changed files with 19 additions and 162 deletions

View File

@ -1,9 +0,0 @@
version: 2
updates:
- package-ecosystem: nuget
directory: "/"
schedule:
interval: daily
time: "02:00"
open-pull-requests-limit: 10
target-branch: "develop"

View File

@ -1,40 +0,0 @@
name: SteamPathsLib - develop
on:
push:
branches: [ develop ]
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
jobs:
build:
runs-on: windows-latest
steps:
- name: Set the value
run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
- name: Checkout Code
uses: actions/checkout@master
with:
clean: true
fetch-depth: 0
lfs: true
submodules: true
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true
msbuild-architecture: x86
- name: Setup NuGet
uses: NuGet/setup-nuget@v1
- name: Restore NuGet Packages
run: nuget restore src/EpicMorg.SteamPathsSolution.sln
- name: Build Debug
run: msbuild src/EpicMorg.SteamPathsSolution.sln /p:Configuration=Debug

View File

@ -1,40 +0,0 @@
name: SteamPathsLib - master
on:
push:
branches: [ master ]
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
jobs:
build:
runs-on: windows-latest
steps:
- name: Set the value
run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
- name: Checkout Code
uses: actions/checkout@master
with:
clean: true
fetch-depth: 0
lfs: true
submodules: true
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true
msbuild-architecture: x86
- name: Setup NuGet
uses: NuGet/setup-nuget@v1
- name: Restore NuGet Packages
run: nuget restore src/EpicMorg.SteamPathsSolution.sln
- name: Build Release
run: msbuild src/EpicMorg.SteamPathsSolution.sln /p:Configuration=Release

View File

@ -1,43 +0,0 @@
name: SteamPathsLib - pull request to master
on:
pull_request:
branches: [ master ]
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
jobs:
build:
runs-on: windows-latest
steps:
- name: Set the value
run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
- name: Checkout Code
uses: actions/checkout@master
with:
clean: true
fetch-depth: 0
lfs: true
submodules: true
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true
msbuild-architecture: x86
- name: Setup NuGet
uses: NuGet/setup-nuget@v1
- name: Restore NuGet Packages
run: nuget restore src/EpicMorg.SteamPathsSolution.sln
- name: Build Debug
run: msbuild src/EpicMorg.SteamPathsSolution.sln /p:Configuration=Debug
- name: Build Release
run: msbuild src/EpicMorg.SteamPathsSolution.sln /p:Configuration=Release

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Net.Sdk">
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<ApplicationIcon>steam.ico</ApplicationIcon>
<TargetFrameworks>net46;net461;net462;net47;net471;net472;net48;netstandard1.3;netcoreapp3.1</TargetFrameworks>
@ -9,24 +9,23 @@
<PackageIcon>steam.png</PackageIcon>
<PackageProjectUrl>https://github.com/EpicMorg/SteamPathsLib</PackageProjectUrl>
<Copyright>Copyright © EpicMorg 2020</Copyright>
<AssemblyVersion>1.1.0.6</AssemblyVersion>
<FileVersion>1.1.0.6</FileVersion>
<Version>1.1.0.6</Version>
<AssemblyVersion>1.1.0.5</AssemblyVersion>
<FileVersion>1.1.0.5</FileVersion>
<Version>1.1.0.5</Version>
<Description>Small helper for getting some registry keys of Steam.</Description>
<SignAssembly>False</SignAssembly>
<Authors>EpicMorgDev, AurZum, stam, kasthack</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<PackageTags>steam epicmorg registry path helper vdf</PackageTags>
<PackageReleaseNotes>Some of fixes</PackageReleaseNotes>
<PackageReleaseNotes>Code review and optimizations, dotNetCore support</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<None Include="steam.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Gameloop.Vdf" Version="0.6.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Gameloop.Vdf" Version="0.5.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<None Include="steam.ico">
<Pack>True</Pack>

View File

@ -85,25 +85,15 @@
libraryPaths.Add(Path.Combine(steamPath, "steamapps"));
try {
dynamic configObject = VdfConvert.Deserialize(File.ReadAllText(configPath)).Value;
dynamic valve;
dynamic configObject = VdfConvert.Deserialize(File.ReadAllText(configPath)).Value;
var configLibraryPaths = ((VObject)configObject.Software.Valve.Steam)
.Children()
.Where(item => item.Key.StartsWith("BaseInstallFolder"))
.Select(item => item.Value.ToString())
.Select(line => new DirectoryInfo(line).FullName)
.Select(line => Path.Combine(line, "steamapps"));
try {
valve = configObject.Software.Valve;
} catch {
valve = configObject.Software.valve;
}
var configLibraryPaths = ((VObject)valve.Steam)
.Children()
.Where(item => item.Key.StartsWith("BaseInstallFolder"))
.Select(item => item.Value.ToString())
.Select(line => new DirectoryInfo(line).FullName)
.Select(line => Path.Combine(line, "steamapps"));
libraryPaths.AddRange(configLibraryPaths);
} catch { }
libraryPaths.AddRange(configLibraryPaths);
result.SteamLibraryFolders = libraryPaths.ToArray();

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
</configuration>

View File

@ -19,7 +19,7 @@ namespace SteamTest.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

View File

@ -12,7 +12,7 @@ namespace SteamTest.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

View File

@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SteamTest</RootNamespace>
<AssemblyName>SteamTest</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />