Skip to content

Commit d8b8a7d

Browse files
dansiegeldansiegel
authored
Merge pull request #2393 from jeromelaban/dev/jela/winui
Add support for WinUI 3
2 parents a2a50f0 + b0a07ab commit d8b8a7d

File tree

202 files changed

+4233
-200
lines changed

Some content is hidden

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

202 files changed

+4233
-200
lines changed

‎Packages.props‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,34 @@
1111

1212
<!-- Uno -->
1313
<ItemGroup>
14-
<PackageReference Update="Uno.UI" Version="3.4.0" />
15-
<PackageReference Update="Uno.Core" Version="2.1.0" />
16-
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.76" />
14+
<PackageReference Update="Uno.UI" Version="3.6.6" />
15+
<PackageReference Update="Uno.WinUI" Version="3.6.6" />
16+
<PackageReference Update="Uno.Core" Version="2.3.0" />
17+
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.3-uno.92" />
18+
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.3-uno.92" />
1719
<PackageReference Update="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
18-
<PackageReference Update="Uno.UI.RemoteControl" Version="3.4.0" />
20+
<PackageReference Update="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.3-rc7" />
21+
<PackageReference Update="Uno.UI.RemoteControl" Version="3.6.6" />
22+
<PackageReference Update="Uno.WinUI.RemoteControl" Version="3.6.6" />
1923
<PackageReference Update="Uno.UniversalImageLoader" Version="1.9.33" />
20-
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
21-
<PackageReference Update="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
22-
<PackageReference Update="Uno.UI.WebAssembly" Version="3.4.0" />
23-
<PackageReference Update="Uno.Wasm.Bootstrap" Version="1.3.6" />
24-
<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="1.3.6" />
24+
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
25+
<PackageReference Update="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
26+
<PackageReference Update="Uno.Extensions.Logging.OSLog " Version="1.0.1" />
27+
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
28+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
29+
<PackageReference Update="Uno.UI.WebAssembly" Version="3.6.6" />
30+
<PackageReference Update="Uno.WinUI.Skia.Gtk" Version="3.6.6" />
31+
<PackageReference Update="Uno.WinUI.Skia.Wpf" Version="3.6.6" />
32+
<PackageReference Update="Uno.WinUI.WebAssembly" Version="3.6.6" />
33+
<PackageReference Update="Uno.Wasm.Bootstrap" Version="2.1.0-dev.59" />
34+
<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0-dev.59" />
35+
<PackageReference Update="Microsoft.Windows.Compatibility" Version="5.0.1" />
36+
<PackageReference Update="Microsoft.ProjectReunion" Version="0.5.0" />
37+
<PackageReference Update="Microsoft.ProjectReunion.Foundation" Version="0.5.0" />
38+
<PackageReference Update="Microsoft.ProjectReunion.WinUI" Version="0.5.0" />
2539

2640
<PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
41+
<PackageReference Update="Microsoft.Windows.Compatibility" Version="5.0.1" />
2742
</ItemGroup>
2843

2944
<!-- Tests -->

