Skip to content

Commit d98c564

Browse files
rmarinhormarinho
authored
Merge branch 'main' into feature/2024-08-03-maccatyst-window-dimensions
2 parents dab9393 + d999d56 commit d98c564

File tree

828 files changed

+21126
-10158
lines changed

Some content is hidden

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

828 files changed

+21126
-10158
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.dotnet.xharness.cli": {
24-
"version": "9.0.0-prerelease.24556.2",
24+
"version": "9.0.0-prerelease.24575.3",
2525
"commands": [
2626
"xharness"
2727
]

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
* @dotnet/dotnet-maui-reviewers
22

3-
# Tizen (this probably doesn't work since these do not have write access
4-
**/Tizen @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
5-
*.tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
6-
*.Tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
7-
83
# Blazor Desktop
94
/src/BlazorWebView/ @dotnet/dotnet-maui-blazor-eng
105
/src/Templates/src/templates/maui-blazor/ @dotnet/dotnet-maui-blazor-eng
116
/src/Templates/src/templates/maui-blazor-solution/ @dotnet/dotnet-maui-blazor-eng
7+
8+
# Localization
9+
/eng/automation/LocProject.json @tj-devel709
10+
**/localize/*.json @tj-devel709
11+
**/*.resx @tj-devel709
12+
**.*.resx.lcl @tj-devel709
13+
14+
# UI Testing
15+
/src/Controls/tests/TestCases.*.Tests @jfversluis @jsuarezruiz

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ body:
4242
label: Version with bug
4343
description: In what version do you see this issue? Run `dotnet workload list` to find your version.
4444
options:
45+
- 9.0.21 SR2.1
46+
- 9.0.14 SR1.4
47+
- 9.0.12 SR1.2
4548
- 9.0.10 SR1
4649
- 9.0.0 GA
4750
- 9.0.0-rc.2.24503.2
@@ -150,6 +153,9 @@ body:
150153
- 9.0.0-rc.2.24503.2
151154
- 9.0.0 GA
152155
- 9.0.10 SR1
156+
- 9.0.12 SR1.2
157+
- 9.0.14 SR1.4
158+
- 9.0.21 SR2.1
153159
validations:
154160
required: true
155161
- type: dropdown

‎.github/workflows/inclusive-heat-sensor.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ permissions:
1414

1515
jobs:
1616
detect-heat:
17-
uses: jonathanpeppers/inclusive-heat-sensor/.github/workflows/[email protected].1
17+
uses: jonathanpeppers/inclusive-heat-sensor/.github/workflows/[email protected].2
1818
secrets: inherit
19+
with:
20+
minimizeComment: true
21+
offensiveThreshold: 9
22+
angerThreshold: 9

‎Directory.Build.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@
5656
<_MauiPreviousDotNetVersionNoDot Condition="'$(_MauiPreviousDotNetVersionNoDot)' == ''">$(_MauiPreviousDotNetVersionMajor)$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersionNoDot>
5757
<_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm>
5858

