Skip to content

Commit 0e79a93

Browse files
rafidzalrafidzal
committed
Fix Provider run scripts to take into consideration pre-Visual Studio 2015 development environments.
1 parent 1bffa85 commit 0e79a93

4 files changed

Lines changed: 120 additions & 22 deletions

File tree

‎Scripts/BAT/Demo execution/DemoAuProvider.bat‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,54 @@ rem ============================================================================
44
rem == User defined environment variables ==
55
rem ============================================================================
66

7+
set CONFIG_ONEDRIVE=%userprofile%\OneDrive\Documents\IISExpress\config\applicationhost.config
8+
set CONFIG_ORIGINAL=%userprofile%\Documents\IISExpress\config\applicationhost.config
9+
set CONFIG_VS2015=%~dp0..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
710
set IISEXPRESS_EXE="C:\Program Files\IIS Express\iisexpress.exe"
8-
set WEBAPP=..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
911
set SITE=Sif.Framework.Demo.Au.Provider
1012

13+
echo Configuration file search order ...
14+
echo %CONFIG_VS2015%
15+
echo %CONFIG_ONEDRIVE%
16+
echo %CONFIG_ORIGINAL%
17+
1118
rem ============================================================================
1219
rem == Safety checks ==
1320
rem ============================================================================
1421

1522
if exist %IISEXPRESS_EXE% goto okIIS
16-
echo Could not find : %IISEXPRESS_EXE%
23+
echo IIS Express not find : %IISEXPRESS_EXE%
1724
pause
1825
goto end
1926
:okIIS
2027

21-
if exist "%~dp0%WEBAPP%" goto okExec
22-
echo Could not find : %WEBAPP%
28+
if exist "%CONFIG_VS2015%" goto okConfigVS2015
29+
if exist "%CONFIG_ONEDRIVE%" goto okConfigOneDrive
30+
if exist "%CONFIG_ORIGINAL%" goto okConfigOriginal
31+
echo No configuration file found!
2332
pause
2433
goto end
34+
35+
:okConfigVS2015
36+
set IISEXPRESS_CONFIG=%CONFIG_VS2015%
37+
echo Using configuration file : %CONFIG_VS2015%
38+
goto okExec
39+
40+
:okConfigOneDrive
41+
set IISEXPRESS_CONFIG=%CONFIG_ONEDRIVE%
42+
echo Using configuration file : %CONFIG_ONEDRIVE%
43+
goto okExec
44+
45+
:okConfigOriginal
46+
set IISEXPRESS_CONFIG=%CONFIG_ORIGINAL%
47+
echo Using configuration file : %CONFIG_ORIGINAL%
48+
goto okExec
49+
2550
:okExec
2651

2752
rem ============================================================================
2853
rem == Start Webapp
2954
rem ============================================================================
3055

31-
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%~dp0%WEBAPP%" /site:%SITE%
32-
56+
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%IISEXPRESS_CONFIG%" /site:%SITE% /trace:error
3357
:end

‎Scripts/BAT/Demo execution/DemoUkProvider.bat‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,54 @@ rem ============================================================================
44
rem == User defined environment variables ==
55
rem ============================================================================
66

7+
set CONFIG_ONEDRIVE=%userprofile%\OneDrive\Documents\IISExpress\config\applicationhost.config
8+
set CONFIG_ORIGINAL=%userprofile%\Documents\IISExpress\config\applicationhost.config
9+
set CONFIG_VS2015=%~dp0..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
710
set IISEXPRESS_EXE="C:\Program Files\IIS Express\iisexpress.exe"
8-
set WEBAPP=..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
911
set SITE=Sif.Framework.Demo.Uk.Provider
1012

13+
echo Configuration file search order ...
14+
echo %CONFIG_VS2015%
15+
echo %CONFIG_ONEDRIVE%
16+
echo %CONFIG_ORIGINAL%
17+
1118
rem ============================================================================
1219
rem == Safety checks ==
1320
rem ============================================================================
1421

1522
if exist %IISEXPRESS_EXE% goto okIIS
16-
echo Could not find : %IISEXPRESS_EXE%
23+
echo IIS Express not find : %IISEXPRESS_EXE%
1724
pause
1825
goto end
1926
:okIIS
2027

21-
if exist "%~dp0%WEBAPP%" goto okExec
22-
echo Could not find : %WEBAPP%
28+
if exist "%CONFIG_VS2015%" goto okConfigVS2015
29+
if exist "%CONFIG_ONEDRIVE%" goto okConfigOneDrive
30+
if exist "%CONFIG_ORIGINAL%" goto okConfigOriginal
31+
echo No configuration file found!
2332
pause
2433
goto end
34+
35+
:okConfigVS2015
36+
set IISEXPRESS_CONFIG=%CONFIG_VS2015%
37+
echo Using configuration file : %CONFIG_VS2015%
38+
goto okExec
39+
40+
:okConfigOneDrive
41+
set IISEXPRESS_CONFIG=%CONFIG_ONEDRIVE%
42+
echo Using configuration file : %CONFIG_ONEDRIVE%
43+
goto okExec
44+
45+
:okConfigOriginal
46+
set IISEXPRESS_CONFIG=%CONFIG_ORIGINAL%
47+
echo Using configuration file : %CONFIG_ORIGINAL%
48+
goto okExec
49+
2550
:okExec
2651

2752
rem ============================================================================
2853
rem == Start Webapp
2954
rem ============================================================================
3055

31-
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%~dp0%WEBAPP%" /site:%SITE% /trace:error
56+
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%IISEXPRESS_CONFIG%" /site:%SITE% /trace:error
3257
:end