‎PrismLibrary_Uno.sln‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DryIoc.Shared", "src\
2121
EndProject
2222
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Unity.Shared", "src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.shproj", "{D66336A6-07E5-401A-A710-DAEDD6975D59}"
2323
EndProject
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno.WinUI", "Uno.WinUI", "{41C6017D-FDF6-4EE0-92F2-126370858919}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI", "src\Uno\Prism.Uno\Prism.Uno.WinUI.csproj", "{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Uno.WinUI", "src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.WinUI.csproj", "{8602A977-D992-4AB9-92ED-5A5FED95A4B5}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Unity.Uno.WinUI", "src\Uno\Prism.Unity.Uno\Prism.Unity.Uno.WinUI.csproj", "{1E245214-C5AF-4918-817B-0E68472B9F99}"
31+
EndProject
2432
Global
2533
GlobalSection(SharedMSBuildProjectFiles) = preSolution
34+
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{1e245214-c5af-4918-817b-0e68472b9f99}*SharedItemsImports = 5
2635
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{4338e214-2ba3-4043-90b6-6c1269c58865}*SharedItemsImports = 5
2736
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{6e7ec81d-da39-4c4f-a898-0148558c34f4}*SharedItemsImports = 13
37+
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{8602a977-d992-4ab9-92ed-5a5fed95a4b5}*SharedItemsImports = 5
2838
src\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems*{b09fc94c-8100-4eb2-846c-99acb056a993}*SharedItemsImports = 5
2939
src\Containers\Prism.Unity.Shared\Prism.Unity.Shared.projitems*{d66336a6-07e5-401a-a710-daedd6975d59}*SharedItemsImports = 13
3040
EndGlobalSection
@@ -247,6 +257,150 @@ Global
247257
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Release|x64.Build.0 = Release|Any CPU
248258
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Release|x86.ActiveCfg = Release|Any CPU
249259
{CF74BE80-F9A0-4C02-A59C-30F43EDAB866}.Release|x86.Build.0 = Release|Any CPU
260+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
261+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
262+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
263+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
264+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
265+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
266+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
267+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
268+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
269+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
270+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
271+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
272+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
273+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
274+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|ARM.ActiveCfg = Debug|Any CPU
275+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|ARM.Build.0 = Debug|Any CPU
276+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
277+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|iPhone.Build.0 = Debug|Any CPU
278+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
279+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
280+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|x64.ActiveCfg = Debug|Any CPU
281+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|x64.Build.0 = Debug|Any CPU
282+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|x86.ActiveCfg = Debug|Any CPU
283+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.AppStore|x86.Build.0 = Debug|Any CPU
284+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
285+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
286+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
287+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|ARM.Build.0 = Debug|Any CPU
288+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
289+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|iPhone.Build.0 = Debug|Any CPU
290+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
291+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
292+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|x64.ActiveCfg = Debug|Any CPU
293+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|x64.Build.0 = Debug|Any CPU
294+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|x86.ActiveCfg = Debug|Any CPU
295+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Debug|x86.Build.0 = Debug|Any CPU
296+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
297+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|Any CPU.Build.0 = Release|Any CPU
298+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|ARM.ActiveCfg = Release|Any CPU
299+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|ARM.Build.0 = Release|Any CPU
300+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|iPhone.ActiveCfg = Release|Any CPU
301+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|iPhone.Build.0 = Release|Any CPU
302+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
303+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
304+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|x64.ActiveCfg = Release|Any CPU
305+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|x64.Build.0 = Release|Any CPU
306+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|x86.ActiveCfg = Release|Any CPU
307+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A}.Release|x86.Build.0 = Release|Any CPU
308+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
309+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
310+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
311+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
312+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
313+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
314+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
315+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
316+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
317+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
318+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
319+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
320+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
321+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
322+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|ARM.ActiveCfg = Debug|Any CPU
323+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|ARM.Build.0 = Debug|Any CPU
324+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
325+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|iPhone.Build.0 = Debug|Any CPU
326+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
327+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
328+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|x64.ActiveCfg = Debug|Any CPU
329+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|x64.Build.0 = Debug|Any CPU
330+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|x86.ActiveCfg = Debug|Any CPU
331+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.AppStore|x86.Build.0 = Debug|Any CPU
332+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
333+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
334+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
335+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|ARM.Build.0 = Debug|Any CPU
336+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
337+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|iPhone.Build.0 = Debug|Any CPU
338+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
339+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
340+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|x64.ActiveCfg = Debug|Any CPU
341+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|x64.Build.0 = Debug|Any CPU
342+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|x86.ActiveCfg = Debug|Any CPU
343+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Debug|x86.Build.0 = Debug|Any CPU
344+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
345+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|Any CPU.Build.0 = Release|Any CPU
346+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|ARM.ActiveCfg = Release|Any CPU
347+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|ARM.Build.0 = Release|Any CPU
348+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|iPhone.ActiveCfg = Release|Any CPU
349+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|iPhone.Build.0 = Release|Any CPU
350+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
351+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
352+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x64.ActiveCfg = Release|Any CPU
353+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x64.Build.0 = Release|Any CPU
354+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x86.ActiveCfg = Release|Any CPU
355+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5}.Release|x86.Build.0 = Release|Any CPU
356+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
357+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
358+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
359+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
360+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
361+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
362+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
363+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
364+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
365+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
366+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
367+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
368+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
369+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|Any CPU.Build.0 = Debug|Any CPU
370+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|ARM.ActiveCfg = Debug|Any CPU
371+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|ARM.Build.0 = Debug|Any CPU
372+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
373+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhone.Build.0 = Debug|Any CPU
374+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
375+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
376+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x64.ActiveCfg = Debug|Any CPU
377+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x64.Build.0 = Debug|Any CPU
378+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x86.ActiveCfg = Debug|Any CPU
379+
{1E245214-C5AF-4918-817B-0E68472B9F99}.AppStore|x86.Build.0 = Debug|Any CPU
380+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
381+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
382+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|ARM.ActiveCfg = Debug|Any CPU
383+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|ARM.Build.0 = Debug|Any CPU
384+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhone.ActiveCfg = Debug|Any CPU
385+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhone.Build.0 = Debug|Any CPU
386+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
387+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
388+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x64.ActiveCfg = Debug|Any CPU
389+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x64.Build.0 = Debug|Any CPU
390+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x86.ActiveCfg = Debug|Any CPU
391+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Debug|x86.Build.0 = Debug|Any CPU
392+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
393+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|Any CPU.Build.0 = Release|Any CPU
394+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|ARM.ActiveCfg = Release|Any CPU
395+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|ARM.Build.0 = Release|Any CPU
396+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhone.ActiveCfg = Release|Any CPU
397+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhone.Build.0 = Release|Any CPU
398+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
399+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
400+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x64.ActiveCfg = Release|Any CPU
401+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x64.Build.0 = Release|Any CPU
402+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x86.ActiveCfg = Release|Any CPU
403+
{1E245214-C5AF-4918-817B-0E68472B9F99}.Release|x86.Build.0 = Release|Any CPU
250404
EndGlobalSection
251405
GlobalSection(SolutionProperties) = preSolution
252406
HideSolutionNode = FALSE
@@ -260,6 +414,10 @@ Global
260414
{CBE0B15D-B960-4D91-9F74-2F7BA30BED4D} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
261415
{6E7EC81D-DA39-4C4F-A898-0148558C34F4} = {B08E87A0-7697-43DA-AFB6-090E955057B4}
262416
{D66336A6-07E5-401A-A710-DAEDD6975D59} = {B08E87A0-7697-43DA-AFB6-090E955057B4}
417+
{41C6017D-FDF6-4EE0-92F2-126370858919} = {57CC0FDC-A8BD-4A51-A965-C25F1A7DDF89}
418+
{D08AC337-20D8-4BB3-9150-AF8C0E31AA1A} = {41C6017D-FDF6-4EE0-92F2-126370858919}
419+
{8602A977-D992-4AB9-92ED-5A5FED95A4B5} = {41C6017D-FDF6-4EE0-92F2-126370858919}
420+
{1E245214-C5AF-4918-817B-0E68472B9F99} = {41C6017D-FDF6-4EE0-92F2-126370858919}
263421
EndGlobalSection
264422
GlobalSection(ExtensibilityGlobals) = postSolution
265423
SolutionGuid = {9A6B5A49-790C-425F-BBF5-99D104959C33}

