Skip to content

Commit cb348b6

Browse files
KN4CK3RKN4CK3R
committed
Sync with current ReClass.NET project.
1 parent 272f3d8 commit cb348b6

6 files changed

+36
-31
lines changed

‎Hybrid/SamplePluginHybrid.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -23,34 +23,34 @@
2323
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
2424
<Keyword>ManagedCProj</Keyword>
2525
<RootNamespace>SamplePluginHybrid</RootNamespace>
26-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>DynamicLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
<CLRSupport>true</CLRSupport>
3434
<CharacterSet>Unicode</CharacterSet>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
3838
<UseDebugLibraries>false</UseDebugLibraries>
39-
<PlatformToolset>v140</PlatformToolset>
39+
<PlatformToolset>v141</PlatformToolset>
4040
<CLRSupport>true</CLRSupport>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
4545
<UseDebugLibraries>true</UseDebugLibraries>
46-
<PlatformToolset>v140</PlatformToolset>
46+
<PlatformToolset>v141</PlatformToolset>
4747
<CLRSupport>true</CLRSupport>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v140</PlatformToolset>
53+
<PlatformToolset>v141</PlatformToolset>
5454
<CLRSupport>true</CLRSupport>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>
@@ -153,12 +153,12 @@
153153
<ResourceCompile Include="SamplePluginHybrid.rc" />
154154
</ItemGroup>
155155
<ItemGroup>
156-
<ProjectReference Include="..\..\ReClass.NET\ReClass.NET.csproj">
157-
<Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
158-
</ProjectReference>
156+
<None Include="exports.def" />
159157
</ItemGroup>
160158
<ItemGroup>
161-
<None Include="exports.def" />
159+
<ProjectReference Include="..\..\ReClass.NET\ReClass.NET\ReClass.NET.csproj">
160+
<Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
161+
</ProjectReference>
162162
</ItemGroup>
163163
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
164164
<ImportGroup Label="ExtensionTargets">

‎Hybrid/SamplePluginHybridExt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace SamplePluginHybrid
2121
INodeInfoReader^ reader;
2222
};
2323

24-
ref class SampleNodeInfoReader : INodeInfoReader
24+
public ref class SampleNodeInfoReader : INodeInfoReader
2525
{
2626
public:
2727
virtual String^ ReadNodeInfo(BaseNode^ node, IntPtr value, MemoryBuffer^ memory);

‎Managed/SamplePluginManaged.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1616
<PlatformTarget>x86</PlatformTarget>
1717
<DebugSymbols>true</DebugSymbols>
1818
<DebugType>full</DebugType>
@@ -69,9 +69,9 @@
6969
<Compile Include="Properties\AssemblyInfo.cs" />
7070
</ItemGroup>
7171
<ItemGroup>
72-
<ProjectReference Include="..\..\ReClass.NET\ReClass.NET.csproj">
72+
<ProjectReference Include="..\..\ReClass.NET\ReClass.NET\ReClass.NET.csproj">
7373
<Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
74-
<Name>ReClassNET</Name>
74+
<Name>ReClass.NET</Name>
7575
</ProjectReference>
7676
</ItemGroup>
7777
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Managed/SamplePluginManagedExt.cs

+10-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// The namespace name must equal the plugin name
1212
namespace SamplePluginManaged
1313
{
14-
1514
/// <summary>The class name must equal the namespace name + "Ext"</summary>
1615
public class SamplePluginManagedExt : Plugin
1716
{
@@ -55,8 +54,7 @@ public override void Terminate()
5554
/// </summary>
5655
private void OnWindowAdded(object sender, GlobalWindowManagerEventArgs e)
5756
{
58-
var settingsForm = e.Form as SettingsForm;
59-
if (settingsForm != null)
57+
if (e.Form is SettingsForm settingsForm)
6058
{
6159
settingsForm.Shown += delegate (object sender2, EventArgs e2)
6260
{
@@ -65,8 +63,10 @@ private void OnWindowAdded(object sender, GlobalWindowManagerEventArgs e)
6563
var settingsTabControl = settingsForm.Controls.Find("settingsTabControl", true).FirstOrDefault() as TabControl;
6664
if (settingsTabControl != null)
6765
{
68-
var newTab = new TabPage("SamplePlugin");
69-
newTab.UseVisualStyleBackColor = true;
66+
var newTab = new TabPage("SamplePlugin")
67+
{
68+
UseVisualStyleBackColor = true
69+
};
7070

7171
// You can use a custom control here so you have designer support
7272

@@ -76,8 +76,10 @@ private void OnWindowAdded(object sender, GlobalWindowManagerEventArgs e)
7676

7777
// or add the controls manually.
7878

79-
var checkBox = new CheckBox();
80-
checkBox.Text = "Use Sample Setting";
79+
var checkBox = new CheckBox
80+
{
81+
Text = "Use Sample Setting"
82+
};
8183
newTab.Controls.Add(checkBox);
8284

8385
settingsTabControl.TabPages.Add(newTab);
@@ -92,7 +94,7 @@ private void OnWindowAdded(object sender, GlobalWindowManagerEventArgs e)
9294
}
9395
}
9496

95-
class SampleNodeInfoReader : INodeInfoReader
97+
public class SampleNodeInfoReader : INodeInfoReader
9698
{
9799
/// <summary>This method lets ReClass.NET print the name and the value of the node.</summary>
98100
public string ReadNodeInfo(BaseNode node, IntPtr value, MemoryBuffer memory)

‎Native/SamplePlugin.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,33 +22,33 @@
2222
<ProjectGuid>{22CA6FDB-7622-4F94-8FC2-2E7AB481C86F}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>SamplePlugin</RootNamespace>
25-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
2626
<ProjectName>SamplePluginNative</ProjectName>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>DynamicLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
<CharacterSet>MultiByte</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>MultiByte</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v140</PlatformToolset>
51+
<PlatformToolset>v141</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>

‎ReClass.NET SamplePlugin.sln

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplePluginManaged", "Managed\SamplePluginManaged.csproj", "{FEA8AC8E-3A1A-4990-8F78-39599E55F8F1}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
99
EndProject
1010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SamplePluginHybrid", "Hybrid\SamplePluginHybrid.vcxproj", "{7E56DBB6-453E-48FA-B70E-62CA46BD0BB4}"
1111
EndProject
@@ -55,4 +55,7 @@ Global
5555
GlobalSection(SolutionProperties) = preSolution
5656
HideSolutionNode = FALSE
5757
EndGlobalSection
58+
GlobalSection(ExtensibilityGlobals) = postSolution
59+
SolutionGuid = {A4D6E479-778F-44E1-A8AA-43098CD09FC3}
60+
EndGlobalSection
5861
EndGlobal

0 commit comments

Comments
 (0)