Merge pull request #7 from EpicMorg/develop

Develop

CHANGELOG.md

@@ -4,3 +4,9 @@
   * Added new info about steam and steam application
 * `1.1.0.1` Whats new:
   * Add info directly from Steam
+* `1.1.0.2` Whats new:
+  * Fixed catching exceptions
+* `1.1.0.3` Whats new:
+  * Fixed loading appmanifest data if we have an invalid *.acf.
+* `1.1.0.4` Whats new:
+  * Code review and optimizations, dotNetCore support

src/EpicMorg.SteamPathsLib/EpicMorg.SteamPathsLib.csproj

@@ -1,66 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E34AE985-7C7E-49BA-A2B0-70D88F865265}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EpicMorg.SteamPathsLib</RootNamespace>
-    <AssemblyName>EpicMorg.SteamPathsLib</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
+<Project Sdk="Microsoft.Net.Sdk">
   <PropertyGroup>
     <ApplicationIcon>steam.ico</ApplicationIcon>
+    <TargetFrameworks>net46;net461;net462;net47;net471;net472;net48;netstandard1.3;netcoreapp3.1</TargetFrameworks> 
+    <Company>EpicMorg</Company>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> 
+    <RepositoryUrl>https://github.com/EpicMorg/SteamPathsLib</RepositoryUrl>
+    <PackageIcon>steam.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/EpicMorg/SteamPathsLib</PackageProjectUrl>
+    <Copyright>Copyright © EpicMorg 2020</Copyright>
+    <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>
+    <Authors>EpicMorgDev, AurZum, stam, kasthack</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>steam epicmorg registry path helper vdf</PackageTags>
+    <PackageReleaseNotes>Code review and optimizations, dotNetCore support</PackageReleaseNotes> 
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Model\ActiveProcessSteamRegistryData.cs" />
-    <Compile Include="Model\ConfigSteamData.cs" />
-    <Compile Include="Model\LibrarySteamData.cs" />
-    <Compile Include="Model\SteamAppManifestData.cs" />
-    <Compile Include="Model\SteamAppRegistryData.cs" />
-    <Compile Include="Model\SteamRegistryData.cs" />
-    <Compile Include="SteamPathsUtil.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="steam.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Gameloop.Vdf">
-      <Version>0.5.0</Version>
+    <None Include="steam.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <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>
+    </None>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/EpicMorg.SteamPathsLib/Model/ActiveProcessSteamRegistryData.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EpicMorg.SteamPathsLib.Model
+namespace EpicMorg.SteamPathsLib.Model
 {
     public class ActiveProcessSteamRegistryData
     {
-        public string RegistryKey;
+        public string RegistryKey { get; set; }
 
-        public int PID;
+        public int PID { get; set; }
     }
 }

src/EpicMorg.SteamPathsLib/Model/ConfigSteamData.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EpicMorg.SteamPathsLib.Model {
-    public class ConfigSteamData {
-        public string[] SteamLibraryFolders;
+namespace EpicMorg.SteamPathsLib.Model
+{
+    public class ConfigSteamData
+    {
+        public string[] SteamLibraryFolders { get; set; }
     }
 }

src/EpicMorg.SteamPathsLib/Model/LibrarySteamData.cs

@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace EpicMorg.SteamPathsLib.Model
+{
+    using System.Collections.Generic;
 
-namespace EpicMorg.SteamPathsLib.Model {
-    public class LibrarySteamData {
-        public string Path;
+    public class LibrarySteamData
+    {
+        public List<SteamAppManifestData> AppManifestDataList { get; set; }
 
-        public List<SteamAppManifestData> AppManifestDataList;
+        public string Path { get; set; }
     }
 }

src/EpicMorg.SteamPathsLib/Model/SteamAppManifestData.cs

@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace EpicMorg.SteamPathsLib.Model
+{
+    public class SteamAppManifestData
+    {
+        public int AppId { get; set; }
 
-namespace EpicMorg.SteamPathsLib.Model {
-    public class SteamAppManifestData {
-        public int AppId;
-        public string Name;
-        public string InstallDir;
+        public string Name { get; set; }
 
-        public string Path;
+        public string InstallDir { get; set; }
+
+        public string Path { get; set; }
     }
 }

src/EpicMorg.SteamPathsLib/Model/SteamAppRegistryData.cs

@@ -1,20 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EpicMorg.SteamPathsLib.Model
+namespace EpicMorg.SteamPathsLib.Model
 {
     public class SteamAppRegistryData
     {
-        public string RegistryKey;
-        public string Name;
+        public bool Installed { get; set; }
+
+        public bool Running { get; set; }
+
+        public bool Updating { get; set; }
+
+        public int AppId { get; set; }
 
-        public int AppId;
+        public string Name { get; set; }
 
-        public bool Installed;
-        public bool Runnig;
-        public bool Updating;
+        public string RegistryKey { get; set; }
     }
 }

src/EpicMorg.SteamPathsLib/Model/SteamRegistryData.cs

@@ -1,26 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EpicMorg.SteamPathsLib.Model
+namespace EpicMorg.SteamPathsLib.Model
 {
     public class SteamRegistryData
     {
-        public string RegistryKey;
-        public string LastGameNameUsed;
-        public string SourceModInstallPath;
-        public string SteamExe;
-        public string SteamPath;
-        public string Language;
-        public string PseudoUUID;
-        public string ModInstallPath;
+        public string RegistryKey { get; set; }
+
+        public string LastGameNameUsed { get; set; }
+
+        public string SourceModInstallPath { get; set; }
+
+        public string SteamExe { get; set; }
+
+        public string SteamPath { get; set; }
+
+        public string Language { get; set; }
+
+        public string PseudoUUID { get; set; }
+
+        public string ModInstallPath { get; set; }
 
-        public int RunningAppID;
+        public int RunningAppID { get; set; }
 
-        public bool AlreadyRetriedOfflineMode;
-        public bool RememberPassword;
+        public bool AlreadyRetriedOfflineMode { get; set; }
 
+        public bool RememberPassword { get; set; }
     }
 }