‎build/jobs/e2e-uno.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ jobs:
66
vmImage: $(VMImage)
77
demands:
88
- MSBuild
9+
10+
variables:
11+
disable_package_restore_step: true
12+
913
workspace:
1014
clean: all
1115
steps:
@@ -15,4 +19,5 @@ jobs:
1519
- template: ../steps/build.yml
1620
parameters:
1721
solution: e2e/Uno/HelloWorld.sln
18-
solutionName: Uno E2E
22+
solutionName: Uno E2E
23+
msbuildArguments: /r

‎build/jobs/uno-uitest.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ jobs:
88
vmImage: $(LinuxImage)
99
workspace:
1010
clean: all
11+
12+
variables:
13+
disable_package_restore_step: true
14+
15+
strategy:
16+
matrix:
17+
UWP:
18+
TARGET_XAML_FLAVOR: UWP
19+
20+
WinUI:
21+
TARGET_XAML_FLAVOR: WinUI
22+
1123
steps:
1224
- template: ../steps/prepare-build.yml
1325

@@ -16,6 +28,7 @@ jobs:
1628
env:
1729
BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
1830
BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)"
31+
TARGET_XAML_FLAVOR: "$(TARGET_XAML_FLAVOR)"
1932
displayName: 'Run UI Tests'
2033
2134
- task: PublishTestResults@2
@@ -42,6 +55,17 @@ jobs:
4255
workspace:
4356
clean: all
4457

58+
variables:
59+
disable_package_restore_step: true
60+
61+
strategy:
62+
matrix:
63+
UWP:
64+
TARGET_XAML_FLAVOR: UWP
65+
66+
WinUI:
67+
TARGET_XAML_FLAVOR: WinUI
68+
4569
steps:
4670
- template: ../steps/prepare-build.yml
4771

@@ -53,6 +77,7 @@ jobs:
5377
env:
5478
BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
5579
BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)"
80+
TARGET_XAML_FLAVOR: "$(TARGET_XAML_FLAVOR)"
5681
5782
displayName: 'Run UI Tests'
5883
@@ -79,6 +104,18 @@ jobs:
79104
vmImage: $(MacImage)
80105
workspace:
81106
clean: all
107+
108+
variables:
109+
disable_package_restore_step: true
110+
111+
strategy:
112+
matrix:
113+
UWP:
114+
TARGET_XAML_FLAVOR: UWP
115+
116+
WinUI:
117+
TARGET_XAML_FLAVOR: WinUI
118+
82119
steps:
83120
- template: ../steps/prepare-build.yml
84121

@@ -90,6 +127,7 @@ jobs:
90127
env:
91128
BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
92129
BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)"
130+
TARGET_XAML_FLAVOR: "$(TARGET_XAML_FLAVOR)"
93131
94132
displayName: 'Run UI Tests'
95133

0 commit comments

Comments
 (0)