Skip to content

Commit ef0c8d2

Browse files
walbournwalbourn
committed
Migrate all VS solutions to slnx
1 parent f4d4c9e commit ef0c8d2

2 files changed

Lines changed: 129 additions & 64 deletions

File tree

‎.github/workflows/msbuild.yml‎

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,14 @@ jobs:
3636
fail-fast: false
3737

3838
matrix:
39-
vs: [2019, 2022]
4039
build_type: [Debug, Release, 'NI Debug', 'NI Release']
4140
platform: [x86, x64, ARM64]
42-
exclude:
43-
- vs: 2019
44-
platform: ARM64
4541

4642
steps:
47-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
43+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4844

4945
- name: Clone test repository
50-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
46+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5147
with:
5248
repository: walbourn/directxmathtest
5349
path: Tests
@@ -62,21 +58,66 @@ jobs:
6258
working-directory: ${{ github.workspace }}/Tests/math3
6359
run: >
6460
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
65-
./math3_${{ matrix.vs }}.sln
61+
./math3_2022.slnx
6662
6763
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
6864
name: Build shmath
6965
working-directory: ${{ github.workspace }}/Tests/shmath
7066
run: >
7167
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
72-
./shmath_${{ matrix.vs }}.sln
68+
./shmath_2022.slnx
7369
7470
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
7571
name: Build xdsp
7672
working-directory: ${{ github.workspace }}/Tests/xdsp
7773
run: >
7874
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
79-
./XDSPTest_${{ matrix.vs }}.sln
75+
./XDSPTest_2022.slnx
76+
77+
build2019:
78+
runs-on: windows-2022
79+
80+
strategy:
81+
fail-fast: false
82+
83+
matrix:
84+
build_type: [Debug, Release, 'NI Debug', 'NI Release']
85+
platform: [x86, x64]
86+
87+
steps:
88+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
89+
90+
- name: Clone test repository
91+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
92+
with:
93+
repository: walbourn/directxmathtest
94+
path: Tests
95+
ref: main
96+
97+
- name: Add MSBuild to PATH
98+
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
99+
with:
100+
msbuild-architecture: x64
101+
102+
- name: Build math3
103+
working-directory: ${{ github.workspace }}/Tests/math3
104+
run: >
105+
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
106+
./math3_2019.sln
107+
108+
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
109+
name: Build shmath
110+
working-directory: ${{ github.workspace }}/Tests/shmath
111+
run: >
112+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
113+
./shmath_2019.sln
114+
115+
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
116+
name: Build xdsp
117+
working-directory: ${{ github.workspace }}/Tests/xdsp
118+
run: >
119+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
120+
./XDSPTest_2019.sln
80121
81122
build2022_arm64:
82123
runs-on: windows-11-arm
@@ -88,10 +129,10 @@ jobs:
88129
build_type: [Debug, Release, 'NI Debug', 'NI Release']
89130

90131
steps:
91-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
132+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
92133

93134
- name: Clone test repository
94-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
135+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
95136
with:
96137
repository: walbourn/directxmathtest
97138
path: Tests

‎.github/workflows/msbuildex.yml‎

Lines changed: 77 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -37,72 +37,96 @@ jobs:
3737

