Installer - Moving to version 2.0.0

CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0.1000] - 2021-12-30
+
 ## [1.5.1.1000] - 2021-11-26
 ### Added
 - Mirror - Add an option to personalize the volume name.
@@ -549,6 +551,7 @@ Latest Dokan version from Hiroki Asakawa.
  [http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/)
 
 
+[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.5.1.1000...master
 [1.5.1.1000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.3000...v1.5.1.1000
 [1.5.0.3000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.2000...v1.5.0.3000
 [1.5.0.2000]: https://github.com/dokan-dev/dokany/compare/v1.5.0.1000...v1.5.0.2000

Dokan.props

@@ -2,8 +2,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <DOKANAPIVersion>1</DOKANAPIVersion>
-    <DOKANVersion>1.5.1</DOKANVersion>
+    <DOKANAPIVersion>2</DOKANAPIVersion>
+    <DOKANVersion>2.0.0</DOKANVersion>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

appveyor.yml

@@ -14,7 +14,7 @@
       WLK_INST_CACHE: '%DOKAN_CI_CACHE%\wlk_inst'
       DOKAN_MAIN_BUILD_JOB_NAME: "Image: Visual Studio 2019; Configuration: All"
 
-  version: 1.5.1-{build}
+  version: 2.0.0-{build}
   configuration:
   - All
   - SonarQube
@@ -65,7 +65,7 @@
         }
     - ps: |
         if ($env:CONFIGURATION -eq "FsTest") {
-          & verifier /standard /driver dokan1.sys
+          & verifier /standard /driver dokan2.sys
           Write-Host "Before reboot"
           Start-Sleep -s 30 # Wait appveyor to be ready https://github.com/appveyor/ci/issues/3650
           Restart-Computer
@@ -303,9 +303,9 @@
   - ps: |
       if ($env:CONFIGURATION -eq "FsTest") {
         Write-Host Running tests...
-        $env:DokanLibrary1 = [System.Environment]::GetEnvironmentVariable("DokanLibrary1", "Machine")
-        $memfs = @("${env:DokanLibrary1}\sample\memfs\memfs.exe", "${env:DokanLibrary1}\x86\sample\memfs\memfs.exe")
-        $mirrors = @("${env:DokanLibrary1}\sample\mirror\mirror.exe", "${env:DokanLibrary1}\x86\sample\mirror\mirror.exe")
+        $env:DokanLibrary2 = [System.Environment]::GetEnvironmentVariable("DokanLibrary2", "Machine")
+        $memfs = @("${env:DokanLibrary2}\sample\memfs\memfs.exe", "${env:DokanLibrary2}\x86\sample\memfs\memfs.exe")
+        $mirrors = @("${env:DokanLibrary2}\sample\mirror\mirror.exe", "${env:DokanLibrary2}\x86\sample\mirror\mirror.exe")
 
         cd .\samples
         .\memfs_test.ps1 -Memfs $memfs

dokan/dokan.def

@@ -1,5 +1,5 @@
 
-LIBRARY	dokan1
+LIBRARY	dokan2
 
 EXPORTS
 

dokan/dokan.h

@@ -55,10 +55,10 @@ extern "C" {
  */
 /** @{ */
 
-/** The current Dokan version (140 means ver 1.4.0). \ref DOKAN_OPTIONS.Version */
-#define DOKAN_VERSION 160
+/** The current Dokan version (200 means ver 2.0.0). \ref DOKAN_OPTIONS.Version */
+#define DOKAN_VERSION 200
 /** Minimum Dokan version (ver 2.0.0) accepted. */
-#define DOKAN_MINIMUM_COMPATIBLE_VERSION 110
+#define DOKAN_MINIMUM_COMPATIBLE_VERSION 200
 /** Driver file name including the DOKAN_MAJOR_API_VERSION */
 #define DOKAN_DRIVER_NAME L"dokan" DOKAN_MAJOR_API_VERSION L".sys"
 /** Network provider name including the DOKAN_MAJOR_API_VERSION */

dokan/dokan.rc

@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,1,1000
- PRODUCTVERSION 1,5,1,1000
+ FILEVERSION 2,0,0,1000
+ PRODUCTVERSION 2,0,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Library"
-            VALUE "FileVersion", "1.5.1.1000"
+            VALUE "FileVersion", "2.0.0.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokan.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "1.5.1.1000"
+            VALUE "ProductVersion", "2.0.0.1000"
         END
     END
     BLOCK "VarFileInfo"

dokan_fuse/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.5)
-project(dokanfuse1)
+project(dokanfuse2)
 include(GNUInstallDirs)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -55,14 +55,14 @@ set(install_headers
 set(compat_headers
     include/old/fuse.h
 )
-add_library(dokanfuse1 SHARED ${sources})
+add_library(dokanfuse2 SHARED ${sources})
 
 INSTALL(FILES ${install_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fuse/)
 INSTALL(FILES ${compat_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 if(FUSE_PKG_CONFIG)
     INSTALL(FILES ${pkg_config_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
-INSTALL(TARGETS dokanfuse1
+INSTALL(TARGETS dokanfuse2
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

dokan_fuse/src/dokanfuse.rc

@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,1,1000
- PRODUCTVERSION 1,5,1,1000
+ FILEVERSION 2,0,0,1000
+ PRODUCTVERSION 2,0,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Fuse library"
-            VALUE "FileVersion", "1.5.1.1000"
+            VALUE "FileVersion", "2.0.0.1000"
             VALUE "InternalName", "dokanfuse.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokanfuse.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "1.5.1.1000"
+            VALUE "ProductVersion", "2.0.0.1000"
         END
     END
     BLOCK "VarFileInfo"

dokan_np/dokan_np.rc

@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,1,1000
- PRODUCTVERSION 1,5,1,1000
+ FILEVERSION 2,0,0,1000
+ PRODUCTVERSION 2,0,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Network Provider"
-            VALUE "FileVersion", "1.5.1.1000"
+            VALUE "FileVersion", "2.0.0.1000"
             VALUE "InternalName", "dokan.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokannp.dll"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "1.5.1.1000"
+            VALUE "ProductVersion", "2.0.0.1000"
         END
     END
     BLOCK "VarFileInfo"

dokan_wix/version.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 <?define ProductName="Dokan Library" ?>
-<?define ProductCodeX64="{65A3A964-3DC3-0105-0001-211126123627}" ?>
+<?define ProductCodeX64="{65A3A964-3DC3-0200-0000-211230095643}" ?>
 <?define UpgradeCodeX64="{2EF80C64-08A6-4FE1-BE92-13FD293C831B}" ?>
-<?define ProductCodeX86="{65A3A986-3DC3-0105-0001-211126123627}" ?>
+<?define ProductCodeX86="{65A3A986-3DC3-0200-0000-211230095643}" ?>
 <?define UpgradeCodeX86="{2EF80C86-08A6-4FE1-BE92-13FD293C831B}" ?>
 <?define ProviderKey="{5F030BFA-CE6E-408A-9694-F593B319DBBE}" ?>
 <?define BundleUpgradeCode="{A30D29CD-FA58-4542-8D41-7EDD1FB1EE5A}" ?>
-<?define BaseVersion="1.5.1" ?>
-<?define MajorVersion="1" ?>
+<?define BaseVersion="2.0.0" ?>
+<?define MajorVersion="2" ?>
 <?define BuildVersion="1000" ?>
 <?define CompanyName="Dokany Project" ?>
 <?define ShortCompanyName="Dokany Project" ?>

samples/memfs_test.ps1

@@ -69,7 +69,7 @@ $ifstestParameters = @(
 	"-g", "EaInformation",
 	"-g", "FileSystemControlGeneral",      # reason: Retrieval Pointers fsctl not supported
 	"/v",                                  # verbose output
-	"/d", "\Device\Dokan_1",               # Dokan device named need for FileSystemDeviceOpenTest
+	"/d", "\Device\Dokan_2",               # Dokan device named need for FileSystemDeviceOpenTest
 	"/r", "$fsTestPath2",                  # SimpleRenameInformationTest need an extra volum
 	"/u", $ifstest_user,
 	"/U", $ifstest_pass

sys/dokan.inf

@@ -28,7 +28,7 @@ DelService = %ServiceName%,0x200
 1 = %Disk1%
 
 [SourceDisksFiles]
-dokan1.sys = 1
+dokan2.sys = 1
 
 [DokanFileSystem.DriverFiles]
 %DriverName%.sys
@@ -51,7 +51,7 @@ HKR,,TypesSupported,0x00010001,7
 
 [Strings]
 Dokan = "Dokan"
-DriverName = "dokan1"
+DriverName = "dokan2"
 Disk1 = "Dokan installation media"
 ServiceDesc = "Dokan kernel-mode file system driver."
-ServiceName = "dokan1"
+ServiceName = "dokan2"

sys/dokan.rc

@@ -16,8 +16,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,1,1000
- PRODUCTVERSION 1,5,1,1000
+ FILEVERSION 2,0,0,1000
+ PRODUCTVERSION 2,0,0,1000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -34,12 +34,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Dokan Project"
             VALUE "FileDescription", "Dokan Driver"
-            VALUE "FileVersion", "1.5.1.1000"
+            VALUE "FileVersion", "2.0.0.1000"
             VALUE "InternalName", "dokan.sys"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "dokan.sys"
             VALUE "ProductName", "Dokan"
-            VALUE "ProductVersion", "1.5.1.1000"
+            VALUE "ProductVersion", "2.0.0.1000"
         END
     END
     BLOCK "VarFileInfo"

sys/public.h

@@ -24,7 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 #define PUBLIC_H_
 
 #ifndef DOKAN_MAJOR_API_VERSION
-#define DOKAN_MAJOR_API_VERSION L"1"
+#define DOKAN_MAJOR_API_VERSION L"2"
 #include <minwindef.h>
 #endif
 

sys/util/log.h

@@ -69,7 +69,7 @@ VOID IncrementVcbLogCacheCount();
 // Main print function which should not be used directly.
 #define DDbgPrint(Format, ...)                        \
   KdPrintEx((DPFLTR_IHVDRIVER_ID, DPFLTR_TRACE_LEVEL, \
-             "[dokan1]" Format "\n", __VA_ARGS__));
+             "[dokan2]" Format "\n", __VA_ARGS__));
 
 #if (NTDDI_VERSION >= NTDDI_WIN8)
 #define DokanQuerySystemTime KeQuerySystemTimePrecise