Fixed fody, prepped 1.0.3, fixed camelcase steamapps path

DjScribbles · Apr 23, 2021 · ad4b4a5 · ad4b4a5
1 parent 53e733d
commit ad4b4a5
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -243,3 +243,4 @@ _Pvt_Extensions
 # JetBrains Rider
 .idea/
 *.sln.iml
+Installer/SupaBatcha.bat
diff --git a/GamePipe.sln b/GamePipe.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GamePipe", "GamePipe\GamePipe.csproj", "{1F4E9DC4-9772-4EC5-84DA-0791811D49AE}"
 EndProject
@@ -16,6 +16,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WingmanLib", "WingmanLib\Wi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wingman", "Wingman\Wingman.csproj", "{C5AFCADF-2E58-4067-951F-B1366C49735B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43B2CB82-201F-440A-8BA1-6FA16378FDA7}"
+	ProjectSection(SolutionItems) = preProject
+		Installer\GamePipe_Installer.iss = Installer\GamePipe_Installer.iss
+		Installer\SupaBatcha.bat = Installer\SupaBatcha.bat
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,4 +52,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {70715DEE-1A1C-48F6-A27B-8D7E5B8FC17D}
+	EndGlobalSection
 EndGlobal
diff --git a/GamePipe/FodyWeavers.xml b/GamePipe/FodyWeavers.xml
@@ -1,2 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"></Weavers>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>
diff --git a/GamePipe/GamePipe.csproj b/GamePipe/GamePipe.csproj
@@ -371,12 +371,12 @@ foreach (var item in filesToCleanup)
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.6.5.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.3.0\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
   </Target>
-  <Import Project="..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/GamePipe/Properties/AssemblyInfo.cs b/GamePipe/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GamePipeLib/Model/Steam/Root.cs b/GamePipeLib/Model/Steam/Root.cs
@@ -106,7 +106,7 @@ public ObservableCollection<SteamLibrary> Libraries
         private IEnumerable<SteamLibrary> DiscoverLibraries()
         {
 
-            var steamApps = Path.Combine(SteamDirectory, "SteamApps");
+            var steamApps = Path.Combine(SteamDirectory, "steamapps");
             Regex libraryRegex = new Regex("^\\s*\"\\d+\"\\s*\"(?'path'.*)\"\\s*$", RegexOptions.Multiline);
             var libraryFile = Path.Combine(steamApps, "libraryfolders.vdf");
             List<SteamLibrary> result = new List<SteamLibrary>();
@@ -126,7 +126,7 @@ private IEnumerable<SteamLibrary> DiscoverLibraries()
                 var matches = libraryRegex.Matches(contents);
                 foreach (Match match in matches)
                 {
-                    dynamic path = Path.Combine(match.Groups["path"].Value.Replace("\\\\", "\\"), "SteamApps");
+                    dynamic path = Path.Combine(match.Groups["path"].Value.Replace("\\\\", "\\"), "steamapps");
                     if (Directory.Exists(path))
                     {
                         result.Add(new SteamLibrary(path));
@@ -211,7 +211,7 @@ public void AddLibrary(string path)
                 Utils.Logging.Logger.Info($"Adding library: {path}");
                 GamePipeLib.Utils.SteamDirParsingUtils.SetupNewSteamLibrary(path);
                 SteamRestartRequired = true;
-                var libraryDirectory = Path.Combine(path, "SteamApps");
+                var libraryDirectory = Path.Combine(path, "steamapps");
                 if (!Directory.Exists(libraryDirectory)) Directory.CreateDirectory(libraryDirectory);
                 _Libraries.Add(new SteamLibrary(libraryDirectory));
                 NotifyPropertyChanged("Libraries");
@@ -221,8 +221,8 @@ public void RemoveLibrary(SteamLibrary archive)
         {
             _Libraries.Remove(archive);
             var path = archive.SteamDirectory;
-            if (path.EndsWith(@"\SteamApps", StringComparison.OrdinalIgnoreCase))
-                path = path.Substring(0, path.Length - @"\SteamApps".Length);
+            if (path.EndsWith(@"\steamapps", StringComparison.OrdinalIgnoreCase))
+                path = path.Substring(0, path.Length - @"\steamapps".Length);
             GamePipeLib.Utils.SteamDirParsingUtils.RemoveSteamLibrary(path);
         }
 

diff --git a/GamePipeLib/Properties/AssemblyInfo.cs b/GamePipeLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GamePipeService/Properties/AssemblyInfo.cs b/GamePipeService/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 [assembly: AssemblyFileVersion("1.0")]
diff --git a/Installer/GamePipe_Installer.iss b/Installer/GamePipe_Installer.iss
@@ -3,7 +3,7 @@
 #include <idp.iss>
 
 #define MyAppName "Game Pipe"
-#define MyAppVersion "1.0.2"
+#define MyAppVersion "1.0.3"
 #define MyAppPublisher "Joe Shaw"
 #define MyAppExeName "GamePipe.exe"
 
@@ -19,7 +19,7 @@ AppPublisher={#MyAppPublisher}
 DefaultDirName={pf}\GamePipe
 DisableProgramGroupPage=yes
 LicenseFile=..\LICENSE.txt
-OutputBaseFilename=GamePipe_Installer
+OutputBaseFilename=GamePipe_Installer_{#MyAppVersion}
 SetupIconFile=..\GamePipe\Resources\GamePipe.ico
 Compression=lzma
 SolidCompression=yes

diff --git a/Wingman/FodyWeavers.xml b/Wingman/FodyWeavers.xml
@@ -1,2 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"></Weavers>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>
diff --git a/Wingman/Properties/AssemblyInfo.cs b/Wingman/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Wingman/Wingman.csproj b/Wingman/Wingman.csproj
@@ -264,12 +264,12 @@ foreach (var item in filesToCleanup)
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.6.5.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.3.0\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
   </Target>
-  <Import Project="..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Import Project="..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.3.0\build\Costura.Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/WingmanLib/Properties/AssemblyInfo.cs b/WingmanLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyVersion("1.0.3.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]