Skip to content

Commit b7f16b0

Browse files
Cease setting PLATFORM environment variable
* Creating a test configuration was setting PLATFORM, which MsBuild then take into account, wrecking some build options like async code generation.
1 parent 8da7a19 commit b7f16b0

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

ShowBuildMenu.bat

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,76 +70,78 @@ if errorlevel 0 goto test-setup-sqlserver
7070

7171
:test-setup-sqlserver
7272
set CONFIG_NAME=MSSQL
73-
set PLATFORM=AnyCPU
73+
set TEST_PLATFORM=AnyCPU
7474
set LIB_FILES=
7575
set LIB_FILES2=
7676
goto test-setup-generic
7777

7878
:test-setup-sqlservercex86
7979
set CONFIG_NAME=SqlServerCe32
80-
set PLATFORM=AnyCPU
80+
set TEST_PLATFORM=AnyCPU
8181
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
8282
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
8383
goto test-setup-generic
8484

8585
:test-setup-sqlservercex64
8686
set CONFIG_NAME=SqlServerCe64
87-
set PLATFORM=AnyCPU
87+
set TEST_PLATFORM=AnyCPU
8888
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
8989
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
9090
goto test-setup-generic
9191

9292
:test-setup-firebirdx86
9393
set CONFIG_NAME=FireBird
94-
set PLATFORM=x86
94+
set TEST_PLATFORM=x86
9595
set LIB_FILES=lib\teamcity\firebird\*.dll
96+
set LIB_FILES2=
9697
goto test-setup-generic
9798

9899
:test-setup-firebirdx64
99100
set CONFIG_NAME=FireBird
100-
set PLATFORM=x64
101+
set TEST_PLATFORM=x64
101102
set LIB_FILES=lib\teamcity\firebird\*.dll
103+
set LIB_FILES2=
102104
goto test-setup-generic
103105

104106
:test-setup-sqlitex86
105107
set CONFIG_NAME=SQLite
106-
set PLATFORM=x86
108+
set TEST_PLATFORM=x86
107109
set LIB_FILES=lib\teamcity\sqlite\x86\*
108110
set LIB_FILES2=
109111
goto test-setup-generic
110112

111113
:test-setup-sqlitex64
112114
set CONFIG_NAME=SQLite
113-
set PLATFORM=x64
115+
set TEST_PLATFORM=x64
114116
set LIB_FILES=lib\teamcity\sqlite\x64\*
115117
set LIB_FILES2=
116118
goto test-setup-generic
117119

118120
:test-setup-postgresql
119121
set CONFIG_NAME=PostgreSQL
120-
set PLATFORM=AnyCPU
122+
set TEST_PLATFORM=AnyCPU
121123
set LIB_FILES=lib\teamcity\postgresql\*.dll
122124
set LIB_FILES2=
123125
goto test-setup-generic
124126

125127
:test-setup-mysql
126128
set CONFIG_NAME=MySql
127-
set PLATFORM=AnyCPU
129+
set TEST_PLATFORM=AnyCPU
128130
set LIB_FILES=lib\teamcity\mysql\*.dll
129131
set LIB_FILES2=
130132
goto test-setup-generic
131133

132134
:test-setup-oracle
133135
set CONFIG_NAME=Oracle
134-
set PLATFORM=x86
136+
set TEST_PLATFORM=x86
135137
set LIB_FILES=lib\teamcity\oracle\x86\*.dll
136138
set LIB_FILES2=
137139
goto test-setup-generic
138140

139141
:test-setup-generic
140142
set CFGNAME=
141143
set /p CFGNAME=Enter a name for your test configuration or press enter to use default name:
142-
if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%PLATFORM%
144+
if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%TEST_PLATFORM%
143145
mkdir "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"
144146
if /I "%LIB_FILES%"=="" goto test-setup-generic-skip-copy
145147
copy %LIB_FILES% "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"

0 commit comments

Comments
 (0)