diff --git a/minipath/minipath_VS2017.vcxproj b/minipath/minipath_VS2017.vcxproj
index fc7dbd792..09a466ecd 100644
--- a/minipath/minipath_VS2017.vcxproj
+++ b/minipath/minipath_VS2017.vcxproj
@@ -116,6 +116,13 @@
Version.exe
+
+ false
+
+
+ $(ProjDir)res\Notepad3$(TargetExt).manifest.conf
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+
@@ -155,6 +162,13 @@
Version.exe
+
+ false
+
+
+ $(ProjDir)res\Notepad3$(TargetExt).manifest.conf
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+
@@ -173,6 +187,13 @@
+
+ false
+
+
+ $(ProjDir)res\Notepad3$(TargetExt).manifest.conf
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+
@@ -190,6 +211,13 @@
+
+ false
+
+
+ $(ProjDir)res\Notepad3$(TargetExt).manifest.conf
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+
diff --git a/minipath/minipath_VS2017.vcxproj.filters b/minipath/minipath_VS2017.vcxproj.filters
new file mode 100644
index 000000000..4e35981ee
--- /dev/null
+++ b/minipath/minipath_VS2017.vcxproj.filters
@@ -0,0 +1,123 @@
+
+
+
+
+ {5553d3c0-044f-438f-b1b2-867093fe3ae1}
+ c;cpp
+
+
+ {e1f8cff3-413c-4dc8-948b-890b217e91a9}
+ h;hpp
+
+
+ {2dcd5d78-6817-4e88-95dd-45317fb30c57}
+ rc;manifest;ver
+
+
+ {ed5af34a-ecde-4869-92de-751b5f039b98}
+ bmp;ico;cur
+
+
+
+
+ C/C++ Source Files
+
+
+ C/C++ Source Files
+
+
+ C/C++ Source Files
+
+
+ C/C++ Source Files
+
+
+ C/C++ Source Files
+
+
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+ H Source Files
+
+
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Resource Files
+
+
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+ Image Files
+
+
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
\ No newline at end of file
diff --git a/minipath/res/MiniPath.exe.manifest b/minipath/res/MiniPath.exe.manifest
index 1f850d2c0..0b779dd09 100644
--- a/minipath/res/MiniPath.exe.manifest
+++ b/minipath/res/MiniPath.exe.manifest
@@ -1,12 +1,5 @@
-
- metapath
-
-
-
-
+
+
+
+
diff --git a/minipath/res/Notepad3.exe.manifest.conf b/minipath/res/Notepad3.exe.manifest.conf
index f6df78ec9..00cc8e11d 100644
--- a/minipath/res/Notepad3.exe.manifest.conf
+++ b/minipath/res/Notepad3.exe.manifest.conf
@@ -3,40 +3,7 @@
- metapath
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
\ No newline at end of file
diff --git a/minipath/src/minipath.rc b/minipath/src/minipath.rc
index 6c6e83e56..e38691e2e 100644
--- a/minipath/src/minipath.rc
+++ b/minipath/src/minipath.rc
@@ -22,8 +22,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// RT_MANIFEST
//
-
-IDR_RT_MANIFEST RT_MANIFEST "..\\res\\minipath.exe.manifest"
+//~~~ Linker generated and merged & embedded by manifesttool
+//~~~IDR_RT_MANIFEST RT_MANIFEST "..\\res\\minipath.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/minipath/src/resource.h b/minipath/src/resource.h
index 422e66d90..622307882 100644
--- a/minipath/src/resource.h
+++ b/minipath/src/resource.h
@@ -2,7 +2,7 @@
// Microsoft Visual C++ generated include file.
// Used by minipath.rc
//
-#define IDR_RT_MANIFEST 99
+#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_COMMANDLINE 100
#define IDD_ABOUT 100
diff --git a/res/Notepad3.exe.manifest b/res/Notepad3.exe.manifest
index d3c1cb5f4..a4dd93e8c 100644
--- a/res/Notepad3.exe.manifest
+++ b/res/Notepad3.exe.manifest
@@ -1,11 +1,5 @@
-
Notepad3
@@ -37,7 +31,7 @@
- true
+ false
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index a2d05fbd2..f2fe02402 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,41 +3,7 @@
- Notepad3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
diff --git a/scintilla/Scintilla_VS2017.vcxproj.filters b/scintilla/Scintilla_VS2017.vcxproj.filters
new file mode 100644
index 000000000..2e980ef83
--- /dev/null
+++ b/scintilla/Scintilla_VS2017.vcxproj.filters
@@ -0,0 +1,437 @@
+
+
+
+
+ {b78c6486-26fc-4890-89c0-f7f3e301b79c}
+
+
+ {6b8793d0-aa9c-432f-aa65-b763bc23ae40}
+
+
+ {b4579e25-25b5-4f0d-8dab-c34ed9f53913}
+
+
+ {9dbbd18e-d068-478e-82f3-5b03317a670d}
+
+
+ {afe7e35e-cd81-406c-a770-df29d2b3fc95}
+
+
+ {67242aad-9133-44e7-9774-c36f5a9194bc}
+
+
+ {4e167b73-0447-4a31-a66b-64c2d684516d}
+
+
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ win32
+
+
+ win32
+
+
+ win32
+
+
+ deelx
+
+
+ lexers
+
+
+ lexers
+
+
+ lexers
+
+
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ lexlib
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ src
+
+
+ win32
+
+
+ deelx
+
+
+ include
+
+
+ src
+
+
+ src
+
+
+
+
+ deelx\doc
+
+
+
\ No newline at end of file
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index 8162f598d..f28fc7cf9 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -22,9 +22,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// RT_MANIFEST
//
-
-1 RT_MANIFEST "..\\res\\Notepad3.exe.manifest"
-
+//~~~ Linker generated and merged & embedded by manifesttool
+//~~~IDR_RT_MANIFEST RT_MANIFEST "..\\res\\Notepad3.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/Notepad3_VS2017.vcxproj b/src/Notepad3_VS2017.vcxproj
index 047b433b7..abebbf843 100644
--- a/src/Notepad3_VS2017.vcxproj
+++ b/src/Notepad3_VS2017.vcxproj
@@ -71,25 +71,25 @@
- false
+ true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\
true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\
- false
+ true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\
true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\
- false
+ true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\
true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\
- false
+ true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\
true
..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\
@@ -126,6 +126,18 @@
false
false
+
+
+
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+ $(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf
+ false
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest.res
+
@@ -161,6 +173,18 @@
false
false
+
+
+
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+ $(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf
+ false
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest.res
+
@@ -196,6 +220,18 @@
false
false
+
+
+
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+ $(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf
+ false
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest.res
+
@@ -232,6 +268,18 @@
false
false
+
+
+
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+ $(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf
+ false
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest.res
+
diff --git a/src/Notepad3_VS2017.vcxproj.filters b/src/Notepad3_VS2017.vcxproj.filters
new file mode 100644
index 000000000..f99b395d2
--- /dev/null
+++ b/src/Notepad3_VS2017.vcxproj.filters
@@ -0,0 +1,144 @@
+
+
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {aad339da-f291-4358-9ab1-a0fdee012ac6}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Crypto
+
+
+ Crypto
+
+
+ Crypto
+
+
+ Crypto
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Crypto
+
+
+ Crypto
+
+
+ Crypto
+
+
+ Crypto
+
+
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+
+
+
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
\ No newline at end of file
diff --git a/src/resource.h b/src/resource.h
index 30da10698..f587a7483 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -2,6 +2,7 @@
// Von Microsoft Visual C++ generierte Includedatei.
// Verwendet durch Notepad3.rc
//
+#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_FINDTEXT 100
#define IDC_LINENUM 100
@@ -453,10 +454,10 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_NEXT_RESOURCE_VALUE 3
-#define _APS_NEXT_COMMAND_VALUE 5
-#define _APS_NEXT_CONTROL_VALUE 0
-#define _APS_NEXT_SYMED_VALUE 0
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 600
+#define _APS_NEXT_COMMAND_VALUE 700
+#define _APS_NEXT_CONTROL_VALUE 800
+#define _APS_NEXT_SYMED_VALUE 900
#endif
#endif