Skip to content

Commit b34fde2

Browse files
michaelbeale-ILmichaelbeale-IL
authored
Merge pull request #101 from intel/version_number_update
Fix deploy.bat script
2 parents 1aaf7be + 8a9cf97 commit b34fde2

File tree

3 files changed

+202
-135
lines changed

3 files changed

+202
-135
lines changed

‎src/ACATResources/ACATResources.csproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,95 +66,95 @@
6666
</ItemGroup>
6767
<ItemGroup>
6868
<Content Include="en\KeyboardABCUserControlBCI2.xml">
69-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69+
7070
</Content>
7171
<Content Include="en\KeyboardEditUserControlBCI.xml">
72-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
7373
</Content>
7474
<Content Include="en\KeyboardLockUserControlBCI.xml">
75-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
75+
7676
</Content>
7777
<Content Include="en\KeyboardModesUserControlBCI.xml">
78-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78+
7979
</Content>
8080
<Content Include="en\KeyboardNumberNumericKeypadUserControl.xml">
81-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81+
8282
</Content>
8383
<Content Include="en\KeyboardYesNoUserControlBCI2.xml">
84-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84+
8585
</Content>
8686
<Content Include="en\MenuUserControlBCI.xml">
87-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
87+
8888
</Content>
8989
<Content Include="en\NumericUserControlBCI.xml">
90-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90+
9191
</Content>
9292
<Content Include="en\PhrasesUserControlBCI.xml">
93-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
93+
9494
</Content>
9595
<Content Include="en\TalkApplicationBCIScannerNewUI.xml">
96-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
96+
9797
</Content>
9898
<Content Include="en\TTSYesNoUserControlBCI2.xml">
99-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99+
100100
</Content>
101101
<Content Include="en\UserControlContainerForm.xml">
102-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
102+
103103
</Content>
104104
<Content Include="en\UserControlScreenLock.xml">
105-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105+
106106
</Content>
107107
<Content Include="en\UserControlDefaultTryout.xml">
108-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
108+
109109
</Content>
110110
<Content Include="en\KeyboardAbcUserControl.xml">
111-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
111+
112112
</Content>
113113
<Content Include="en\ScanTimeAdjustForm.xml">
114-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114+
115115
</Content>
116116
<Content Include="en\UserControlTalkInterfaceDesc.xml">
117-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117+
118118
</Content>
119119
<Content Include="en\WordPredictionSetModeScanner.xml">
120-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
120+
121121
</Content>
122122
<Content Include="en\KeyboardNumbersUserControl.xml">
123-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
123+
124124
</Content>
125125
<Content Include="en\KeyboardEditUserControl.xml">
126-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126+
127127
</Content>
128128
<Content Include="en\MainMenu.xml">
129-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
129+
130130
</Content>
131131
<Content Include="en\SentencePredictionUserControl.xml">
132-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
132+
133133
</Content>
134134
<Content Include="en\KeyboardQwertyUserControl.xml">
135-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
135+
136136
</Content>
137137
<Content Include="en\PanelConfigMap.xml">
138-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
138+
139139
<SubType>Designer</SubType>
140140
</Content>
141141
<Content Include="en\TalkApplicationScannerQwerty.xml">
142-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
142+
143143
</Content>
144144
<Content Include="en\UserControlConfigMap.xml">
145-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
145+
146146
</Content>
147147
<Content Include="en\WordPredictionUserControl.xml">
148-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
148+
149149
</Content>
150150
<Content Include="en\WordPredictionUserControlBCI.xml">
151-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
151+
152152
</Content>
153153
<Content Include="en\YesNoResponseScanner.xml">
154-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
154+
155155
</Content>
156156
<Content Include="en\YesNoScanner.xml">
157-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
157+
158158
</Content>
159159
</ItemGroup>
160160
<ItemGroup>

