1.4.0a2 Merge #23

Merged
Hesham merged 16 commits from release/1.4 into master 2018-09-20 10:35:46 +02:00
5 changed files with 8 additions and 16 deletions
Showing only changes of commit a1ee527747 - Show all commits

View File

@ -13,7 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>false</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled> <UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode> <UpdateMode>Foreground</UpdateMode>

View File

@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Deployment.Application;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using System.Deployment.Application; using System.Deployment.Application;
@ -22,7 +18,7 @@ namespace OWTrack
Application.Run(new MainForm()); Application.Run(new MainForm());
} }
public static string Version = "1.4.0a1"; public static string Version { get; } = "1.4.0a1";
//public static string Version = Application.ProductVersion; //public static string Version = Application.ProductVersion;
//public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; //public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;

View File

@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("OWTrack")] [assembly: AssemblyTitle("OWTrack")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("Shitty SR Tracker")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Hesham Systems LLC")] [assembly: AssemblyCompany("Hesham Systems LLC")]
[assembly: AssemblyProduct("OWTrack")] [assembly: AssemblyProduct("OWTrack")]
@ -35,8 +35,8 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.*")] [assembly: AssemblyVersion("1.3.0.3")]
[assembly: AssemblyFileVersion("1.2.0.0")] [assembly: AssemblyFileVersion("1.3.0.3")]
[assembly: NeutralResourcesLanguage("")] [assembly: NeutralResourcesLanguage("")]

View File

@ -31,17 +31,13 @@ namespace OWTrack
.FirstOrDefault(p => p.MainModule.FileName.StartsWith(gamePath)) != default(Process); .FirstOrDefault(p => p.MainModule.FileName.StartsWith(gamePath)) != default(Process);
return isRunning; return isRunning;
} }
catch (Exception e) catch (Exception)
{ {
Exception ex = new Exception("Error in tracking Overwatch.exe"); Exception ex = new Exception("Error in tracking Overwatch.exe");
throw ex; throw ex;
} }
} }
/// <summary>
/// Not Working!
/// </summary>
/// <returns></returns>
public bool LoacteOW() public bool LoacteOW()
{ {
try try

View File

@ -20,7 +20,7 @@
</requestedPrivileges> </requestedPrivileges>
<applicationRequestMinimum> <applicationRequestMinimum>
<defaultAssemblyRequest permissionSetReference="Custom" /> <defaultAssemblyRequest permissionSetReference="Custom" />
<PermissionSet ID="Custom" SameSite="site" Unrestricted="true" /> <PermissionSet ID="Custom" SameSite="site" />
</applicationRequestMinimum> </applicationRequestMinimum>
</security> </security>
</trustInfo> </trustInfo>