Skip to content

Commit dcae734

Browse files
dmexdmex
committed
Update minimum solution versions, Update build tools to .net 4.6.1, Update bool tool binaries
1 parent 5f13f5f commit dcae734

File tree

15 files changed

+37
-26
lines changed

15 files changed

+37
-26
lines changed

‎ProcessHacker.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
5-
MinimumVisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
5+
MinimumVisualStudioVersion = 15.0.26228.4
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2758DC86-368B-430C-9D29-F1EF20032A71}"
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProcessHacker", "ProcessHacker\ProcessHacker.vcxproj", "{0271DD27-6707-4290-8DFE-285702B7115D}"

‎plugins/ExtendedTools/etwmon.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static GUID UdpIpGuid_I = { 0xbf3a50c5, 0xa9c9, 0x4988, { 0xa0, 0x05, 0x2d, 0xf0
6363

6464
BOOLEAN EtEtwEnabled;
6565
static UNICODE_STRING EtpSharedKernelLoggerName = RTL_CONSTANT_STRING(KERNEL_LOGGER_NAME);
66-
static UNICODE_STRING EtpPrivateKernelLoggerName = RTL_CONSTANT_STRING(L"PhEtKernelLogger");
66+
static UNICODE_STRING EtpPrivateKernelLoggerName = RTL_CONSTANT_STRING(L"PhDbgKernelLogger");
6767
static TRACEHANDLE EtpSessionHandle;
6868
static PUNICODE_STRING EtpActualKernelLoggerName;
6969
static PGUID EtpActualSessionGuid;
@@ -75,7 +75,7 @@ static HANDLE EtpEtwMonitorThreadHandle;
7575

7676
// ETW rundown layer
7777

78-
static UNICODE_STRING EtpRundownLoggerName = RTL_CONSTANT_STRING(L"PhEtRundownLogger");
78+
static UNICODE_STRING EtpRundownLoggerName = RTL_CONSTANT_STRING(L"PhDbgRundownLogger");
7979
static TRACEHANDLE EtpRundownSessionHandle;
8080
static PEVENT_TRACE_PROPERTIES EtpRundownTraceProperties;
8181
static BOOLEAN EtpRundownActive;
@@ -142,7 +142,7 @@ VOID EtStartEtwSession(
142142
EtpTraceProperties->MinimumBuffers = 1;
143143
EtpTraceProperties->LogFileMode = EVENT_TRACE_REAL_TIME_MODE;
144144
EtpTraceProperties->FlushTimer = 1;
145-
EtpTraceProperties->EnableFlags = EVENT_TRACE_FLAG_DISK_IO | EVENT_TRACE_FLAG_DISK_FILE_IO | EVENT_TRACE_FLAG_NETWORK_TCPIP;
145+
EtpTraceProperties->EnableFlags = EVENT_TRACE_FLAG_DBGPRINT;
146146
EtpTraceProperties->LogFileNameOffset = 0;
147147
EtpTraceProperties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES);
148148

‎plugins/Plugins.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
5-
MinimumVisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
5+
MinimumVisualStudioVersion = 15.0.26228.4
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{53C3AE07-D96F-4F5C-B407-4195084472CF}"
77
ProjectSection(SolutionItems) = preProject
88
include\commonutil.h = include\commonutil.h

‎tools/GenerateHeader/GenerateHeader.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
5+
MinimumVisualStudioVersion = 15.0.26228.4
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateHeader", "GenerateHeader\GenerateHeader.csproj", "{DA075B6D-3506-42FA-8FD8-34F79E5578E0}"
77
EndProject
88
Global

‎tools/GenerateHeader/GenerateHeader/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
55
</startup>
6-
</configuration>
6+
</configuration>

‎tools/GenerateHeader/GenerateHeader/GenerateHeader.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>GenerateHeader</RootNamespace>
1111
<AssemblyName>GenerateHeader</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -21,6 +21,7 @@
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24+
<Prefer32Bit>false</Prefer32Bit>
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2627
<PlatformTarget>AnyCPU</PlatformTarget>

‎tools/GenerateHeader/GenerateHeader/bin/Release/GenerateHeader.exe

-512 Bytes
Binary file not shown.

‎tools/GenerateZw/GenerateZw.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
5+
MinimumVisualStudioVersion = 15.0.26228.4
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateZw", "GenerateZw\GenerateZw.csproj", "{10589240-84D9-4935-9868-7FFADB6545F9}"
57
EndProject
68
Global

‎tools/GenerateZw/GenerateZw/GenerateZw.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>GenerateZw</RootNamespace>
1212
<AssemblyName>GenerateZw</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1514
<FileAlignment>512</FileAlignment>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +22,7 @@
2322
<DefineConstants>DEBUG;TRACE</DefineConstants>
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2828
<PlatformTarget>x86</PlatformTarget>
@@ -32,6 +32,7 @@
3232
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3536
</PropertyGroup>
3637
<ItemGroup>
3738
<Reference Include="System" />
@@ -47,6 +48,9 @@
4748
<Compile Include="Properties\AssemblyInfo.cs" />
4849
<Compile Include="ZwGen.cs" />
4950
</ItemGroup>
51+
<ItemGroup>
52+
<None Include="app.config" />
53+
</ItemGroup>
5054
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5155
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5256
Other similar extension points exist, see Microsoft.Common.targets.

‎tools/GenerateZw/GenerateZw/app.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎tools/GenerateZw/GenerateZw/bin/Release/GenerateZw.exe

-512 Bytes
Binary file not shown.

‎tools/UpdateGitRevision/UpdateGitRevision.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
5+
MinimumVisualStudioVersion = 15.0.26228.4
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateGitRevision", "UpdateGitRevision\UpdateGitRevision.csproj", "{DBD4656C-5F40-4067-A70B-C4460DE20F77}"
77
EndProject
88
Global

‎tools/UpdateGitRevision/UpdateGitRevision/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
55
</startup>
66
</configuration>

‎tools/UpdateGitRevision/UpdateGitRevision/UpdateGitRevision.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1111
<ProjectGuid>{DBD4656C-5F40-4067-A70B-C4460DE20F77}</ProjectGuid>
1212
<RootNamespace>UpdateGitRevision</RootNamespace>
13-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1514
</PropertyGroup>
1615
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1716
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -23,6 +22,7 @@
2322
<OutputPath>bin\Debug\</OutputPath>
2423
<PlatformTarget>AnyCPU</PlatformTarget>
2524
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2828
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -33,6 +33,7 @@
3333
<OutputPath>bin\Release\</OutputPath>
3434
<PlatformTarget>AnyCPU</PlatformTarget>
3535
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3637
</PropertyGroup>
3738
<ItemGroup>
3839
<Reference Include="System" />

‎tools/UpdateGitRevision/UpdateGitRevision/bin/Release/UpdateGitRevision.exe

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)