‎Scripts/BAT/Demo execution/DemoUsProvider.bat‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,54 @@ rem ============================================================================
44
rem == User defined environment variables ==
55
rem ============================================================================
66

7+
set CONFIG_ONEDRIVE=%userprofile%\OneDrive\Documents\IISExpress\config\applicationhost.config
8+
set CONFIG_ORIGINAL=%userprofile%\Documents\IISExpress\config\applicationhost.config
9+
set CONFIG_VS2015=%~dp0..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
710
set IISEXPRESS_EXE="C:\Program Files\IIS Express\iisexpress.exe"
8-
set WEBAPP=..\..\..\Code\Sif3FrameworkDemo\.vs\config\applicationhost.config
911
set SITE=Sif.Framework.Demo.Us.Provider
1012

13+
echo Configuration file search order ...
14+
echo %CONFIG_VS2015%
15+
echo %CONFIG_ONEDRIVE%
16+
echo %CONFIG_ORIGINAL%
17+
1118
rem ============================================================================
1219
rem == Safety checks ==
1320
rem ============================================================================
1421

1522
if exist %IISEXPRESS_EXE% goto okIIS
16-
echo Could not find : %IISEXPRESS_EXE%
23+
echo IIS Express not find : %IISEXPRESS_EXE%
1724
pause
1825
goto end
1926
:okIIS
2027

21-
if exist "%~dp0%WEBAPP%" goto okExec
22-
echo Could not find : %WEBAPP%
28+
if exist "%CONFIG_VS2015%" goto okConfigVS2015
29+
if exist "%CONFIG_ONEDRIVE%" goto okConfigOneDrive
30+
if exist "%CONFIG_ORIGINAL%" goto okConfigOriginal
31+
echo No configuration file found!
2332
pause
2433
goto end
34+
35+
:okConfigVS2015
36+
set IISEXPRESS_CONFIG=%CONFIG_VS2015%
37+
echo Using configuration file : %CONFIG_VS2015%
38+
goto okExec
39+
40+
:okConfigOneDrive
41+
set IISEXPRESS_CONFIG=%CONFIG_ONEDRIVE%
42+
echo Using configuration file : %CONFIG_ONEDRIVE%
43+
goto okExec
44+
45+
:okConfigOriginal
46+
set IISEXPRESS_CONFIG=%CONFIG_ORIGINAL%
47+
echo Using configuration file : %CONFIG_ORIGINAL%
48+
goto okExec
49+
2550
:okExec
2651

2752
rem ============================================================================
2853
rem == Start Webapp
2954
rem ============================================================================
3055

31-
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%~dp0%WEBAPP%" /site:%SITE%
32-
56+
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%IISEXPRESS_CONFIG%" /site:%SITE% /trace:error
3357
:end

‎Scripts/BAT/Demo execution/EnvironmentProvider.bat‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,54 @@ rem ============================================================================
44
rem == User defined environment variables ==
55
rem ============================================================================
66

7+
set CONFIG_ONEDRIVE=%userprofile%\OneDrive\Documents\IISExpress\config\applicationhost.config
8+
set CONFIG_ORIGINAL=%userprofile%\Documents\IISExpress\config\applicationhost.config
9+
set CONFIG_VS2015=%~dp0..\..\..\Code\Sif3Framework\.vs\config\applicationhost.config
710
set IISEXPRESS_EXE="C:\Program Files\IIS Express\iisexpress.exe"
8-
set WEBAPP=..\..\..\Code\Sif3Framework\.vs\config\applicationhost.config
911
set SITE=Sif.Framework.EnvironmentProvider
1012

13+
echo Configuration file search order ...
14+
echo %CONFIG_VS2015%
15+
echo %CONFIG_ONEDRIVE%
16+
echo %CONFIG_ORIGINAL%
17+
1118
rem ============================================================================
1219
rem == Safety checks ==
1320
rem ============================================================================
1421

1522
if exist %IISEXPRESS_EXE% goto okIIS
16-
echo Could not find : %IISEXPRESS_EXE%
23+
echo IIS Express not find : %IISEXPRESS_EXE%
1724
pause
1825
goto end
1926
:okIIS
2027

21-
if exist "%~dp0%WEBAPP%" goto okExec
22-
echo Could not find : %WEBAPP%
28+
if exist "%CONFIG_VS2015%" goto okConfigVS2015
29+
if exist "%CONFIG_ONEDRIVE%" goto okConfigOneDrive
30+
if exist "%CONFIG_ORIGINAL%" goto okConfigOriginal
31+
echo No configuration file found!
2332
pause
2433
goto end
34+
35+
:okConfigVS2015
36+
set IISEXPRESS_CONFIG=%CONFIG_VS2015%
37+
echo Using configuration file : %CONFIG_VS2015%
38+
goto okExec
39+
40+
:okConfigOneDrive
41+
set IISEXPRESS_CONFIG=%CONFIG_ONEDRIVE%
42+
echo Using configuration file : %CONFIG_ONEDRIVE%
43+
goto okExec
44+
45+
:okConfigOriginal
46+
set IISEXPRESS_CONFIG=%CONFIG_ORIGINAL%
47+
echo Using configuration file : %CONFIG_ORIGINAL%
48+
goto okExec
49+
2550
:okExec
2651

2752
rem ============================================================================
2853
rem == Start Webapp
2954
rem ============================================================================
3055

31-
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%~dp0%WEBAPP%" /site:%SITE% /trace:error
56+
START "%SITE%" /WAIT /B %IISEXPRESS_EXE% /config:"%IISEXPRESS_CONFIG%" /site:%SITE% /trace:error
3257
:end

0 commit comments

Comments
 (0)