3838
matrix:
3939
include:
40-
- vs: 2019
41-
platform: x86
40+
- platform: x86
4241
build_type: 'AVX Debug'
43-
- vs: 2019
44-
platform: x64
42+
- platform: x64
4543
build_type: 'AVX Debug'
46-
- vs: 2022
47-
platform: x86
48-
build_type: 'AVX Debug'
49-
- vs: 2022
50-
platform: x64
51-
build_type: 'AVX Debug'
52-
- vs: 2019
53-
platform: x86
54-
build_type: 'AVX2 Debug'
55-
- vs: 2019
56-
platform: x64
57-
build_type: 'AVX2 Debug'
58-
- vs: 2022
59-
platform: x86
44+
- platform: x86
6045
build_type: 'AVX2 Debug'
61-
- vs: 2022
62-
platform: x64
46+
- platform: x64
6347
build_type: 'AVX2 Debug'
64-
- vs: 2019
65-
platform: x86
48+
- platform: x86
6649
build_type: 'x87 Debug'
67-
- vs: 2022
68-
platform: x86
69-
build_type: 'x87 Debug'
70-
- vs: 2019
71-
platform: x86
72-
build_type: 'AVX Release'
73-
- vs: 2019
74-
platform: x64
75-
build_type: 'AVX Release'
76-
- vs: 2022
77-
platform: x86
50+
- platform: x86
7851
build_type: 'AVX Release'
79-
- vs: 2022
80-
platform: x64
52+
- platform: x64
8153
build_type: 'AVX Release'
82-
- vs: 2019
83-
platform: x86
54+
- platform: x86
8455
build_type: 'AVX2 Release'
85-
- vs: 2019
86-
platform: x64
56+
- platform: x64
8757
build_type: 'AVX2 Release'
88-
- vs: 2022
89-
platform: x86
58+
- platform: x86
59+
build_type: 'x87 Release'
60+
61+
steps:
62+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63+
64+
- name: Clone test repository
65+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
66+
with:
67+
repository: walbourn/directxmathtest
68+
path: Tests
69+
ref: main
70+
71+
- name: Add MSBuild to PATH
72+
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
73+
with:
74+
msbuild-architecture: x64
75+
76+
- name: Build math3
77+
working-directory: ${{ github.workspace }}/Tests/math3
78+
run: >
79+
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
80+
./math3_2022.slnx
81+
82+
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
83+
name: Build shmath
84+
working-directory: ${{ github.workspace }}/Tests/shmath
85+
run: >
86+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
87+
./shmath_2022.slnx
88+
89+
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
90+
name: Build xdsp
91+
working-directory: ${{ github.workspace }}/Tests/xdsp
92+
run: >
93+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
94+
./XDSPTest_2022.slnx
95+
96+
build2019:
97+
runs-on: windows-2022
98+
99+
strategy:
100+
fail-fast: false
101+
102+
matrix:
103+
include:
104+
- platform: x86
105+
build_type: 'AVX Debug'
106+
- platform: x64
107+
build_type: 'AVX Debug'
108+
- platform: x86
109+
build_type: 'AVX2 Debug'
110+
- platform: x64
111+
build_type: 'AVX2 Debug'
112+
- platform: x86
113+
build_type: 'x87 Debug'
114+
- platform: x86
115+
build_type: 'AVX Release'
116+
- platform: x64
117+
build_type: 'AVX Release'
118+
- platform: x86
90119
build_type: 'AVX2 Release'
91-
- vs: 2022
92-
platform: x64
120+
- platform: x64
93121
build_type: 'AVX2 Release'
94-
- vs: 2019
95-
platform: x86
96-
build_type: 'x87 Release'
97-
- vs: 2022
98-
platform: x86
122+
- platform: x86
99123
build_type: 'x87 Release'
100124

101125
steps:
102-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
126+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
103127

104128
- name: Clone test repository
105-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
129+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
106130
with:
107131
repository: walbourn/directxmathtest
108132
path: Tests
@@ -117,18 +141,18 @@ jobs:
117141
working-directory: ${{ github.workspace }}/Tests/math3
118142
run: >
119143
msbuild /m /p:Configuration="${{ matrix.build_type }}" /p:Platform=${{ matrix.platform }}
120-
./math3_${{ matrix.vs }}.sln
144+
./math3_2019.sln
121145
122146
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
123147
name: Build shmath
124148
working-directory: ${{ github.workspace }}/Tests/shmath
125149
run: >
126150
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
127-
./shmath_${{ matrix.vs }}.sln
151+
./shmath_2019.sln
128152
129153
- if: (matrix.build_type == 'Debug') || (matrix.build_type == 'Release')
130154
name: Build xdsp
131155
working-directory: ${{ github.workspace }}/Tests/xdsp
132156
run: >
133157
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
134-
./XDSPTest_${{ matrix.vs }}.sln
158+
./XDSPTest_2019.sln

0 commit comments

Comments
 (0)