*: 整理工程和构建脚本。

Author: IanusInferus

Src/Build.cmd

@@ -1,17 +1,29 @@
 @echo off
 
-for %%p in (Enterprise Professional Community BuildTools) do (
-  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\%%p" (
-    set VSDir="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\%%p"
+setlocal
+if "%SUB_NO_PAUSE_SYMBOL%"=="1" set NO_PAUSE_SYMBOL=1
+if /I "%COMSPEC%" == %CMDCMDLINE% set NO_PAUSE_SYMBOL=1
+set SUB_NO_PAUSE_SYMBOL=1
+call :main %*
+set EXIT_CODE=%ERRORLEVEL%
+if not "%NO_PAUSE_SYMBOL%"=="1" pause
+exit /b %EXIT_CODE%
+
+:main
+for %%v in (2019 2017) do (
+  for %%p in (Enterprise Professional Community BuildTools) do (
+    for %%b in (Current 15.0) do (
+      if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\%%v\%%p\MSBuild\%%b\Bin\MSBuild.exe" (
+        set MSBuild="%ProgramFiles(x86)%\Microsoft Visual Studio\%%v\%%p\MSBuild\%%b\Bin\MSBuild.exe"
+        goto MSBuild_Found
+      )
+    )
   )
 )
-set VSDir=%VSDir:"=%
-echo VSDir=%VSDir%
-
-"%VSDir%\MSBuild\15.0\Bin\MSBuild.exe" Firefly.sln /restore /t:Rebuild /p:Configuration=Release
+:MSBuild_Found
 
-copy Doc\Readme.*.txt ..\Bin\
-copy Doc\UpdateLog.*.txt ..\Bin\
-copy Doc\License.*.txt ..\Bin\
+%MSBuild% Firefly.sln /restore /t:Rebuild /p:Configuration=Release || exit /b 1
 
-pause
+copy Doc\Readme.*.txt ..\Bin\ || exit /b 1
+copy Doc\UpdateLog.*.txt ..\Bin\ || exit /b 1
+copy Doc\License.*.txt ..\Bin\ || exit /b 1

Src/Doc/UpdateLog.zh.txt

@@ -1,6 +1,8 @@
 2019.04.28
 Firefly.Core.Texting.TreeFormat, Firefly.Core.Mapping:
 将所有Optional中的NotHasValue改为None，HasValue改为Some。
+*:
+整理工程和构建脚本。
 
 2018.11.24
 *:

Src/Firefly.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FireflyCore", "FireflyCore\FireflyCore.vbproj", "{1DE5CF1F-2526-4520-87D8-B1B1B8D1F214}"
 EndProject