Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[net8.0] Merge main again #15367

Merged
merged 94 commits into from
Jun 1, 2023
Merged

[net8.0] Merge main again #15367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
2041476
Investigations and fixes for the Foo (#14910)
mattleibow May 4, 2023
7eac778
Clarify ISafeAreaView docs (#14934)
hartez May 5, 2023
3188c91
[Windows] Fix CollectionView.RemainingItemsThresholdReached (#14391)
Foda May 5, 2023
a721d8b
Updated info around the Task return type (#14937)
pictos May 5, 2023
059b8c0
Update XamlParseExceptionConstraint.cs(removed unused method) (#14971)
Rustamxon May 8, 2023
6bbf93e
[iOS] Fix Label Truncation on iOS with HorizontalOptions (#14453)
tj-devel709 May 8, 2023
d8d7c7c
[android] reduce interop calls in MauiDrawable (#14933)
jonathanpeppers May 8, 2023
1d9c5cb
[Android] Fix CollectionView EmptyView (#11763)
jsuarezruiz May 8, 2023
bd1c013
[android] improve layout performance of Label (#14980)
jonathanpeppers May 8, 2023
565ea93
Fix Layout issues with the details page on Flyout (#12909)
PureWeen May 8, 2023
cad62a0
Remove view from previous containerview (#14867)
PureWeen May 8, 2023
6e8df7f
Add the Platform* APIs for Graphics (#14816)
mattleibow May 9, 2023
1ab0c63
Remove Controls Navigation Controller (#14976)
PureWeen May 9, 2023
1bbe79d
[Android] Changes updating ImageButton Padding to avoid size issues (…
jsuarezruiz May 9, 2023
f0dbcab
[CI] Do not rebuild the ms tasks on device tests. (#14476)
mandel-macaque May 10, 2023
5151c9b
Bump Microsoft.WindowsAppSDK from 1.3.230331000 to 1.3.230502000 (#15…
dependabot[bot] May 10, 2023
773f8c2
Make layout honor MaxWidth and MaxHeight requests (#15022)
jknaudt21 May 11, 2023
407ccd2
Correctly notify ImageButton border changes on Android (#14874)
jsuarezruiz May 11, 2023
45060ca
Set Icon to null and back again, working around Android issue (#13267)
BretJohnson May 14, 2023
8150d01
Adjust flex item position to account for reversal when laying out unc…
hartez May 15, 2023
c459b0d
CollectionView - Recycle DataTemplates when using template selector (…
Redth May 15, 2023
c3f269c
Bump Microsoft.Web.WebView2 from 1.0.1722.45 to 1.0.1774.30 (#14994)
dependabot[bot] May 16, 2023
c0c5234
Fix up Compatibility gallery (#15020)
PureWeen May 16, 2023
f54222a
Handle Grid * expansion when size is larger than minimum, but less th…
hartez May 16, 2023
dec8b24
[uitests] Work for get appium uitests with CI (#14488)
rmarinho May 16, 2023
833c18f
Add full list of MAUI versions to bug-report issue template (#15120)
japarson May 17, 2023
233fa2f
Normalize the orientation from MediaPicker photos in iOS (#14568)
jsuarezruiz May 18, 2023
edbc7c5
Adjust index path for cell reuseid in carouselview (#15140)
Redth May 18, 2023
210786b
Wait for root page to load before processing modal (#15037)
PureWeen May 18, 2023
dc33e9e
[Android] Don't dispose connectivity listeners (#15145)
jonpryor May 18, 2023
5293b88
Make CollectionView on iOS measure to content size (#14951)
hartez May 18, 2023
99a7b04
Remove incorrect call to `DisconnectHandler` (#15036)
PureWeen May 18, 2023
3454314
Account for padding when expanding * rows/columns to new sizes (#15143)
hartez May 19, 2023
46e02ac
[Android] Allow to use system fonts (#15010)
jsuarezruiz May 19, 2023
e85d0f0
Tests and fixes to verify that spanned views are including spacing in…
hartez May 19, 2023
eb5f1bd
Bump Microsoft.Net.Compilers.Toolset from 4.5.0 to 4.6.0 (#15135)
dependabot[bot] May 19, 2023
4c1a400
Android gallery fixes (#15118)
PureWeen May 19, 2023
6fddcbe
Bump Xamarin.Android.Glide from 4.14.2.1 to 4.15.1 (#15089)
dependabot[bot] May 19, 2023
1df8386
Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.0 (#15134)
dependabot[bot] May 19, 2023
7cce2f4
Fix ContentView RTL (#15114)
PureWeen May 19, 2023
0072052
Small fixes for uitest project location and install (#15172)
rmarinho May 19, 2023
3b62095
Enable MacCatalyst for the Apple Sign In Authenticator (#15188)
Redth May 19, 2023
1290d00
Fixed Android's StreamImageSourceService.LoadDrawableAsync()
jstedfast Mar 21, 2023
8574886
Try harder in the Android backend to load images in the main (UI) thread
jstedfast Mar 21, 2023
e1eb4f9
Reverted the onResourceCleared() use of post()
jstedfast Mar 27, 2023
83580c6
Added test case
jstedfast May 4, 2023
09aa288
Move the test to be Android-specific to avoid iOS failures.
jstedfast May 22, 2023
f6cf7c7
Bump coverlet.collector from 3.2.0 to 6.0.0 (#15207)
dependabot[bot] May 22, 2023
9bb8005
fixed the build
jstedfast May 22, 2023
845f276
Implements Color.Equal() correctly
jstedfast May 22, 2023
1ef9664
Fixed unit tests
jstedfast May 22, 2023
8565a3e
[shell] [windows] fix NRE when clearing shell items (#15220)
jonathanpeppers May 22, 2023
0e4af67
Bump Xamarin.Google.Crypto.Tink.Android from 1.8.0.1 to 1.9.0 (#15206)
dependabot[bot] May 23, 2023
ecd03a3
Fixed Android's StreamImageSourceService.LoadDrawableAsync() (#14109)
jstedfast May 23, 2023
c7cc10b
Use PrependToMapping method to replace Window MapTitle method (#15041)
mattleibow May 23, 2023
c88c07d
Implements Color.Equal() correctly (#15218)
jstedfast May 24, 2023
f477a94
Bump main stable versions (#15247)
rmarinho May 25, 2023
edeae34
Improved WebUtils.ParseQueryString()
jstedfast May 24, 2023
85a689b
Auto-format source code
May 25, 2023
68bf07f
Fix Android WebAuth callback for system browser flows (#15187)
Redth May 26, 2023
0fb4df5
Set DOTNET_gcServer (#15275)
rmarinho May 26, 2023
ad82628
Enable parallel builds back (#15298)
rmarinho May 26, 2023
2ce3b60
Bump Xamarin.AndroidX.Palette from 1.0.0.17 to 1.0.0.18 (#15268)
dependabot[bot] May 28, 2023
7d476cc
Bump Xamarin.AndroidX.RecyclerView from 1.3.0.1 to 1.3.0.2 (#15272)
dependabot[bot] May 28, 2023
18ff58d
Bump Xamarin.AndroidX.AppCompat.AppCompatResources (#15263)
dependabot[bot] May 28, 2023
720b970
[create-pull-request] automated change (#15235)
github-actions[bot] May 28, 2023
ece1eae
Bump Xamarin.Google.Crypto.Tink.Android from 1.9.0 to 1.9.0.1 (#15270)
dependabot[bot] May 28, 2023
1501e01
Bump Xamarin.AndroidX.Lifecycle.LiveData from 2.6.1.1 to 2.6.1.2 (#15…
dependabot[bot] May 28, 2023
ac059f1
Bump Xamarin.AndroidX.SwipeRefreshLayout from 1.1.0.12 to 1.1.0.13 (#…
dependabot[bot] May 28, 2023
2cdbbb0
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 28, 2023
9af4ef9
Improved WebUtils.ParseQueryString() (#15245)
jstedfast May 28, 2023
4e8a98a
Bump Xamarin.AndroidX.Browser from 1.5.0.1 to 1.5.0.2 (#15259)
dependabot[bot] May 28, 2023
e8592f7
Bump Xamarin.AndroidX.Window.WindowJava from 1.0.0.12 to 1.0.0.13 (#1…
dependabot[bot] May 28, 2023
97b7744
Bump Xamarin.AndroidX.MediaRouter from 1.3.1.3 to 1.4.0.1 (#15265)
dependabot[bot] May 28, 2023
001f7eb
Bump Xamarin.AndroidX.Navigation.Common from 2.5.3.2 to 2.5.3.3 (#15260)
dependabot[bot] May 29, 2023
573f7a5
Update cake scripts (#15277)
rmarinho May 29, 2023
7ffa0e7
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 30, 2023
8f86a57
Use [AppendTo|PrependTo|Replace]Mapping for Focus commands (#15040)
mattleibow May 30, 2023
130f788
Set Version for Windows (#15238)
mattleibow May 30, 2023
260fa08
[CI] Remove the template explosion in the CI via a matrix (#15334)
mandel-macaque May 30, 2023
a2c9711
Fix issue with CollectionView ignoring margins for content (#15246)
hartez May 30, 2023
75347d5
Add UITest Gallery and some simple tests (#15191)
sbanni May 30, 2023
c8a6093
[CI] Remove the template explosion in the CI via a matrix (#15340)
mandel-macaque May 31, 2023
6632c7a
Merge branch 'main' into merge-main-again
rmarinho May 31, 2023
f30997f
Fix UItests scripts (#15353)
rmarinho May 31, 2023
053197c
Compliance only on devdiv (#15356)
rmarinho Jun 1, 2023
b907e96
Legacy gallery filtered solutions (#15219)
PureWeen Jun 1, 2023
bd31a9a
Add some tests for changing the app version properties (#15338)
mattleibow Jun 1, 2023
1c1e221
Revert "Bump Xamarin.Android.Glide from 4.14.2.1 to 4.15.1 (#15089)"
rmarinho May 30, 2023
50a837f
Merge branch 'net8.0' into merge-main-again
mattleibow Jun 1, 2023
20f135d
Merge branch 'main' into merge-main-again
mattleibow Jun 1, 2023
b20a84e
Bump Xamarin.UITest from 4.1.3 to 4.1.4 (#15354)
dependabot[bot] Jun 1, 2023
e73f81e
Merge remote-tracking branch 'origin/main' into merge-main-again
mattleibow Jun 1, 2023
5fdb64a
fix diff
mattleibow Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions Microsoft.Maui-dev.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.UITests", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationTests", "src\TestUtils\src\Microsoft.Maui.IntegrationTests\Microsoft.Maui.IntegrationTests.csproj", "{A6976D43-B3A4-47AF-89D9-FA388B56B52B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{0AF0E771-4E09-4F05-B187-B43A2B9F62B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ControlGallery", "ControlGallery", "{DA908446-C6A1-473C-BF5C-83E600F5C69E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B37E707-EE0B-480E-AEB9-0176784879BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CBC63DBF-892C-4F03-890E-D48F25509CC6}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.ControlGallery.Issues.Shared", "src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.shproj", "{AE2513CB-4E5E-4E5C-8237-88954D4C9433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj", "{7A28BAB3-4396-415F-8473-2700027E57A7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Android", "src\Compatibility\ControlGallery\src\Android\Compatibility.ControlGallery.Android.csproj", "{36664529-91C2-49A5-BFDA-7D663FB19BC5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.iOS", "src\Compatibility\ControlGallery\src\iOS\Compatibility.ControlGallery.iOS.csproj", "{137B044D-31C4-4CF2-AB66-97C516AB8393}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.WinUI", "src\Compatibility\ControlGallery\src\WinUI\Compatibility.ControlGallery.WinUI.csproj", "{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.UITests.Shared", "src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Android.UITests", "src\Compatibility\ControlGallery\test\Android.UITests\Compatibility.ControlGallery.Android.UITests.csproj", "{2E41CBBF-999A-40F1-BF65-EA68585CA070}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.iOS.UITests", "src\Compatibility\ControlGallery\test\iOS.UITests\Compatibility.ControlGallery.iOS.UITests.csproj", "{306C0B6E-B797-40A0-994C-4F923E91F31B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI.UITests", "src\Compatibility\ControlGallery\test\WinUI.UITests\WinUI.UITests.csproj", "{B111C308-8B8B-4679-A229-39F80013D51E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -550,6 +576,40 @@ Global
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.Build.0 = Release|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.Build.0 = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Build.0 = Release|Any CPU
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Deploy.0 = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Build.0 = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.ActiveCfg = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Build.0 = Release|Any CPU
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Build.0 = Release|Any CPU
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Deploy.0 = Release|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.Build.0 = Release|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.Build.0 = Release|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -649,8 +709,31 @@ Global
{E06CEFD4-237C-49F0-BE0F-C5F80AD8F64C} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{07C26A25-08C2-4C52-9574-1C33EC8E7919} = {E1082E26-D700-4127-9329-66D673FD2D55}
{A6976D43-B3A4-47AF-89D9-FA388B56B52B} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{DA908446-C6A1-473C-BF5C-83E600F5C69E} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0}
{9B37E707-EE0B-480E-AEB9-0176784879BE} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
{CBC63DBF-892C-4F03-890E-D48F25509CC6} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
{AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{7A28BAB3-4396-415F-8473-2700027E57A7} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{36664529-91C2-49A5-BFDA-7D663FB19BC5} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{137B044D-31C4-4CF2-AB66-97C516AB8393} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
{E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{2E41CBBF-999A-40F1-BF65-EA68585CA070} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{306C0B6E-B797-40A0-994C-4F923E91F31B} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
{B111C308-8B8B-4679-A229-39F80013D51E} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{7a28bab3-4396-415f-8473-2700027e57a7}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions Microsoft.Maui-mac.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
"src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
"src\\TestUtils\\src\\TestUtils\\TestUtils.csproj",
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium.UITests\\TestUtils.Appium.UITests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium\\TestUtils.Appium.csproj",
"src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",
Expand Down
69 changes: 69 additions & 0 deletions Microsoft.Maui.LegacyControlGallery.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"solution": {
"path": "Microsoft.Maui-dev.sln",
"projects": [
"src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj",
"src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj",
"src\\Compatibility\\ControlGallery\\src\\Android\\Compatibility.ControlGallery.Android.csproj",
"src\\Compatibility\\ControlGallery\\src\\Core\\Compatibility.ControlGallery.Core.csproj",
"src\\Compatibility\\ControlGallery\\src\\Issues.Shared\\Compatibility.ControlGallery.Issues.Shared.shproj",
"src\\Compatibility\\ControlGallery\\src\\UITests.Shared\\Compatibility.UITests.Shared.shproj",
"src\\Compatibility\\ControlGallery\\src\\WinUI\\Compatibility.ControlGallery.WinUI.csproj",
"src\\Compatibility\\ControlGallery\\src\\iOS\\Compatibility.ControlGallery.iOS.csproj",
"src\\Compatibility\\ControlGallery\\test\\Android.UITests\\Compatibility.ControlGallery.Android.UITests.csproj",
"src\\Compatibility\\ControlGallery\\test\\WinUI.UITests\\WinUI.UITests.csproj",
"src\\Compatibility\\ControlGallery\\test\\iOS.UITests\\Compatibility.ControlGallery.iOS.UITests.csproj",
"src\\Controls\\Foldable\\src\\Controls.Foldable.csproj",
"src\\Controls\\Maps\\src\\Controls.Maps.csproj",
"src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj",
"src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj",
"src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj",
"src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj",
"src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj",
"src\\Controls\\src\\Core.Design\\Controls.Core.Design.csproj",
"src\\Controls\\src\\Core\\Controls.Core.csproj",
"src\\Controls\\src\\NuGet\\Controls.NuGet.csproj",
"src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
"src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Controls\\tests\\Core.Design.UnitTests\\Controls.Core.Design.UnitTests.csproj",
"src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj",
"src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
"src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
"src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests.InternalsVisibleAssembly\\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj",
"src\\Controls\\tests\\Xaml.UnitTests\\Controls.Xaml.UnitTests.csproj",
"src\\Core\\maps\\src\\Maps.csproj",
"src\\Core\\src\\Core.csproj",
"src\\Core\\tests\\Benchmarks.Droid\\Benchmarks.Droid.csproj",
"src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
"src\\Core\\tests\\DeviceTests.Shared\\Core.DeviceTests.Shared.csproj",
"src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
"src\\Core\\tests\\UnitTests\\Core.UnitTests.csproj",
"src\\Essentials\\samples\\Sample.Server.WebAuthenticator\\Essentials.Sample.Server.WebAuthenticator.csproj",
"src\\Essentials\\samples\\Samples\\Essentials.Sample.csproj",
"src\\Essentials\\src\\Essentials.csproj",
"src\\Essentials\\test\\DeviceTests\\Essentials.DeviceTests.csproj",
"src\\Essentials\\test\\UnitTests\\Essentials.UnitTests.csproj",
"src\\Graphics\\src\\Graphics.Skia.GtkSharp\\Graphics.Skia.GtkSharp.csproj",
"src\\Graphics\\src\\Graphics.Skia.WPF\\Graphics.Skia.WPF.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Graphics.Win2D\\Graphics.Win2D.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\Graphics\\tests\\DeviceTests\\Graphics.DeviceTests.csproj",
"src\\Graphics\\tests\\Graphics.Benchmarks\\Graphics.Benchmarks.csproj",
"src\\Graphics\\tests\\Graphics.Tests\\Graphics.Tests.csproj",
"src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
"src\\TestUtils\\src\\DeviceTests.Runners.SourceGen\\TestUtils.DeviceTests.Runners.SourceGen.csproj",
"src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
"src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium.UITests\\TestUtils.Appium.UITests.csproj",
"src\\TestUtils\\src\\TestUtils.Appium\\TestUtils.Appium.csproj",
"src\\TestUtils\\src\\TestUtils\\TestUtils.csproj"
]
}
}
2 changes: 1 addition & 1 deletion eng/devices/android.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ string DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ?
// optional
var USE_DOTNET = Argument("dotnet", true);
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-android" : ""));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? $"{dotnetVersion}-android" : ""));
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? "");
DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? "");
Expand Down
6 changes: 3 additions & 3 deletions eng/devices/catalyst.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#load "../cake/helpers.cake"
#load "../cake/dotnet.cake"

string TARGET = Argument("target", "Test");
Expand All @@ -10,7 +11,6 @@ FilePath PROJECT = Argument("project", EnvironmentVariable("MAC_TEST_PROJECT") ?
string TEST_DEVICE = Argument("device", EnvironmentVariable("MAC_TEST_DEVICE") ?? $"ios-simulator-64_{defaultVersion}"); // comma separated in the form <platform>-<device|simulator>[-<32|64>][_<version>] (eg: ios-simulator-64_13.4,[...])

// optional
var localDotnet = GetBuildVariable("workloads", "local") == "local";
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{dotnetVersion}-maccatalyst");
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("IOS_TEST_BINLOG") ?? "");
Expand Down Expand Up @@ -76,7 +76,7 @@ Task("uitest")
ArgumentCustomization = args => args
.Append($"-f {TARGET_FRAMEWORK}")
.Append("-t:Run")
.Append("/tl")
//.Append("/tl")
});

Information("Build UITests project {0}",PROJECT.FullPath);
Expand All @@ -87,7 +87,7 @@ Task("uitest")
ArgumentCustomization = args => args
.Append("/p:ExtraDefineConstants=MACUITEST")
.Append("/bl:" + binlog)
.Append("/tl")
//.Append("/tl")
});

SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_mac.log");
Expand Down
2 changes: 1 addition & 1 deletion eng/devices/windows.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#load "../cake/helpers.cake"
#load "../cake/dotnet.cake"

string TARGET = Argument("target", "Test");
Expand All @@ -10,7 +11,6 @@ FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT
string TEST_DEVICE = Argument("device", EnvironmentVariable("WINDOWS_TEST_DEVICE") ?? $"");

// optional
var localDotnet = GetBuildVariable("workloads", "local") == "local";
var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{dotnetVersion}-windows{defaultVersion}");
var BINLOG_ARG = Argument("binlog", EnvironmentVariable("WINDOWS_TEST_BINLOG") ?? "");
Expand Down
Loading