Skip to content

Commit 683465c

Browse files
sim1984sim1984
committed
Merge branch 'master' into hypotset-agg-functions
2 parents d896f6b + fdd011c commit 683465c

140 files changed

Lines changed: 6780 additions & 1270 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
if: github.ref_type != 'tag'
157157
runs-on: ${{ matrix.os }}
158158
env:
159-
VS_VERSION: 2022
159+
VS_VERSION: 2026
160160

161161
strategy:
162162
fail-fast: false
@@ -184,7 +184,7 @@ jobs:
184184
shell: cmd
185185
env:
186186
PLATFORM: ${{ matrix.platform }}
187-
VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat
187+
VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat
188188
run: |
189189
set SEVENZIP=C:\Program Files\7-Zip
190190
set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
@@ -293,7 +293,7 @@ jobs:
293293
if: ${{ runner.environment == 'github-hosted' }}
294294
shell: cmd
295295
run: |
296-
rd "C:\Program Files\Microsoft Visual Studio\2022" /s /q
296+
rd "C:\Program Files\Microsoft Visual Studio\18" /s /q
297297
298298
- name: Checkout
299299
uses: actions/checkout@v4

‎builds/win32/msvc15/alice.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3232
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3435
</PropertyGroup>
3536
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3637
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎builds/win32/msvc15/btyacc.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3434
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3535
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
36+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3637
</PropertyGroup>
3738
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3839
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

‎builds/win32/msvc15/build_msg.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3434
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
35+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3536
</PropertyGroup>
3637
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎builds/win32/msvc15/burp.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3232
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3435
</PropertyGroup>
3536
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3637
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎builds/win32/msvc15/chacha.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3434
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
35+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3536
</PropertyGroup>
3637
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

‎builds/win32/msvc15/common.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
<ClInclude Include="..\..\..\src\common\CvtFormatImpl.h" />
187187
<ClInclude Include="..\..\..\src\common\db_alias.h" />
188188
<ClInclude Include="..\..\..\src\common\DecFloat.h" />
189+
<ClInclude Include="..\..\..\src\common\DeindentedStr.h" />
189190
<ClInclude Include="..\..\..\src\common\dllinst.h" />
190191
<ClInclude Include="..\..\..\src\common\dsc.h" />
191192
<ClInclude Include="..\..\..\src\common\dsc_proto.h" />
@@ -248,6 +249,7 @@
248249
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
249250
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
250251
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
252+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
251253
<RootNamespace>common</RootNamespace>
252254
</PropertyGroup>
253255
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎builds/win32/msvc15/common.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,9 @@
581581
<ClInclude Include="..\..\..\src\common\DecFloat.h">
582582
<Filter>headers</Filter>
583583
</ClInclude>
584+
<ClInclude Include="..\..\..\src\common\DeindentedStr.h">
585+
<Filter>headers</Filter>
586+
</ClInclude>
584587
<ClInclude Include="..\..\..\src\common\classes\BatchCompletionState.h">
585588
<Filter>headers</Filter>
586589
</ClInclude>

‎builds/win32/msvc15/common_test.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
3434
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
35+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='18.0'">10.0</WindowsTargetPlatformVersion>
3536
</PropertyGroup>
3637
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,6 +260,7 @@
259260
<ClCompile Include="..\..\..\src\common\ipc\tests\IpcMessageTest.cpp" />
260261
<ClCompile Include="..\..\..\src\common\tests\CommonTest.cpp" />
261262
<ClCompile Include="..\..\..\src\common\tests\CvtTest.cpp" />
263+
<ClCompile Include="..\..\..\src\common\tests\DeindentedStrTest.cpp" />
262264
<ClCompile Include="..\..\..\src\common\tests\StringTest.cpp" />
263265
<ClCompile Include="..\..\..\src\common\classes\tests\AlignerTest.cpp" />
264266
<ClCompile Include="..\..\..\src\common\classes\tests\ArrayTest.cpp" />

‎builds/win32/msvc15/common_test.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<ClCompile Include="..\..\..\src\common\tests\CvtTest.cpp">
2222
<Filter>source</Filter>
2323
</ClCompile>
24+
<ClCompile Include="..\..\..\src\common\tests\DeindentedStrTest.cpp">
25+
<Filter>source</Filter>
26+
</ClCompile>
2427
<ClCompile Include="..\..\..\src\common\tests\StringTest.cpp">
2528
<Filter>source</Filter>
2629
</ClCompile>

0 commit comments

Comments
 (0)