forked from dotnet/maui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into fix-387
* upstream/main: (270 commits) Automated dotnet-format update (dotnet#1533) Add tests for default colors (dotnet#1532) Don't extract native defaults, meaning users can no longer reset a color back to a platform theme (dotnet#1485) Avoid show the virtual keyboard in the Android TimePicker (dotnet#1428) Implement VerticalTextAlignment in WinUI Label (dotnet#1479) Changes in the Gallery: include custom fonts, reorganize some pages, etc. (dotnet#1526) Don't pack and force a signing failure (dotnet#1527) [main] Update dependencies from xamarin/xamarin-android (dotnet#1443) Implements EntryHandler IsPassword in WinUI (dotnet#802) Automated dotnet-format update (dotnet#1523) [Build] Fix net6 Microsoft.Maui.Handlers.Benchmarks assembly (dotnet#1525) Update WinUI to 0.8 stable (dotnet#1522) Implement the basic WindowHandler (dotnet#1468) Automated dotnet-format update (dotnet#1510) Implement Alerts (Alert, Prompt and ActionSheet) (dotnet#1328) Avoid create a drawable to set the Background if is not necessary (dotnet#1504) Android Gestures (dotnet#1489) Revert to using Navigation Page Shims (dotnet#1495) Allow to navigate to the same item after navigate back (dotnet#1503) Automated dotnet-format update (dotnet#1499) ...
- Loading branch information
Showing
1,516 changed files
with
38,292 additions
and
10,685 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,83 @@ | ||
<!-- "Single Project" support --> | ||
<Project> | ||
|
||
<PropertyGroup Condition=" '$(SingleProject)' == 'true' "> | ||
<PlatformsProjectFolder Condition=" '$(PlatformsProjectFolder)' == '' ">Platforms\</PlatformsProjectFolder> | ||
<!-- Android --> | ||
<EnableDefaultAndroidItems>false</EnableDefaultAndroidItems> | ||
<AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">Android\</AndroidProjectFolder> | ||
<AndroidManifest>$(AndroidProjectFolder)AndroidManifest.xml</AndroidManifest> | ||
<MonoAndroidResourcePrefix>$(AndroidProjectFolder)Resources</MonoAndroidResourcePrefix> | ||
<MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets</MonoAndroidAssetsPrefix> | ||
<AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">$(PlatformsProjectFolder)Android\</AndroidProjectFolder> | ||
<!-- iOS --> | ||
<EnableDefaultiOSItems>false</EnableDefaultiOSItems> | ||
<iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">iOS\</iOSProjectFolder> | ||
<IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios' ">$(iOSProjectFolder)Resources</IPhoneResourcePrefix> | ||
<_SingleProjectiOSExcludes>$(iOSProjectFolder)/**/.*/**</_SingleProjectiOSExcludes> | ||
|
||
<iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">$(PlatformsProjectFolder)\iOS\</iOSProjectFolder> | ||
<!-- MacCatalyst --> | ||
<EnableDefaultMacCatalystItems>false</EnableDefaultMacCatalystItems> | ||
<MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">MacCatalyst\</MacCatalystProjectFolder> | ||
<IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' ">$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix> | ||
<MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">$(PlatformsProjectFolder)\MacCatalyst\</MacCatalystProjectFolder> | ||
<!-- Windows --> | ||
<EnableDefaultWindowsItems>false</EnableDefaultWindowsItems> | ||
<WindowsProjectFolder Condition=" '$(WindowsProjectFolder)' == '' ">$(PlatformsProjectFolder)\Windows\</WindowsProjectFolder> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'android' "> | ||
<AndroidManifest Condition=" Exists('$(AndroidProjectFolder)AndroidManifest.xml') ">$(AndroidProjectFolder)AndroidManifest.xml</AndroidManifest> | ||
<MonoAndroidResourcePrefix>$(AndroidProjectFolder)Resources</MonoAndroidResourcePrefix> | ||
<MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets</MonoAndroidAssetsPrefix> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios' "> | ||
<IPhoneResourcePrefix>$(iOSProjectFolder)Resources</IPhoneResourcePrefix> | ||
<CodesignEntitlements Condition=" Exists('$(iOSProjectFolder)Entitlements.plist') ">$(iOSProjectFolder)Entitlements.plist</CodesignEntitlements> | ||
<_SingleProjectiOSExcludes>$(iOSProjectFolder)/**/.*/**</_SingleProjectiOSExcludes> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' "> | ||
<IPhoneResourcePrefix>$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix> | ||
<CodesignEntitlements Condition=" Exists('$(MacCatalystProjectFolder)Entitlements.plist') ">$(MacCatalystProjectFolder)Entitlements.plist</CodesignEntitlements> | ||
<_SingleProjectMacCatalystExcludes>$(MacCatalystProjectFolder)/**/.*/**</_SingleProjectMacCatalystExcludes> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows' "> | ||
<ApplicationManifest Condition=" Exists('$(WindowsProjectFolder)app.manifest') ">$(WindowsProjectFolder)app.manifest</ApplicationManifest> | ||
<PackageManifest Condition=" Exists('$(WindowsProjectFolder)Package.appxmanifest') ">$(WindowsProjectFolder)Package.appxmanifest</PackageManifest> | ||
<RuntimeIdentifiers Condition=" '$(RuntimeIdentifiers)' == '' ">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers> | ||
<EnableDefaultPageItems>False</EnableDefaultPageItems> | ||
<EnableDefaultApplicationDefinition>False</EnableDefaultApplicationDefinition> | ||
<_SingleProjectWindowsExcludes>$(WindowsProjectFolder)/**/.*/**</_SingleProjectWindowsExcludes> | ||
</PropertyGroup> | ||
|
||
<!-- Removals --> | ||
<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' and '$(SingleProject)' == 'true' "> | ||
<Compile | ||
Condition=" '$(TargetPlatformIdentifier)' != 'android' and '$(AndroidProjectFolder)' != '' " | ||
Remove="$(AndroidProjectFolder)**/*$(DefaultLanguageSourceExtension)" | ||
/> | ||
<Compile | ||
Condition=" '$(TargetPlatformIdentifier)' != 'ios' and '$(iOSProjectFolder)' != '' " | ||
Remove="$(iOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" | ||
/> | ||
<Compile | ||
Condition=" '$(TargetPlatformIdentifier)' != 'maccatalyst' and '$(MacCatalystProjectFolder)' != '' " | ||
Remove="$(MacCatalystProjectFolder)**/*$(DefaultLanguageSourceExtension)" | ||
/> | ||
<!-- Explicitly include the platform code --> | ||
<_MauiCompileToAdd | ||
Condition=" '$(TargetPlatformIdentifier)' == 'android' and '$(AndroidProjectFolder)' != '' " | ||
Include="$(AndroidProjectFolder)**/*$(DefaultLanguageSourceExtension)" /> | ||
<_MauiCompileToAdd | ||
Condition=" '$(TargetPlatformIdentifier)' == 'ios' and '$(iOSProjectFolder)' != '' " | ||
Include="$(iOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" /> | ||
<_MauiCompileToAdd | ||
Condition=" '$(TargetPlatformIdentifier)' == 'maccatalyst' and '$(MacCatalystProjectFolder)' != '' " | ||
Include="$(MacCatalystProjectFolder)**/*$(DefaultLanguageSourceExtension)" /> | ||
<_MauiCompileToAdd | ||
Condition=" '$(TargetPlatformIdentifier)' == 'windows' and '$(WindowsProjectFolder)' != '' " | ||
Include="$(WindowsProjectFolder)**/*$(DefaultLanguageSourceExtension)" /> | ||
<None Include="$(PlatformsProjectFolder)**/*$(DefaultLanguageSourceExtension)" Exclude="@(_MauiCompileToAdd)" /> | ||
<Compile Remove="$(PlatformsProjectFolder)**/*$(DefaultLanguageSourceExtension)" /> | ||
<Compile Include="@(_MauiCompileToAdd)" /> | ||
<_MauiCompileToAdd Remove="@(_MauiCompileToAdd)" /> | ||
|
||
<!-- Remove all Windows (WinUI) XAML Files from the Windows folder --> | ||
<_MauiXamlToRemove | ||
Condition="'$(WindowsProjectFolder)' != ''" | ||
Include="$(WindowsProjectFolder)**/*.xaml" /> | ||
<EmbeddedResource Remove="@(_MauiXamlToRemove)" /> | ||
<MauiXaml Remove="@(_MauiXamlToRemove)" /> | ||
<None Include="@(_MauiXamlToRemove)" /> | ||
<_MauiXamlToRemove Remove="@(_MauiXamlToRemove)" /> | ||
</ItemGroup> | ||
|
||
<!-- IDE capabilities --> | ||
<ItemGroup Condition=" '$(SingleProject)' == 'true' "> | ||
<ProjectCapability Include="MauiSingleProject" /> | ||
<ProjectCapability Include="LaunchProfiles" /> | ||
</ItemGroup> | ||
</Project> | ||
|
||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.