Skip to content

Commit ad95121

Browse files
author
Adrien JUND
committed
Release 1.1.0.2000
1 parent 83be683 commit ad95121

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [1.1.0.2000] - 2018-01-19
7+
### Fixed
8+
- Installer - Fix Wrong redist download link rename
9+
- Installer - Fix vc++ version number displayed
10+
- Installer - Update message download VC link
11+
612
## [1.1.0.1000] - 2017-11-28
713
### Added
814
- Mirror - Add Impersonate Option for Security Enhancement.
@@ -334,7 +340,8 @@ Latest Dokan version from Hiroki Asakawa.
334340
[http://dokan-dev.net/en]( http://web.archive.org/web/20150419082954/http://dokan-dev.net/en/)
335341

336342

337-
[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.1.0...master
343+
[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.1.0.2000...master
344+
[1.1.0.2000]: https://github.com/dokan-dev/dokany/compare/v1.1.0...v1.1.0.2000
338345
[1.1.0.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.5...v1.1.0
339346
[1.0.5.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.4...v1.0.5
340347
[1.0.4.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.3...v1.0.4

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ msbuild dokan.sln /p:Configuration="Win8.1 Debug" /p:Platform=x64 /t:Build !CI_B
4343
msbuild dokan.sln /p:Configuration="Win10 Debug" /p:Platform=Win32 /t:Build !CI_BUILD_ARG! || set failed=%ERRORLEVEL%
4444
msbuild dokan.sln /p:Configuration="Win10 Debug" /p:Platform=x64 /t:Build !CI_BUILD_ARG! || set failed=%ERRORLEVEL%
4545

46-
IF EXIST C:\cygwin ( Powershell.exe -executionpolicy remotesigned -File dokan_fuse/build.ps1 || set failed=%ERRORLEVEL% ) ELSE ( echo "Cygwin/Msys2 build disabled" )
46+
IF EXIST C:\cygwin64 ( Powershell.exe -executionpolicy remotesigned -File dokan_fuse/build.ps1 || set failed=%ERRORLEVEL% ) ELSE ( echo "Cygwin/Msys2 build disabled" )
4747

4848
@if !failed! neq 0 (
4949
echo At least one build-command failed. The last command that failed returned with error !failed! 1>&2

dokan_wix/build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MakeCab /f dokanx86.ddf
2828

2929
set /p DUMMY=Please submit drivers to developer hardware dashboard. Hit ENTER when it is done...
3030

31-
IF EXIST C:\cygwin ( powershell -Command "(gc version.xml) -replace 'BuildCygwin=\"false\"', 'BuildCygwin=\"true\"' | sc version.xml" ) ELSE ( powershell -Command "(gc version.xml) -replace 'BuildCygwin=\"true\"', 'BuildCygwin=\"false\"' | sc version.xml" )
31+
IF EXIST C:\cygwin64 ( powershell -Command "(gc version.xml) -replace 'BuildCygwin=\"false\"', 'BuildCygwin=\"true\"' | sc version.xml" ) ELSE ( powershell -Command "(gc version.xml) -replace 'BuildCygwin=\"true\"', 'BuildCygwin=\"false\"' | sc version.xml" )
3232

3333
REM build light installer
3434
powershell -Command "(gc version.xml) -replace 'Compressed=\"yes\"', 'Compressed=\"no\"' | sc version.xml"

dokan_wix/version.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Include>
33
<?define ProductName="Dokan Library" ?>
4-
<?define ProductCodeX64="{65A3A964-3DC3-0101-0000-171128090627}" ?>
4+
<?define ProductCodeX64="{65A3A964-3DC3-0101-0000-180119092517}" ?>
55
<?define UpgradeCodeX64="{2EF80C64-08A6-4FE1-BE92-13FD293C831B}" ?>
6-
<?define ProductCodeX86="{65A3A986-3DC3-0101-0000-171128090627}" ?>
6+
<?define ProductCodeX86="{65A3A986-3DC3-0101-0000-180119092517}" ?>
77
<?define UpgradeCodeX86="{2EF80C86-08A6-4FE1-BE92-13FD293C831B}" ?>
88
<?define ProviderKey="{5F030BFA-CE6E-408A-9694-F593B319DBBE}" ?>
99
<?define BundleUpgradeCode="{A30D29CD-FA58-4542-8D41-7EDD1FB1EE5A}" ?>
1010
<?define BaseVersion="1.1.0" ?>
1111
<?define MajorVersion="1" ?>
12-
<?define BuildVersion="1000" ?>
12+
<?define BuildVersion="2000" ?>
1313
<?define CompanyName="Dokany Project" ?>
1414
<?define ShortCompanyName="Dokany Project" ?>
1515
<?define UpdateURL="https://dokan-dev.github.io/" ?>

0 commit comments

Comments
 (0)