59+
<!-- The minimum TFM that the packaged will install into -->
60+
<_MauiMinimumSupportedDotNetTfm>$(_MauiDotNetVersion)</_MauiMinimumSupportedDotNetTfm>
61+
<_MauiMinimumSupportedDotNetTfm Condition="'$(IncludePreviousTfms)' == 'true'">$(_MauiPreviousDotNetVersion)</_MauiMinimumSupportedDotNetTfm>
62+
63+
<!-- The minimum supported version of the workload that the packages will install into -->
64+
<MicrosoftMauiMinimumSupportedWorkloadVersion>$(_MauiDotNetVersion).0</MicrosoftMauiMinimumSupportedWorkloadVersion>
65+
<!-- If the previous TFMs are included, then we want to use the latest previous workload for safety -->
66+
<MicrosoftMauiMinimumSupportedWorkloadVersion Condition="'$(IncludePreviousTfms)' == 'true'">$(_MauiPreviousDotNetVersion).0</MicrosoftMauiMinimumSupportedWorkloadVersion>
67+
5968
<_MauiTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MauiTargetPlatformIdentifier>
6069
<_MauiNoTargetPlatform>false</_MauiNoTargetPlatform>
6170
<_MauiNoTargetPlatform Condition="'$(_MauiTargetPlatformIdentifier)' == ''">True</_MauiNoTargetPlatform>
@@ -158,6 +167,8 @@
158167
<WindowsPreviousTargetFrameworkVersion>10.0.19041.0</WindowsPreviousTargetFrameworkVersion>
159168
<Windows2PreviousTargetFrameworkVersion>10.0.20348.0</Windows2PreviousTargetFrameworkVersion>
160169
<TizenPreviousTargetFrameworkVersion>7.0</TizenPreviousTargetFrameworkVersion>
170+
<!-- Minimums -->
171+
<MinimumWindowsTargetFrameworkVersion>10.0.17763.0</MinimumWindowsTargetFrameworkVersion>
161172
</PropertyGroup>
162173

163174
<Import Condition="Exists('Directory.Build.Override.props')" Project="Directory.Build.Override.props" />