‎src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj‎

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
3939
<Optimize>true</Optimize>
4040
<OutputPath>bin\Release\</OutputPath>
41-
<ErrorReport>prompt</ErrorReport>
41+
<ErrorReport>prompt</ErrorReport>
4242
<WarningLevel>4</WarningLevel>
4343
<Prefer32Bit>false</Prefer32Bit>
4444
</PropertyGroup>
@@ -132,154 +132,152 @@
132132
</EmbeddedResource>
133133
</ItemGroup>
134134
<ItemGroup>
135-
<Content Include="External\acat_gestures.exe">
136-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
137-
</Content>
135+
<Content Include="External\acat_gestures.exe" />
138136
<Content Include="External\acat_gestures_dll.dll">
139-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
137+
140138
</Content>
141139
<Content Include="External\acat_gestures_dll_d.dll">
142-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
140+
143141
</Content>
144142
<Content Include="External\libinfra.dll">
145-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
143+
146144
</Content>
147145
<Content Include="External\libinfra_d.dll">
148-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
146+
149147
</Content>
150148
<Content Include="External\libivcp.dll">
151-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
149+
152150
</Content>
153151
<Content Include="External\libivcp_d.dll">
154-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
152+
155153
</Content>
156154
<Content Include="External\libpipeline.dll">
157-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
155+
158156
</Content>
159157
<Content Include="External\libpipeline_d.dll">
160-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
158+
161159
</Content>
162160
<Content Include="External\msvcp110.dll">
163-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
161+
164162
</Content>
165163
<Content Include="External\msvcr110.dll">
166-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
164+
167165
</Content>
168166
<Content Include="External\opencv_calib3d2413.dll">
169-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
167+
170168
</Content>
171169
<Content Include="External\opencv_calib3d2413d.dll">
172-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
170+
173171
</Content>
174172
<Content Include="External\opencv_contrib2413.dll">
175-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
173+
176174
</Content>
177175
<Content Include="External\opencv_contrib2413d.dll">
178-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
176+
179177
</Content>
180178
<Content Include="External\opencv_core2413.dll">
181-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
179+
182180
</Content>
183181
<Content Include="External\opencv_core2413d.dll">
184-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
182+
185183
</Content>
186184
<Content Include="External\opencv_features2d2413.dll">
187-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
185+
188186
</Content>
189187
<Content Include="External\opencv_features2d2413d.dll">
190-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
188+
191189
</Content>
192190
<Content Include="External\opencv_ffmpeg2413.dll">
193-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
191+
194192
</Content>
195193
<Content Include="External\opencv_flann2413.dll">
196-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
194+
197195
</Content>
198196
<Content Include="External\opencv_flann2413d.dll">
199-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
197+
200198
</Content>
201199
<Content Include="External\opencv_gpu2413.dll">
202-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
200+
203201
</Content>
204202
<Content Include="External\opencv_gpu2413d.dll">
205-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
203+
206204
</Content>
207205
<Content Include="External\opencv_highgui2413.dll">
208-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
206+
209207
</Content>
210208
<Content Include="External\opencv_highgui2413d.dll">
211-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
209+
212210
</Content>
213211
<Content Include="External\opencv_imgproc2413.dll">
214-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
212+
215213
</Content>
216214
<Content Include="External\opencv_imgproc2413d.dll">
217-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
215+
218216
</Content>
219217
<Content Include="External\opencv_legacy2413.dll">
220-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
218+
221219
</Content>
222220
<Content Include="External\opencv_legacy2413d.dll">
223-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
221+
224222
</Content>
225223
<Content Include="External\opencv_ml2413.dll">
226-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
224+
227225
</Content>
228226
<Content Include="External\opencv_ml2413d.dll">
229-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227+
230228
</Content>
231229
<Content Include="External\opencv_nonfree2413.dll">
232-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230+
233231
</Content>
234232
<Content Include="External\opencv_nonfree2413d.dll">
235-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
233+
236234
</Content>
237235
<Content Include="External\opencv_objdetect2413.dll">
238-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
236+
239237
</Content>
240238
<Content Include="External\opencv_objdetect2413d.dll">
241-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
239+
242240
</Content>
243241
<Content Include="External\opencv_ocl2413.dll">
244-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
242+
245243
</Content>
246244
<Content Include="External\opencv_ocl2413d.dll">
247-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
245+
248246
</Content>
249247
<Content Include="External\opencv_photo2413.dll">
250-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
248+
251249
</Content>
252250
<Content Include="External\opencv_photo2413d.dll">
253-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
251+
254252
</Content>
255253
<Content Include="External\opencv_stitching2413.dll">
256-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
254+
257255
</Content>
258256
<Content Include="External\opencv_stitching2413d.dll">
259-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
257+
260258
</Content>
261259
<Content Include="External\opencv_superres2413.dll">
262-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
260+
263261
</Content>
264262
<Content Include="External\opencv_superres2413d.dll">
265-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
263+
266264
</Content>
267265
<Content Include="External\opencv_video2413.dll">
268-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
266+
269267
</Content>
270268
<Content Include="External\opencv_video2413d.dll">
271-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
269+
272270
</Content>
273271
<Content Include="External\opencv_videostab2413.dll">
274-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
272+
275273
</Content>
276274
<Content Include="External\opencv_videostab2413d.dll">
277-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
275+
278276
</Content>
279277
</ItemGroup>
280278
<ItemGroup>
281279
<None Include="External\shape_predictor_68_face_landmarks.dat">
282-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
280+
283281
</None>
284282
</ItemGroup>
285283
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)