Skip to content

Commit 841d2fe

Browse files
SimonCroppSimonCropp
committed
.
1 parent 030c71b commit 841d2fe

File tree

3 files changed

+206
-18
lines changed

3 files changed

+206
-18
lines changed

‎src/ApiBuilderTests/Splitter.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ public class Splitter
4141

4242
static HashSet<string> BuildAllKnownSymbols()
4343
{
44-
var symbols = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
44+
var symbols = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
45+
{
46+
"NETCOREAPP2X",
47+
"NETCOREAPP3X",
48+
"NETCOREAPPX",
49+
"NET46X",
50+
"NET47X",
51+
"NET48X",
52+
"NETCOREAPP",
53+
"NETFRAMEWORK",
54+
"NETSTANDARD",
55+
"WINDOWS_UWP"
56+
};
4557

4658
// Add all specific version symbols
47-
foreach (var tfm in TargetFrameworks)
59+
foreach (var framework in TargetFrameworks)
4860
{
49-
var symbolsForTfm = GetPreprocessorSymbolsForFramework(tfm);
61+
var symbolsForTfm = GetPreprocessorSymbolsForFramework(framework);
5062
foreach (var sym in symbolsForTfm)
5163
{
5264
symbols.Add(sym);
5365
}
5466
}
5567

56-
// Add X-suffixed symbols
57-
symbols.Add("NETCOREAPP2X");
58-
symbols.Add("NETCOREAPP3X");
59-
symbols.Add("NETCOREAPPX");
60-
symbols.Add("NET46X");
61-
symbols.Add("NET47X");
62-
symbols.Add("NET48X");
63-
symbols.Add("NETCOREAPP");
64-
symbols.Add("NETFRAMEWORK");
65-
symbols.Add("NETSTANDARD");
66-
symbols.Add("WINDOWS_UWP");
67-
6868
return symbols;
6969
}
7070

‎src/ApiBuilderTests/SplitterTests.GetPreprocessorSymbols.verified.txt‎

Lines changed: 190 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,190 @@
1-