‎Microsoft.Maui-dev.sln‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -210,30 +210,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationT
210210
EndProject
211211
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{0AF0E771-4E09-4F05-B187-B43A2B9F62B0}"
212212
EndProject
213-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ControlGallery", "ControlGallery", "{DA908446-C6A1-473C-BF5C-83E600F5C69E}"
214-
EndProject
215-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B37E707-EE0B-480E-AEB9-0176784879BE}"
216-
EndProject
217-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CBC63DBF-892C-4F03-890E-D48F25509CC6}"
218-
EndProject
219-
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}"
220-
EndProject
221-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj", "{7A28BAB3-4396-415F-8473-2700027E57A7}"
222-
EndProject
223-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Android", "src\Compatibility\ControlGallery\src\Android\Compatibility.ControlGallery.Android.csproj", "{36664529-91C2-49A5-BFDA-7D663FB19BC5}"
224-
EndProject
225-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.iOS", "src\Compatibility\ControlGallery\src\iOS\Compatibility.ControlGallery.iOS.csproj", "{137B044D-31C4-4CF2-AB66-97C516AB8393}"
226-
EndProject
227-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.WinUI", "src\Compatibility\ControlGallery\src\WinUI\Compatibility.ControlGallery.WinUI.csproj", "{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}"
228-
EndProject
229-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.UITests.Shared", "src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}"
230-
EndProject
231-
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}"
232-
EndProject
233-
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}"
234-
EndProject
235-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI.UITests", "src\Compatibility\ControlGallery\test\WinUI.UITests\WinUI.UITests.csproj", "{B111C308-8B8B-4679-A229-39F80013D51E}"
236-
EndProject
237213
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Core", "src\TestUtils\src\UITest.Core\UITest.Core.csproj", "{8F7B825D-24A8-4E09-AC5B-9117926B7BF3}"
238214
EndProject
239215
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Appium", "src\TestUtils\src\UITest.Appium\UITest.Appium.csproj", "{26379D0E-4D4D-48CA-94B1-A2C1972AB335}"
@@ -583,40 +559,6 @@ Global
583559
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
584560
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
585561
{A6976D43-B3A4-47AF-89D9-FA388B56B52B}.Release|Any CPU.Build.0 = Release|Any CPU
586-
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
587-
{7A28BAB3-4396-415F-8473-2700027E57A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
588-
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
589-
{7A28BAB3-4396-415F-8473-2700027E57A7}.Release|Any CPU.Build.0 = Release|Any CPU
590-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
591-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
592-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
593-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
594-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Build.0 = Release|Any CPU
595-
{36664529-91C2-49A5-BFDA-7D663FB19BC5}.Release|Any CPU.Deploy.0 = Release|Any CPU
596-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
597-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Build.0 = Debug|Any CPU
598-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
599-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.ActiveCfg = Release|Any CPU
600-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Build.0 = Release|Any CPU
601-
{137B044D-31C4-4CF2-AB66-97C516AB8393}.Release|Any CPU.Deploy.0 = Release|Any CPU
602-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
603-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
604-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
605-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
606-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Build.0 = Release|Any CPU
607-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8}.Release|Any CPU.Deploy.0 = Release|Any CPU
608-
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
609-
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Debug|Any CPU.Build.0 = Debug|Any CPU
610-
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.ActiveCfg = Release|Any CPU
611-
{2E41CBBF-999A-40F1-BF65-EA68585CA070}.Release|Any CPU.Build.0 = Release|Any CPU
612-
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
613-
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
614-
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
615-
{306C0B6E-B797-40A0-994C-4F923E91F31B}.Release|Any CPU.Build.0 = Release|Any CPU
616-
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
617-
{B111C308-8B8B-4679-A229-39F80013D51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
618-
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.ActiveCfg = Release|Any CPU
619-
{B111C308-8B8B-4679-A229-39F80013D51E}.Release|Any CPU.Build.0 = Release|Any CPU
620562
{8F7B825D-24A8-4E09-AC5B-9117926B7BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
621563
{8F7B825D-24A8-4E09-AC5B-9117926B7BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
622564
{8F7B825D-24A8-4E09-AC5B-9117926B7BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -770,18 +712,6 @@ Global
770712
{FB39FACE-BAF2-4F97-A249-E45BA63D77FE} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
771713
{07C26A25-08C2-4C52-9574-1C33EC8E7919} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
772714
{A6976D43-B3A4-47AF-89D9-FA388B56B52B} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
773-
{DA908446-C6A1-473C-BF5C-83E600F5C69E} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0}
774-
{9B37E707-EE0B-480E-AEB9-0176784879BE} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
775-
{CBC63DBF-892C-4F03-890E-D48F25509CC6} = {DA908446-C6A1-473C-BF5C-83E600F5C69E}
776-
{AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
777-
{7A28BAB3-4396-415F-8473-2700027E57A7} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
778-
{36664529-91C2-49A5-BFDA-7D663FB19BC5} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
779-
{137B044D-31C4-4CF2-AB66-97C516AB8393} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
780-
{0BECADBB-8EE4-4C73-8341-30B041CFD4B8} = {9B37E707-EE0B-480E-AEB9-0176784879BE}
781-
{E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
782-
{2E41CBBF-999A-40F1-BF65-EA68585CA070} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
783-
{306C0B6E-B797-40A0-994C-4F923E91F31B} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
784-
{B111C308-8B8B-4679-A229-39F80013D51E} = {CBC63DBF-892C-4F03-890E-D48F25509CC6}
785715
{8F7B825D-24A8-4E09-AC5B-9117926B7BF3} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
786716
{26379D0E-4D4D-48CA-94B1-A2C1972AB335} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
787717
{A307B624-48D4-494E-A70D-5B3CDF6620CF} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
@@ -801,15 +731,4 @@ Global
801731
GlobalSection(ExtensibilityGlobals) = postSolution
802732
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
803733
EndGlobalSection
804-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
805-
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
806-
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{2e41cbbf-999a-40f1-bf65-ea68585ca070}*SharedItemsImports = 5
807-
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
808-
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{306c0b6e-b797-40a0-994c-4f923e91f31b}*SharedItemsImports = 5
809-
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{7a28bab3-4396-415f-8473-2700027e57a7}*SharedItemsImports = 5
810-
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
811-
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
812-
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{b111c308-8b8b-4679-a229-39f80013d51e}*SharedItemsImports = 5
813-
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
814-
EndGlobalSection
815734
EndGlobal

0 commit comments

Comments
 (0)