Skip to content

Commit 3b477b4

Browse files
StephaneDelcroixStephaneDelcroix
committed
DO NOT SQUASH. REVERT BEFORE SOURCEGEN GOES PUBLIC
1 parent 9dba221 commit 3b477b4

12 files changed

+113
-13
lines changed

‎src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<!-- We can't yet disable the namescope generation, ConstraintTypeConverter and ReferenceTypeConverter need to be ported to sourcegen
1515
<DefineConstants>$(DefineConstants);_MAUIXAML_SG_NAMESCOPE_DISABLE</DefineConstants>
1616
-->
17+
<!-- We have to remove this before XAML sourcegen goes public-->
18+
<DefineConstants>$(DefineConstants);FIXME_BEFORE_PUBLIC_RELEASE</DefineConstants>
19+
1720
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
1821
<CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
1922
<EnablePreviewFeatures>True</EnablePreviewFeatures>

‎src/Controls/tests/Xaml.UnitTests/Issues/Bz43694.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ public partial class Bz43694 : ContentPage
1414
class Tests
1515
{
1616
[Test]
17+
#if FIXME_BEFORE_PUBLIC_RELEASE
18+
public void xStaticWithOnPlatformChildInRD([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
19+
#else
1720
public void xStaticWithOnPlatformChildInRD([Values] XamlInflator inflator)
21+
#endif
1822
{
1923
if (inflator == XamlInflator.XamlC)
2024
Assert.Throws(new BuildExceptionConstraint(9, 6), () => MockCompiler.Compile(typeof(Bz43694)));

‎src/Controls/tests/Xaml.UnitTests/Issues/Gh3862.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ class Tests
2020
[TearDown] public void TearDown() => DeviceInfo.SetCurrent(null);
2121

2222
[Test]
23+
#if FIXME_BEFORE_PUBLIC_RELEASE
24+
public void OnPlatformMarkupInStyle([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
25+
#else
2326
public void OnPlatformMarkupInStyle([Values] XamlInflator inflator)
27+
#endif
2428
{
2529
mockDeviceInfo.Platform = DevicePlatform.iOS;
2630
var layout = new Gh3862(inflator);

‎src/Controls/tests/Xaml.UnitTests/Issues/Gh4319.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ class Tests
1919
[TearDown] public void TearDown() => DeviceInfo.SetCurrent(null);
2020

2121
[Test]
22+
#if FIXME_BEFORE_PUBLIC_RELEASE
23+
public void OnPlatformMarkupAndNamedSizes([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
24+
#else
2225
public void OnPlatformMarkupAndNamedSizes([Values] XamlInflator inflator)
26+
#endif
2327
{
2428
mockDeviceInfo.Platform = DevicePlatform.iOS;
2529
var layout = new Gh4319(inflator);

‎src/Controls/tests/Xaml.UnitTests/Issues/GrialIssue01.xaml.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ public partial class GrialIssue01 : ContentPage
1010
[TestFixture]
1111
class Tests
1212
{
13-
[Test] public void ImplicitCastIsUsedOnFileImageSource([Values] XamlInflator inflator)
13+
[Test]
14+
#if FIXME_BEFORE_PUBLIC_RELEASE
15+
public void ImplicitCastIsUsedOnFileImageSource([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
16+
#else
17+
public void ImplicitCastIsUsedOnFileImageSource([Values] XamlInflator inflator)
18+
#endif
1419
{
1520
var layout = new GrialIssue01(inflator);
1621
var res = (FileImageSource)layout.Resources["image"];

‎src/Controls/tests/Xaml.UnitTests/Issues/Maui20244.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ public void Setup()
2525
[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
2626

2727
[Test]
28+
#if FIXME_BEFORE_PUBLIC_RELEASE
29+
public void RowDefStaticResource([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
30+
#else
2831
public void RowDefStaticResource([Values] XamlInflator inflator)
32+
#endif
2933
{
3034
var page = new Maui20244(inflator);
3135
var grid = page.grid;

‎src/Controls/tests/Xaml.UnitTests/Issues/Maui24900.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ public void TearDown()
3838
}
3939

4040
[Test]
41+
#if FIXME_BEFORE_PUBLIC_RELEASE
42+
public void OnPlatformDoesNotThrow([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
43+
#else
4144
public void OnPlatformDoesNotThrow([Values] XamlInflator inflator)
45+
#endif
4246
{
4347
mockDeviceInfo.Platform = DevicePlatform.WinUI;
4448
Assert.DoesNotThrow(() => new Maui24900(inflator));

‎src/Controls/tests/Xaml.UnitTests/Issues/Maui4509.xaml.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,23 @@ public void TearDown()
2222
}
2323

2424
[Test]
25+
#if FIXME_BEFORE_PUBLIC_RELEASE
26+
public void OnPlatformAsCollectionElementiOS([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
27+
#else
2528
public void OnPlatformAsCollectionElementiOS([Values] XamlInflator inflator)
29+
#endif
2630
{
2731
DeviceInfo.SetCurrent(new MockDeviceInfo(platform: DevicePlatform.iOS));
2832
var page = new Maui4509(inflator);
2933
Assert.That(page.layout.Children.Count, Is.EqualTo(2));
3034
}
35+
3136
[Test]
37+
#if FIXME_BEFORE_PUBLIC_RELEASE
38+
public void OnPlatformAsCollectionElementAndroid([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
39+
#else
3240
public void OnPlatformAsCollectionElementAndroid([Values] XamlInflator inflator)
41+
#endif
3342
{
3443
DeviceInfo.SetCurrent(new MockDeviceInfo(platform: DevicePlatform.Android));
3544
var page = new Maui4509(inflator);

‎src/Controls/tests/Xaml.UnitTests/OnPlatform.xaml.cs‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ public void TearDown()
2626
DeviceInfo.SetCurrent(null);
2727
}
2828

29-
[Test] public void BoolToVisibility([Values] XamlInflator inflator)
29+
[Test]
30+
#if FIXME_BEFORE_PUBLIC_RELEASE
31+
public void BoolToVisibility([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
32+
#else
33+
public void BoolToVisibility([Values] XamlInflator inflator)
34+
#endif
3035
{
3136
mockDeviceInfo.Platform = DevicePlatform.iOS;
3237
var layout = new OnPlatform(inflator);
@@ -37,7 +42,12 @@ [Test] public void BoolToVisibility([Values] XamlInflator inflator)
3742
Assert.AreEqual(false, layout.label0.IsVisible);
3843
}
3944

40-
[Test] public void DoubleToWidth([Values] XamlInflator inflator)
45+
[Test]
46+
#if FIXME_BEFORE_PUBLIC_RELEASE
47+
public void DoubleToWidth([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
48+
#else
49+
public void DoubleToWidth([Values] XamlInflator inflator)
50+
#endif
4151
{
4252
mockDeviceInfo.Platform = DevicePlatform.iOS;
4353
var layout = new OnPlatform(inflator);
@@ -52,7 +62,12 @@ [Test] public void DoubleToWidth([Values] XamlInflator inflator)
5262
Assert.AreEqual(0.0, layout.label0.WidthRequest);
5363
}
5464

55-
[Test] public void StringToText([Values] XamlInflator inflator)
65+
[Test]
66+
#if FIXME_BEFORE_PUBLIC_RELEASE
67+
public void StringToText([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
68+
#else
69+
public void StringToText([Values] XamlInflator inflator)
70+
#endif
5671
{
5772
mockDeviceInfo.Platform = DevicePlatform.iOS;
5873
var layout = new OnPlatform(inflator);
@@ -67,7 +82,12 @@ [Test] public void StringToText([Values] XamlInflator inflator)
6782
Assert.AreEqual(null, layout.label0.Text);
6883
}
6984

70-
[Test] public void OnPlatformAsResource([Values] XamlInflator inflator)
85+
[Test]
86+
#if FIXME_BEFORE_PUBLIC_RELEASE
87+
public void OnPlatformAsResource([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
88+
#else
89+
public void OnPlatformAsResource([Values] XamlInflator inflator)
90+
#endif
7191
{
7292
var layout = new OnPlatform(inflator);
7393
var onplat = layout.Resources["fontAttributes"] as OnPlatform<FontAttributes>;
@@ -80,7 +100,12 @@ [Test] public void OnPlatformAsResource([Values] XamlInflator inflator)
80100
Assert.AreEqual(FontAttributes.None, (FontAttributes)onplat);
81101
}
82102

83-
[Test] public void OnPlatformAsResourceAreApplied([Values] XamlInflator inflator)
103+
[Test]
104+
#if FIXME_BEFORE_PUBLIC_RELEASE
105+
public void OnPlatformAsResourceAreApplied([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
106+
#else
107+
public void OnPlatformAsResourceAreApplied([Values] XamlInflator inflator)
108+
#endif
84109
{
85110
mockDeviceInfo.Platform = DevicePlatform.iOS;
86111
var layout = new OnPlatform(inflator);
@@ -95,7 +120,12 @@ [Test] public void OnPlatformAsResourceAreApplied([Values] XamlInflator inflator
95120
Assert.AreEqual(FontAttributes.Italic, layout.label0.FontAttributes);
96121
}
97122

98-
[Test] public void OnPlatform2Syntax([Values] XamlInflator inflator)
123+
[Test]
124+
#if FIXME_BEFORE_PUBLIC_RELEASE
125+
public void OnPlatform2Syntax([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
126+
#else
127+
public void OnPlatform2Syntax([Values] XamlInflator inflator)
128+
#endif
99129
{
100130
mockDeviceInfo.Platform = DevicePlatform.Android;
101131
var layout = new OnPlatform(inflator);
@@ -114,14 +144,24 @@ [Test] public void OnPlatform2Syntax([Values] XamlInflator inflator)
114144
Assert.AreEqual(42, layout.label0.HeightRequest);
115145
}
116146

117-
[Test] public void OnPlatformDefault([Values] XamlInflator inflator)
147+
[Test]
148+
#if FIXME_BEFORE_PUBLIC_RELEASE
149+
public void OnPlatformDefault([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
150+
#else
151+
public void OnPlatformDefault([Values] XamlInflator inflator)
152+
#endif
118153
{
119154
mockDeviceInfo.Platform = DevicePlatform.Create("\ud83d\ude80");
120155
var layout = new OnPlatform(inflator);
121156
Assert.AreEqual(63, layout.label0.HeightRequest);
122157
}
123158

124-
[Test] public void OnPlatformInStyle0([Values] XamlInflator inflator)
159+
[Test]
160+
#if FIXME_BEFORE_PUBLIC_RELEASE
161+
public void OnPlatformInStyle0([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
162+
#else
163+
public void OnPlatformInStyle0([Values] XamlInflator inflator)
164+
#endif
125165
{
126166
mockDeviceInfo.Platform = DevicePlatform.iOS;
127167
var layout = new OnPlatform(inflator);
@@ -132,7 +172,12 @@ [Test] public void OnPlatformInStyle0([Values] XamlInflator inflator)
132172
Assert.AreEqual(0.0, layout.button0.FontSize);
133173
}
134174

135-
[Test] public void OnPlatformInStyle1([Values] XamlInflator inflator)
175+
[Test]
176+
#if FIXME_BEFORE_PUBLIC_RELEASE
177+
public void OnPlatformInStyle1([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
178+
#else
179+
public void OnPlatformInStyle1([Values] XamlInflator inflator)
180+
#endif
136181
{
137182
mockDeviceInfo.Platform = DevicePlatform.iOS;
138183
var layout = new OnPlatform(inflator);
@@ -143,7 +188,12 @@ [Test] public void OnPlatformInStyle1([Values] XamlInflator inflator)
143188
Assert.AreEqual(0.0, layout.button1.FontSize);
144189
}
145190

146-
[Test] public void OnPlatformInline([Values] XamlInflator inflator)
191+
[Test]
192+
#if FIXME_BEFORE_PUBLIC_RELEASE
193+
public void OnPlatformInline([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
194+
#else
195+
public void OnPlatformInline([Values] XamlInflator inflator)
196+
#endif
147197
{
148198
mockDeviceInfo.Platform = DevicePlatform.iOS;
149199
var layout = new OnPlatform(inflator);

‎src/Controls/tests/Xaml.UnitTests/OnPlatformOptimization.xaml.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ public void OnPlatformExtensionsAreSimplified([Values("net7.0-ios", "net7.0-andr
2424
Assert.That(methodDef.Body.Instructions.Any(instr => instr.Operand as string == expected), $"Did not find instruction containing '{expected}'");
2525
}
2626

27-
[Test] public void ValuesAreSet([Values] XamlInflator inflator)
27+
[Test]
28+
#if FIXME_BEFORE_PUBLIC_RELEASE
29+
public void ValuesAreSet([Values(XamlInflator.XamlC, XamlInflator.Runtime)] XamlInflator inflator)
30+
#else
31+
public void ValuesAreSet([Values] XamlInflator inflator)
32+
#endif
2833
{
2934
var p = new OnPlatformOptimization(inflator);
3035
Assert.AreEqual("ringo", p.label0.Text);

0 commit comments

Comments
 (0)