1+
{
2+
net10.0: [
3+
NET10_0,
4+
NET10_0_OR_GREATER,
5+
NET5_0_OR_GREATER,
6+
NET6_0_OR_GREATER,
7+
NET7_0_OR_GREATER,
8+
NET8_0_OR_GREATER,
9+
NET9_0_OR_GREATER,
10+
NETCOREAPP,
11+
NETCOREAPP2_0_OR_GREATER,
12+
NETCOREAPP2_1_OR_GREATER,
13+
NETCOREAPP3_0_OR_GREATER,
14+
NETCOREAPP3_1_OR_GREATER
15+
],
16+
net461: [
17+
NETFRAMEWORK,
18+
NET46X,
19+
NET461,
20+
NET461_OR_GREATER
21+
],
22+
net462: [
23+
NETFRAMEWORK,
24+
NET46X,
25+
NET462,
26+
NET462_OR_GREATER,
27+
NET461_OR_GREATER
28+
],
29+
net47: [
30+
NETFRAMEWORK,
31+
NET47X,
32+
NET461_OR_GREATER,
33+
NET462_OR_GREATER,
34+
NET47,
35+
NET47_OR_GREATER
36+
],
37+
net471: [
38+
NETFRAMEWORK,
39+
NET47X,
40+
NET461_OR_GREATER,
41+
NET462_OR_GREATER,
42+
NET471,
43+
NET471_OR_GREATER,
44+
NET47_OR_GREATER
45+
],
46+
net472: [
47+
NETFRAMEWORK,
48+
NET47X,
49+
NET461_OR_GREATER,
50+
NET462_OR_GREATER,
51+
NET472,
52+
NET472_OR_GREATER,
53+
NET471_OR_GREATER,
54+
NET47_OR_GREATER
55+
],
56+
net48: [
57+
NETFRAMEWORK,
58+
NET48X,
59+
NET461_OR_GREATER,
60+
NET462_OR_GREATER,
61+
NET47_OR_GREATER,
62+
NET471_OR_GREATER,
63+
NET472_OR_GREATER,
64+
NET48,
65+
NET48_OR_GREATER
66+
],
67+
net481: [
68+
NETFRAMEWORK,
69+
NET48X,
70+
NET461_OR_GREATER,
71+
NET462_OR_GREATER,
72+
NET47_OR_GREATER,
73+
NET471_OR_GREATER,
74+
NET472_OR_GREATER,
75+
NET481,
76+
NET481_OR_GREATER,
77+
NET48_OR_GREATER
78+
],
79+
net5.0: [
80+
NET5_0,
81+
NET5_0_OR_GREATER,
82+
NETCOREAPP,
83+
NETCOREAPP2_0_OR_GREATER,
84+
NETCOREAPP2_1_OR_GREATER,
85+
NETCOREAPP3_0_OR_GREATER,
86+
NETCOREAPP3_1_OR_GREATER
87+
],
88+
net6.0: [
89+
NET6_0,
90+
NET6_0_OR_GREATER,
91+
NET5_0_OR_GREATER,
92+
NETCOREAPP,
93+
NETCOREAPP2_0_OR_GREATER,
94+
NETCOREAPP2_1_OR_GREATER,
95+
NETCOREAPP3_0_OR_GREATER,
96+
NETCOREAPP3_1_OR_GREATER
97+
],
98+
net7.0: [
99+
NET7_0,
100+
NET7_0_OR_GREATER,
101+
NET5_0_OR_GREATER,
102+
NET6_0_OR_GREATER,
103+
NETCOREAPP,
104+
NETCOREAPP2_0_OR_GREATER,
105+
NETCOREAPP2_1_OR_GREATER,
106+
NETCOREAPP3_0_OR_GREATER,
107+
NETCOREAPP3_1_OR_GREATER
108+
],
109+
net8.0: [
110+
NET8_0,
111+
NET8_0_OR_GREATER,
112+
NET5_0_OR_GREATER,
113+
NET6_0_OR_GREATER,
114+
NET7_0_OR_GREATER,
115+
NETCOREAPP,
116+
NETCOREAPP2_0_OR_GREATER,
117+
NETCOREAPP2_1_OR_GREATER,
118+
NETCOREAPP3_0_OR_GREATER,
119+
NETCOREAPP3_1_OR_GREATER
120+
],
121+
net9.0: [
122+
NET9_0,
123+
NET9_0_OR_GREATER,
124+
NET5_0_OR_GREATER,
125+
NET6_0_OR_GREATER,
126+
NET7_0_OR_GREATER,
127+
NET8_0_OR_GREATER,
128+
NETCOREAPP,
129+
NETCOREAPP2_0_OR_GREATER,
130+
NETCOREAPP2_1_OR_GREATER,
131+
NETCOREAPP3_0_OR_GREATER,
132+
NETCOREAPP3_1_OR_GREATER
133+
],
134+
netcoreapp2.0: [
135+
NETCOREAPP,
136+
NETCOREAPPX,
137+
NETCOREAPP2X,
138+
NETCOREAPP2_0,
139+
NETCOREAPP2_0_OR_GREATER
140+
],
141+
netcoreapp2.1: [
142+
NETCOREAPP,
143+
NETCOREAPPX,
144+
NETCOREAPP2X,
145+
NETCOREAPP2_1,
146+
NETCOREAPP2_1_OR_GREATER,
147+
NETCOREAPP2_0_OR_GREATER
148+
],
149+
netcoreapp2.2: [
150+
NETCOREAPP,
151+
NETCOREAPPX,
152+
NETCOREAPP2X,
153+
NETCOREAPP2_2,
154+
NETCOREAPP2_2_OR_GREATER,
155+
NETCOREAPP2_1_OR_GREATER,
156+
NETCOREAPP2_0_OR_GREATER
157+
],
158+
netcoreapp3.0: [
159+
NETCOREAPP,
160+
NETCOREAPPX,
161+
NETCOREAPP3X,
162+
NETCOREAPP2_0_OR_GREATER,
163+
NETCOREAPP2_1_OR_GREATER,
164+
NETCOREAPP2_2_OR_GREATER,
165+
NETCOREAPP3_0,
166+
NETCOREAPP3_0_OR_GREATER
167+
],
168+
netcoreapp3.1: [
169+
NETCOREAPP,
170+
NETCOREAPPX,
171+
NETCOREAPP3X,
172+
NETCOREAPP2_0_OR_GREATER,
173+
NETCOREAPP2_1_OR_GREATER,
174+
NETCOREAPP2_2_OR_GREATER,
175+
NETCOREAPP3_1,
176+
NETCOREAPP3_1_OR_GREATER,
177+
NETCOREAPP3_0_OR_GREATER
178+
],
179+
netstandard2.0: [
180+
NETSTANDARD,
181+
NETSTANDARD2_0,
182+
NETSTANDARD2_0_OR_GREATER
183+
],
184+
netstandard2.1: [
185+
NETSTANDARD,
186+
NETSTANDARD2_1,
187+
NETSTANDARD2_1_OR_GREATER,
188+
NETSTANDARD2_0_OR_GREATER
189+
]
190+
}

‎src/ApiBuilderTests/SplitterTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
public class SplitterTests
22
{
33
[Test]
4-
[Explicit]
54
public async Task Run()
65
{
76
Splitter.Run();
@@ -991,7 +990,7 @@ public async Task WindowsUwp()
991990

992991
// Both conditions should be true for WINDOWS_UWP
993992
await Assert.That(resultUwp).Contains("uwp_code");
994-
await Assert.That(resultUwp).Contains("net10_code");
993+
await Assert.That(resultUwp).Contains("netstandard_code");
995994
await Assert.That(resultUwp).DoesNotContain("#if");
996995
}
997996

0 commit comments

Comments
 (0)