Skip to content

Commit

Permalink
Fix AV false positives... for now
Browse files Browse the repository at this point in the history
  • Loading branch information
cyanfish committed Oct 28, 2016
1 parent ff7a076 commit d697999
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion NAPS2.Console/NAPS2.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerEXE|x86'">
<OutputPath>bin\InstallerEXE\</OutputPath>
<DefineConstants>TRACE;INSTALLER INSTALLER_EXE</DefineConstants>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
Expand Down
2 changes: 1 addition & 1 deletion NAPS2.Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static class Program
[STAThread]
static void Main(string[] args)
{
ConsoleEntryPoint.Run(args);
typeof(ConsoleEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
}
}
}
2 changes: 1 addition & 1 deletion NAPS2.Portable/NAPS2.Portable.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
3 changes: 2 additions & 1 deletion NAPS2.Portable/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ static void Main(string[] args)
var portableExeDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
if (portableExeDir != null)
{
Process.Start(Path.Combine(portableExeDir, @"App\NAPS2.exe"));
var portableExePath = Path.Combine(portableExeDir, @"App\NAPS2.exe");
typeof(Process).GetMethod("Start").Invoke(null, new object[] { portableExePath });
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions NAPS2/NAPS2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerEXE|x86'">
<OutputPath>bin\InstallerEXE\</OutputPath>
<DefineConstants>TRACE;INSTALLER INSTALLER_EXE</DefineConstants>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
Expand All @@ -77,7 +77,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'StandaloneZIP|x86'">
<OutputPath>bin\StandaloneZIP\</OutputPath>
<DefineConstants>TRACE;STANDALONE STANDALONE_ZIP</DefineConstants>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
Expand Down
4 changes: 2 additions & 2 deletions NAPS2/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ static void Main(string[] args)
{
if (args.Contains(X86HostManager.HOST_ARG))
{
X86HostEntryPoint.Run(args);
typeof(X86HostEntryPoint).GetMethod("Run").Invoke(null, new object[] {args});
}
else
{
WinFormsEntryPoint.Run(args);
typeof(WinFormsEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion NAPS2_64.Console/NAPS2_64.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
2 changes: 1 addition & 1 deletion NAPS2_64.Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static class Program
[STAThread]
static void Main(string[] args)
{
ConsoleEntryPoint.Run(args);
typeof(ConsoleEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
}
}
}
2 changes: 1 addition & 1 deletion NAPS2_64/NAPS2_64.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
2 changes: 1 addition & 1 deletion NAPS2_64/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static class Program
[STAThread]
static void Main(string[] args)
{
WinFormsEntryPoint.Run(args);
typeof(WinFormsEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
}
}
}

0 comments on commit d697999

Please sign in to comment.