Fixes Commits not happening for modifications and deletions (#77)

* Fix modifications and deletions not triggering commits * Version bump to 3.0.85.1
tgstation · Jun 23, 2017 · f76973f · f76973f
1 parent 4f8a848
commit f76973f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/TGCommandLine/Properties/AssemblyInfo.cs b/TGCommandLine/Properties/AssemblyInfo.cs
@@ -22,5 +22,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.85.0")]
-[assembly: AssemblyFileVersion("3.0.85.0")]
+[assembly: AssemblyVersion("3.0.85.1")]
+[assembly: AssemblyFileVersion("3.0.85.1")]
diff --git a/TGControlPanel/Properties/AssemblyInfo.cs b/TGControlPanel/Properties/AssemblyInfo.cs
@@ -25,5 +25,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("3.0.85.0")]
-[assembly: AssemblyFileVersion("3.0.85.0")]
+[assembly: AssemblyVersion("3.0.85.1")]
+[assembly: AssemblyFileVersion("3.0.85.1")]
diff --git a/TGInstallerWrapper/Properties/AssemblyInfo.cs b/TGInstallerWrapper/Properties/AssemblyInfo.cs
@@ -25,5 +25,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("3.0.85.0")]
-[assembly: AssemblyFileVersion("3.0.85.0")]
+[assembly: AssemblyVersion("3.0.85.1")]
+[assembly: AssemblyFileVersion("3.0.85.1")]
diff --git a/TGInstallerWrapper/TGInstallerWrapper.csproj b/TGInstallerWrapper/TGInstallerWrapper.csproj
@@ -76,9 +76,6 @@
       <Name>TGServiceInterface</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="tgs.ico" />
   </ItemGroup>

diff --git a/TGServerService/Properties/AssemblyInfo.cs b/TGServerService/Properties/AssemblyInfo.cs
@@ -25,5 +25,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("3.0.85.0")]
-[assembly: AssemblyFileVersion("3.0.85.0")]
+[assembly: AssemblyVersion("3.0.85.1")]
+[assembly: AssemblyFileVersion("3.0.85.1")]
diff --git a/TGServerService/Repository.cs b/TGServerService/Repository.cs
@@ -685,7 +685,10 @@ string Commit()
 					Commands.Stage(Repo, "html/changelog.html");
 					Commands.Stage(Repo, "html/changelogs/*");
 
-					if (Repo.RetrieveStatus().Added.Count() == 0)   //nothing to commit
+					var status = Repo.RetrieveStatus();
+					var sum = status.Added.Count() + status.Removed.Count() + status.Modified.Count();
+
+					if (sum == 0)   //nothing to commit
 						return null;
 
 					// Create the committer's signature and commit

diff --git a/TGServiceInstaller/Product.wxs b/TGServiceInstaller/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="TG Station Server" Language="1033" Version="3.0.85.0" Manufacturer="/tg/station 13" UpgradeCode="663badae-ddca-4aa9-8f3f-3b7b20332eac">
+  <Product Id="*" Name="TG Station Server" Language="1033" Version="3.0.85.1" Manufacturer="/tg/station 13" UpgradeCode="663badae-ddca-4aa9-8f3f-3b7b20332eac">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

diff --git a/TGServiceInterface/Properties/AssemblyInfo.cs b/TGServiceInterface/Properties/AssemblyInfo.cs
@@ -25,5 +25,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("3.0.85.0")]
-[assembly: AssemblyFileVersion("3.0.85.0")]
+[assembly: AssemblyVersion("3.0.85.1")]
+[assembly: AssemblyFileVersion("3.0.85.1")]