Skip to content

Commit

Permalink
Release 1.1.0.2000
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrien JUND committed Jan 19, 2018
1 parent 83be683 commit ad95121
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ 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/).

## [1.1.0.2000] - 2018-01-19
### Fixed
- Installer - Fix Wrong redist download link rename
- Installer - Fix vc++ version number displayed
- Installer - Update message download VC link

## [1.1.0.1000] - 2017-11-28
### Added
- Mirror - Add Impersonate Option for Security Enhancement.
Expand Down Expand Up @@ -334,7 +340,8 @@ 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.1.0...master
[Unreleased]: https://github.com/dokan-dev/dokany/compare/v1.1.0.2000...master
[1.1.0.2000]: https://github.com/dokan-dev/dokany/compare/v1.1.0...v1.1.0.2000
[1.1.0.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.5...v1.1.0
[1.0.5.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.4...v1.0.5
[1.0.4.1000]: https://github.com/dokan-dev/dokany/compare/v1.0.3...v1.0.4
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ msbuild dokan.sln /p:Configuration="Win8.1 Debug" /p:Platform=x64 /t:Build !CI_B
msbuild dokan.sln /p:Configuration="Win10 Debug" /p:Platform=Win32 /t:Build !CI_BUILD_ARG! || set failed=%ERRORLEVEL%
msbuild dokan.sln /p:Configuration="Win10 Debug" /p:Platform=x64 /t:Build !CI_BUILD_ARG! || set failed=%ERRORLEVEL%

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

@if !failed! neq 0 (
echo At least one build-command failed. The last command that failed returned with error !failed! 1>&2
Expand Down
2 changes: 1 addition & 1 deletion dokan_wix/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ MakeCab /f dokanx86.ddf

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

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" )
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" )

REM build light installer
powershell -Command "(gc version.xml) -replace 'Compressed=\"yes\"', 'Compressed=\"no\"' | sc version.xml"
Expand Down
6 changes: 3 additions & 3 deletions dokan_wix/version.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define ProductName="Dokan Library" ?>
<?define ProductCodeX64="{65A3A964-3DC3-0101-0000-171128090627}" ?>
<?define ProductCodeX64="{65A3A964-3DC3-0101-0000-180119092517}" ?>
<?define UpgradeCodeX64="{2EF80C64-08A6-4FE1-BE92-13FD293C831B}" ?>
<?define ProductCodeX86="{65A3A986-3DC3-0101-0000-171128090627}" ?>
<?define ProductCodeX86="{65A3A986-3DC3-0101-0000-180119092517}" ?>
<?define UpgradeCodeX86="{2EF80C86-08A6-4FE1-BE92-13FD293C831B}" ?>
<?define ProviderKey="{5F030BFA-CE6E-408A-9694-F593B319DBBE}" ?>
<?define BundleUpgradeCode="{A30D29CD-FA58-4542-8D41-7EDD1FB1EE5A}" ?>
<?define BaseVersion="1.1.0" ?>
<?define MajorVersion="1" ?>
<?define BuildVersion="1000" ?>
<?define BuildVersion="2000" ?>
<?define CompanyName="Dokany Project" ?>
<?define ShortCompanyName="Dokany Project" ?>
<?define UpdateURL="https://dokan-dev.github.io/" ?>
Expand Down

0 comments on commit ad95121

Please sign in to comment.