maui/Directory.Build.targets

82 строки
4.1 KiB
Plaintext
Исходник Обычный вид История

<Project>
Update WinUI and merge projects (#1117) * Update WinUI * it builds but does not run * stuff * make it work * this * Revert "this" This reverts commit e3f25c92ef9008596d8215a246b3a9c7ecd8efe8. * Revert "Revert "this"" This reverts commit 2670ad37b4ca762b4f57fcb723834d8bc361df37. * Revert "Revert "Revert "this""" This reverts commit ba4c0e99ff9a195b46aff5c73be7c70b2d5af6a1. * Revert "Revert "Revert "Revert "this"""" This reverts commit 82e6acf65d3ce8b5aeb970c315828ef823950c9d. * more * also breaks with 5.7 * repro * Updat WinUI and add multitargeting hacks * Fix a crash as a result of a new thing * :) * dsfad * adf * single project template * MAUI_VERSION * Remove xaml from embeddedresource in windows\ * Switch output type to winexe for windows * Add more windows xaml conventions - Page should exclude all windows excludes - Page should be all subfolders in windows dir, and then link them appropriately - Make applicationdefinition link to root where the build expects it - add additional filename for application.xaml which is a windows convention too * Also exclude Windows\ xaml files from MauiXaml * this * that * make it work * that * zip * whoopsies * maybe this? * Generate the Windows app icons * that * that * Undo things * this * that * , * Roll back for now * More code changes * gen that too * that * use resizetized images * Non-square app icon files - windows' wide tile * wide tiles! * don't pack this * decimals! * no need for platforms * Windows splash screens * Create the directory * The correct paths * Build with WinUI 0.8.0-preivew * Remove these * Exclude None with Pack=true from Content * Project reference * File linking * Use a full path https://github.com/dotnet/roslyn/issues/52034 * not needed anymore * AssignTargetPath before CreateManifestResourceName * guids * not here * GUIDs * No need for linux arm right now * New blazor templates * Bump the templates versions * invariant culture * Do it earlier and see * that Co-authored-by: Jonathan Dick <jondick@gmail.com>
2021-06-09 20:20:27 +03:00
<Import Condition="'$(SampleProject)' == 'true' or '$(CI)' != 'true' " Project="eng\Versions.dev.targets" />
<Import Condition="'$(SampleProject)' != 'true' and '$(CI)' == 'true'" Project="eng\Git.Build.targets" />
<Import Condition="'$(SampleProject)' != 'true' and '$(CI)' == 'true' " Project="eng\Versions.targets" />
<Import Condition="'$(SampleProject)' != 'true' and '$(IsTestProject)' != 'true'" Project="eng\BannedApis.targets" />
Use .NET 6 AndroidX packages & consolidate versions (#13879) Bump to Microsoft.Android.Sdk 11.0.200.118. This is needed for a fix to support net6.0-android NuGet packages. We have new AndroidX packages: <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.7-net6preview01" /> <PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1-net6preview01" /> These are available on the same feed we have the iOS/Android runtime packs for .NET 6: <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" /> These packs support both Xamarin.Android & .NET 6 because they contain both sets of assemblies, such as: * `lib/monoandroid90/Xamarin.AndroidX.*.dll` * `lib/net6.0-android/Xamarin.AndroidX.*.dll` To consolidate our AndroidX package versions, we can a new MSBuild pattern for declaring NuGet package versions that dotnet/project-system uses: https://github.com/dotnet/project-system/blob/accdee5926eb32f51ee503cba355cb1f4f991459/Directory.Build.targets#L3 https://github.com/dotnet/project-system/blob/accdee5926eb32f51ee503cba355cb1f4f991459/build/import/Packages.targets 1. List packages in `.csproj` files as they are needed. But leave off `%(Version)` completely. 2. A `Directory.Build.targets` somewhere does: `<PackageReference Update="YourPackage" Version="1.0.0" />` This allows you to put the version in one place, and you don't need to check platforms or anything, because the `Update` doesn't do anything if the `.csproj` file isn't using that package. We could do this pattern across the whole Maui repo, but I just set this up for the `AndroidX` and `Microsoft.Extensions` packages for now. ~~ .NET 6 Linker ~~ Since we are using .NET 6 AndroidX packages, the following workaround is no longer needed, so I removed them: <PropertyGroup> <_DotNetPackageVersion>6.0.0-preview.2.21110.7</_DotNetPackageVersion> </PropertyGroup> <ItemGroup> <PackageReference Include="System.CodeDom" Version="$(_DotNetPackageVersion)" /> <PackageReference Include="System.Diagnostics.EventLog" Version="$(_DotNetPackageVersion)" /> <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="$(_DotNetPackageVersion)" /> <PackageReference Include="System.IO.Ports" Version="$(_DotNetPackageVersion)" /> <PackageReference Include="System.Security.Permissions" Version="$(_DotNetPackageVersion)" /> <PackageReference Include="System.Threading.AccessControl" Version="$(_DotNetPackageVersion)" /> </ItemGroup> Previously, the AndroidX packages were Xamarin.Android libraries, and they would cause the linker to crash in `Release` builds: ILLink : error IL1012: IL Linker has encountered an unexpected error. Please report the issue at https://github.com/mono/linker/issues Fatal error in IL Linker Unhandled exception. Mono.Linker.InternalErrorException: Step 'LoadReferencesStep' failed when processing assembly 'Maui.Controls.Sample.SingleProject, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'. ---> Mono.Linker.LinkerFatalErrorException: ILLink: error IL1010: Assembly 'Maui.Controls.Sample.SingleProject, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' cannot be loaded due to failure in processing 'Microsoft.Maui, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' reference ---> Mono.Linker.LinkerFatalErrorException: ILLink: error IL1010: Assembly 'Microsoft.Maui, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' cannot be loaded due to failure in processing 'Xamarin.AndroidX.AppCompat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' reference ---> Mono.Linker.LinkerFatalErrorException: ILLink: error IL1010: Assembly 'Xamarin.AndroidX.AppCompat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' cannot be loaded due to failure in processing 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' reference ---> Mono.Linker.LinkerFatalErrorException: ILLink: error IL1009: Assembly 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' reference 'System.Security.Permissions, Version=0.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' could not be resolved ---> Mono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'System.Security.Permissions, Version=0.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' ---> System.IO.FileNotFoundException: Unable to find 'System.Security.Permissions.dll' or 'System.Security.Permissions.exe' file ~~ AndroidX obsoleted FragmentStatePagerAdapter ~~ Initially I got several warnings (that became errors), such as: error CS0618: 'FragmentStatePagerAdapter' is obsolete... I don't know what should be done here, so I ignored the warning in the two files that have a problem for now: #pragma warning disable 618
2021-03-02 02:25:45 +03:00
<Import Project="eng\AndroidX.targets" />
<Import Project="eng\Microsoft.Extensions.targets" />
[build] Update to .NET 6 Preview 4 (#796) * [build] Update to .NET 6 Preview 4 Brings in Preview 4 updates for the Android, MaciOS, and .NET SDks. Initial build attempts were failing with hundreds of errors: D:\a\1\s\src\Essentials\src\Connectivity\Connectivity.ios.tvos.macos.cs(12,70): error BI1234: 'CTCellularData' is obsolete: 'Starting with ios14.0 Use the 'CallKit' API instead.' [D:\a\1\s\src\Essentials\src\Essentials-net6.csproj] D:\a\1\s\src\Essentials\src\Compass\Compass.ios.cs(31,6): error CA1416: This call site is reachable on: 'iOS' 13.6 and later. 'CLLocationManager.HeadingFilter' is only supported on: 'macos' 11.0 and later. [D:\a\1\s\src\Essentials\src\Essentials-net6.csproj] D:\a\1\s\src\Core\src\Platform\MaciOS\ColorExtensions.cs(64,13): error CA1416: This call site is reachable on: 'MacCatalyst' 13.5 and later. 'UIColor.SystemBackgroundColor.get' is supported on: 'ios' 13.0 and later. [D:\a\1\s\src\Core\src\Core-net6.csproj] CSC : error AD0001: Analyzer 'Microsoft.NetCore.Analyzers.InteropServices.PlatformCompatibilityAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. [D:\a\1\s\src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj] The [platform compatibility analyzer][0] has been disabled for now, and it can be enabled locally to work through the few hundred errors in future PRs. Once these issues were sorted, there were a handful of other breaks that I've attempted to fix: D:\a\1\s\src\Essentials\src\AssemblyInfo\AssemblyInfo.ios.tvos.watchos.macos.cs(3,12): error CS0618: 'LinkerSafeAttribute' is obsolete: 'Replace with '[assembly: System.Reflection.AssemblyMetadata ("IsTrimmable", "True")]'.' [D:\a\1\s\src\Essentials\src\Essentials-net6.csproj] D:\a\1\s\src\Compatibility\Core\src\iOS\Renderers\TabbedRenderer.cs(422,33): error CS1503: Argument 1: cannot convert from 'UIKit.UIStringAttributes' to 'UIKit.UITextAttributes' [D:\a\1\s\src\Compatibility\Core\src\Compatibility-net6.csproj] D:\a\1\s\src\Compatibility\Core\src\iOS\CollectionView\CarouselViewController.cs(106,23): error CS0114: 'CarouselViewController.DraggingStarted(UIScrollView)' hides inherited member 'UICollectionViewController.DraggingStarted(UIScrollView)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword. [ D:\a\1\s\src\Compatibility\Core\src\Compatibility-net6.csproj] D:\a\1\s\src\Compatibility\Core\src\iOS\CollectionView\CarouselViewController.cs(117,23): error CS0114: 'CarouselViewController.DraggingEnded(UIScrollView, bool)' hides inherited member 'UICollectionViewController.DraggingEnded(UIScrollView, bool)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword. [ D:\a\1\s\src\Compatibility\Core\src\Compatibility-net6.csproj] Finally it seems JDK 14 was being preferred on macOS machines in CI, so I've set `$(JI_JAVA_HOME)` to the [pre-installed JDK 11][1]. [0]: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1416 [1]: https://github.com/actions/virtual-environments/blob/macOS-10.15/20210419.2/images/macos/macos-10.15-Readme.md#java * Apply feedback, bump p4 bits, provision xcode 12.5 rc * Use Big Sur pool, clean up duplicate variable declaration * Revert "Use Big Sur pool, clean up duplicate variable declaration" This reverts commit b91482e10cdef99158e9060c9bf51298a74d89a8. * Disable linker for ios and catalyst Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-04-24 13:32:18 +03:00
<PropertyGroup>
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
<IgnoreMauiXamlHotReloadCompatibilityCheck>True</IgnoreMauiXamlHotReloadCompatibilityCheck>
</PropertyGroup>
<!-- platform version number information -->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIstvOS)' == 'True'">
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIsMacCatalyst)' == 'True'">
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>13.1</TargetPlatformMinVersion>
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
<NoWarn>$(NoWarn);CA1416</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIsmacOS)' == 'True'">
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.14</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True'">
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>21.0</TargetPlatformMinVersion>
</PropertyGroup>
Adds Tizen backend (#2360) * [Tizen] Add Resizetizer Tizen Implementation * Treat nullablity for buidling net6 project * Bump to latest and fix build error * Fix Tizen Handlers * Fix font and SingleProject to locate manifest * Update tizen manifest path * Bump to latest - Adds the GraphicsViewHandler and ShapeViewHandler - Apply one stop shop UseMauiControls (#1157) - Implements new APIs for each IView - and so on * Bump to latest - Including register images and set Compat Service Provider (#1306), and so on * [SingleProject] Update intermediate asset path * Bump to latest - Apply to start adding in APIs for adding legacy renderers via assembly scanning (#1333) - Update to IMauiContext (#1357) - and so on * Remove duplicate type for legacy compat renderers * Fix Color Extension * Adds Microsoft.Maui.Tizen.sln * Rebase to upstream latest main * InitialzationOption for MauiApp * Bump to latest - Apply to patch related to Animation (#1436) - Apply to register Microsoft.Maui.Graphics Platforms (#1441) - and so on. * Enable to DisplayResolutionUnit * Implement Clip * Implement ModalNavigationService * Update build targets for single project * Remove comment * Remove image resource on Tizen project * Remove space * Bump to latest - Added GestureManager.Tizen.cs (#1489) - Set handler to shimmed handler so it doesn't get reshimmed (#1483) - Turn XamlC on by default (#1422) - and so on * Fix SwitchHandler * Fix compatibility issue (#41) * Fix compatibility issue * Fix Compatibility Resource path * Fix Transformations (#42) * Fix the compat LayoutRenderer (#43) * Bump to latest - Modal Navigation Manager (#1563) - Implement the basic WindowHandler (#1468) - Don't extract native defaults, meaning users can no longer reset a color back to a platform theme (#1485) - Implement Alerts (Alert, Prompt and ActionSheet) (#1328) - And so on. * Fix Layout margin issue (#44) * [SingleProject] Fix Issues (#50) * Fix RefreshView related issue (#51) * Fix RefreshView related issue * Fix StreamImageSourceService.Tizen * Bumt to latest - Effects (#1574) - Improve Window and AnimationManager (#1653) - and so on * Add Microsoft.Maui.Graphics.Skia as PackageReference * Update Compatibility projects (*.csproj) for Tizen * Add AlertManager on Tizen (#57) * Add AlertManager on Tizen * Add null check and remove whitespace * Remove watch profile code * Change subscriber object * Add Essentials.Samples.Tizen (#24) * Add Essentials.Samples.Tizen * Add guard for null exception * Fix Essentials.Samples for Tizen * Fix csproj for net6 * Remove Forms.Init * Fix build error (#60) * Update referenced Tizen.UIExtensions version (#61) * Add BlazorWebView skeleton code (#62) * Bump to latest (#71) - Window lifecycle (#1754) - Move New Navigation Handler to Core and make it internal (#1800) - Scrollview handler (#1669) - ScrollView Resize + Window Handler Resize (#1676) - Font AutoScalingEnabled (#1774) - Rename Font Properties (#1755) - Update layout system to ensure native measure/arrange are called for all controls, even from Page subclasses (#1819) - IContainer as IList<IView> (#1724) - Implement Layout padding for new StackLayouts and GridLayout (#1749) - Delete all the TabIndex, TabStop, Focusable things! (#1777) - Introduce SetSemanticFocus API via SemanticExtensions (#1829) - Improve Window and AnimationManager (#1653) - And so on * Remove IPage on Tizen (#72) - Merge IFrameworkElement and IView and Remove IPage (#1875) * Remove obsolete methods from Controls (#73) - [Controls] Remove obsolete methods from Controls (#1644) * Fix issue related rebase (#74) * Add Blazor webview (#67) * Add Blazor webview * Replace space to tab * remove space * Fix AlertManager prompt layout issue (#76) * Fix entry cursor error (#68) * Fix entry cursor error * Update code referring to android extension * Remove duplicate code & Add exception cases * Code fixes for consistency * Fix nullable issue (#77) * Fix Image loading (#78) * Fix nested layout issue (#79) Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> * Fix issues caused by bump up (#75) * Fix issues caused by bump up * Update Tizen file provider * Update file provider with proper path * Replace StackLayout from Compatibility.StackLayout (#82) * Fix unmatched partial method (#84) * Bump to latest * Fix GetDesiredSize (#87) * Fix GetDesiredSize * update for readability * Fix ScrollView content absolute position (#89) * Fixes incorrect parameter type for ILayoutManager.ArrangeChildren (Rectangle -> Size). (#91) * Make the HandlerToRendererShim simple * Revert "Fixes incorrect parameter type for ILayoutManager.ArrangeChildren (Rectangle -> Size). (#91)" (#97) This reverts commit c54ac836ef961d647989a34fa83208b9883142ef. * Add GestureManager (#96) * Add GestureManager * Fix DragGestureHandler * Fix GestureManager * Check nullable enable * Fix Label LineBreakMode using workaround (#98) * Refactor the LayoutHandler (#99) * Fix layout measure issue (#100) * Bump to latest * Fix LayoutHandler Update issue (#103) * Fix LayoutHandler Update issue * Implement InvalidateMeasure propagation * Update MapBackground * Fix default font size issue (#113) * Add InitializationOptions (#107) * Add InitializationOptions * Set UseSkiaSharp true as default * Apply DP as default * Fix SKClipperView to have proper size (#115) * Fix Essentials sample (#108) * Fix Essentials sample for Tizen * Remove UseSkiaSharp flag * Remove MaterialComponents * Fix Tizen flag * Remove CustomRenderer * Add ShellHandler (#64) * Add ShellHandler * Move ShellView into Platform/Tizen * Update ShellView * Move the code for embedded tizen resources to csproj * Add UIExtenstions for shell * fix ViewHandlerOfT dispose (#120) * MAUI workload for Tizen (#66) * Fix build and runtime error after bumping to latest code * Fix HandlerToRendererShim dispose (#127) * Add ShellSearchView (#121) * Add ShellSearchView * Fix the layout issue in ShellSearchResultList * Enable nullable * Fix maximum height of ShellSearchResultList * Fix scaling issue on Clip (#130) * Fix Shell build error on net6 project (#133) * Fix DisplayResolutionUnit sync issue (#134) * Fix build error (#137) * Replace SkiaGraphicsView with local patch (#135) This commit will be revert when upstream code is updated * Fix GraphicsView scaling issue (#136) * Support Min/Max Height/Width on IView and applying MauiApp/MauiAppBuilder pattern - Support Min/Max Height/Width on IView (#2265) - Updating .NET MAUI to use MauiApp/MauiAppBuilder pattern and use MS.Extensions.DependencyInjection (#2137) * Fix Tizen Templates (#144) * Fix webview break caused by updated dependency (#143) * Update the Tizen.UIExtension.ElmSharp version (#145) * Fix Essentials (#146) * Fix Essentials sample for tizen * Add SemanticScreenReader for Tizen * Fix Startup * Reomve internal UIExtensions compoments for Shell (#147) * Implement PlaceholderColor property in SearchBarHandlers - Implement PlaceholderColor property in SearchBarHandlers (#1512) * Adds missing implementation after bumping to latest main * Fix Control.Samples.Singleproject Main correctly (#150) * [Tizen] Add support for JS root components in BlazorWebView (#151) * [Tizen] Adds BoxView Handler * [Tizen] Update project templates to work with safe characters - Update project templates to work with safe characters (#2368) * [Tizen] Implement ProgressColor property in ProgressBarHandlers - Implement ProgressColor property in ProgressBarHandlers (#600) * [Tizen] Fix project template's tizne-manifest.xml correctly * [Tizen] Handle ContentViews and templated content in new layout system * [Tizen] WebView Handlers * [Tizen] Use Color.IsDefault in Compat renderers * Fix Essentials DeviceDisplay (#156) * Fix Essentials.DeviceDisplay * Fix DeviceDisplay * [Tizen] Fix build error on net6 * Fix Layout remove issue (#164) * Fix Layout remove issue * Fix layout remove on Dispose * Bump to latest (rc1) - ImageButtonHandler and Handler Re-usability (#2352) - Remove IBoxView (#2619) - Add SupportedOSPlatformVersion (#2565) - Merge all the .NET 6 projects/solutions (#2505) - Shadow Support (#570) - Add IndicatorView handler(#2038) * [Tizen] Initial Border control * [Tizen] Apply graphics related code review feedback * [Tizen] Remove Device.OpenUri impl and Device.Flags/SetFlags * [Tizen] Fix Display Prompt Alerts * [Tizen] Fix WebView Handler * [Tizen] Fix ShapeViewHandler * [Tizen] Port H/V TextAlignment to Editor/Picker Handler * [Tizen] Add TVShellView (#183) * [Tizen] Add TVShellView * [Tizen] Update TVShellView * [Tizen] Update NativeView for Shell * [Tizen] Update ShellView * [Tizen] Change default FlyoutBackgroundColor for TV * [Tizen] Enable nullable * Refactor WrapperView to draw drawable features (#186) * Refactor WrapperView to draw drawable features * Update class names and devide files * Override NeesContainer to remove duplicated code * Update class names * [Tizen] Adds ApplicationHandler * Remove dispose action on ImageSourceServiceResult (#192) * Fix Background issue of Frame (#193) * Fix UpdateBackground (#194) * Fix UpdateBackground * Add ContentView Background mapper * Fix Editor/Entry/Label/Layout Background * Add IWrapperViewCanvas.Content * Add PageHandler Background mapper * Restore WrapperView * Remove unnecessary namespace * [Tizen] Fix build error on PageHandler * [Tizen] Fix ButtonHandler events * [Tizen] Use new dispatcher instance in Tizen's BlazorWebView * [Tizen] Fix DpiPath correctly * [Tizen] Fix Compatibility and Controls.Sample build error * [Tizen] Initial CollectionViewHandler * [Tizen] Apply ITextButton related changes * [Tizen] Add Shadows (#233) * [Tizen] Add Shadows * [Tizen] Apply review comments * [Tizen] Move updating shape in proper position * [Tizen] Update BackgroundDrawable * [Tizen] Apply review comments * [Tizen] Add BorderDrawable (#224) * Move to platform specific * Fix border handler for Tizen * Rename ToDrawable method * Fix border content layout * Fix BorderView * Apply rebase * [Tizen] Fix entry cursor issue (#222) * Fix entry cursor issue * Fix UpdateSelectionLength method * [Tizen] Remove TVNavigationDrawer TVNavigationView (#223) * [Tizen] Remove TVNavigationDrawer TVNavigationView * [Elmsharp] Update Tizen.UIExtensions version * [Tizen] Remove Forms DeviceInfo and use Essentials * [Tizen] Initial Multi Window support * [Tizen] Fix MauiContext * [Tizen] Refactor Border by defining MauiDrawable (#248) * [Tizen] Refactor Border by defining MauiDrawable * [Tizen] Apply review comments * [Tizen] Remove unnecessary type casting * [Tizen] Move getting path logic to drawable * [Tizen] Obsolete AndExpand & Remove IsolatedStorage * Fix layout measure issue (#254) * Fix layout measure issue * Update src/Compatibility/Core/src/Tizen/Platform.cs Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> * Fix tizen solution (.sln) correctly * [Tizen] Add VerticalTextAlignment * [Tizen] Move IDispatcher logic out of IPlatformServices * [Tizen] Fix Scoping of MauiContext * Fix NavigationPage navigating issue (#263) * [Tizen] Add ImageButton handler (#261) * [Tizen] Add ImageButton handler * Add comment * Fix Compatibility build error (#265) * Fix catch exception for sample (#262) * Fix catch exception for control sample * Fix exception type for Tizen * Add bracket * [Tizen] Use CoreApplication as native app type * Fix ScrollView (#269) * [Tizen] Add Collectionview adaptor (#271) * [Tizen] Add CollectionView Adaptors * Remove unnecessary override * Fix ConvertToScaledDP * Fix flag * Fix item selected event * Apply review comments * Move to extension for CollectionView * [Tizen] Remove legacy Log and use ILogger * [Tizen] Applying upstream changes * [Tizen] Add ContainerView to Layout if it's present * [Tizen] Initial Reloadyfy support * [Tizen] Initial IVisualDiagnosticOveraly support * [Tizen] Setup first set of Automation Properties * [Tizen] Move types in the Platform folder into the Platform namespaces * Fix CollectionView layout issue (#288) * Fix CollectionView layout issue * Remove unnecessary code * [Tizen] ZIndex proof-of-concept * Fix ScrollView ContentSize and Padding margin (#291) * Fix ScrollView ContentSize and Padding margin * Fix MapRequestScrollTo * Update src/Core/src/Handlers/ScrollView/ScrollViewHandler.Tizen.cs Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> * Update src/Core/src/Handlers/ScrollView/ScrollViewHandler.Tizen.cs Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> * Remove MapContentSize Co-authored-by: 허강호/Common Platform Lab(SR)/Principal Engineer/삼성전자 <kangho.hur@samsung.com> * Implements WindowOverlay and VisualDiagnosticsOverlay (#294) * Implements WindowOverlay and VisualDiagnosticsOverlay * Apply code review * [Tizen] Fix Image Handler * Remove GetDesiredSize (#295) * [Tizen] Fix ButtonHandler * Fix UpdateSemantics (#299) * Fix UpdateSemantics * Fix Semantics mapping * Apply comment * [Tizen] Organize and centralize HandlerExtensions * Refactor WrapperView and Fix Issue (#302) * Refactor WrapperView * Use Thickness type for Shadow margin * Update variable name * Update class name to GraphicsExtensions * Fix essentials sample for Tizen (#305) * [Tizen] Fix NativeView casting issue * [Tizen] Update the UIExtensions package version * [Templates] Update Tizen Template (#311) * [Tizen] Initial Flyout handler * Fix BlazorWebview binary resource issue (#317) * [Tizen] Handle query strings in Blazor static assets by trimming them out * Refactor MauiContext (#330) * [Tizen] Adds PaintExtensions * [Tizen] Update compat's Platform * [Tizen] Fix controls build error * [Tizen] Adds RadioButton Handler * [Tizen] Implement CursorPosition in IEditor/ITextInput Handlers * [Tizen] Initial SwipeView Handler * [Tizen] Remove GetNative * [Tizen] Update Microsoft.NET.Sdk.Maui/WorkloadManifest * [Tizen] Add FormattedText property support to Label in Controls * [Tizen] Bump to latest * [Tizen] Use legacy compat renderers temporarily * [Tizen] Use BorderView * [SingleProject] Update splash updator (#353) * [singleproject] update splash updator * [singleproject] update icon updator * [singleproject] Fix default icon path * [Tizen] Fix BlazorWebView build error (#355) * [Tizen] Fix BlazorWebView build error * [Tizen] Update tizen handler * [Tizen] Implement IPlatformApplication.Current * [Tizen] Implements missing WebViewHandler APIs * [Tizen] Refactor AppInfo/PhoneDialer into interface * [Tizen] Fix INativeViewHandler to return more expected NativeView * [Tizen] Remove legacy TFMs * [Tizen] Refactor DeviceInfo and Flashlight to use an interface * [Tizen] Remove `IPlatformInvalidate` and `Device.Invalidate() * [Tizen] Refactored Geocoding to an interface * [Tizen] Adds Microsoft.Maui.Graphics.Skia as package reference * [Tizen] Refactored Map, SMS, Contacts to an interface * [Tizen] Bump to latest * [Tizen] Fix Essential sample build error * [Tizen] Fix Workload build error * Add Platform code on Controls.Sample.Sandbox for tizen (#382) * Fix processing MauiAssets (#383) Co-authored-by: Jay Cho <chojoong@gmail.com> * [Tizen] Refactor Essential's implementations * [Tizen] Renaming public APIs Native -> Platform * [Tizen] Update template & sample's tizen-manifest.xml * Fix DotNet.csproj to build tizen (#372) * [Tizen] Update ImageHandler and ImageButtonHandler * [Tizen] Add handling for TextTransform for SearchBar/Editor/Entry * [Tizen] Interfaced Handler for Label, Page, NavigationView, Picker, ProgressBar, SwipeView * [Tizen] Initial MenuBar * [Tizen] Moved GetPlatformSize logic into a new service * [Tizen] Interfaced handler for Switch, TimePicker, WebView, Slider, SearchBar, RefreshView, RadioButton * [Tizen] Fix build error after rebasing * [Tizen] Use StringComparison.Ordinal everywhere * [Tizen] Move TabbedPageHandler to TabbedViewHandler * [Tizen] Add more APIs to IDispatcher * [Tizen] Remove Application.Properties implementation * [Tizen] Backport p14 changes * [Tizen] Implement InputTransparent * [Tizen] Loaded/Unloaded events and propagate Window * [Tizen] Fix Path shapes rendering issues * [Tizen] Fix CI build error on ImageButtonHandler * [Tizen] Optimize ConfigureFonts and Logging during startup * [Tizen] Make sure StrokeDashArray property invalidate the Shape * [Tizen] Implement FillRule property in Polygon/PolylineHandler * [Tizen] Add install tizen to provision.yml * [Tizen] Simplify OnPlatformExtension * [Tizen] Use interface on mappers of shapes * [Tizen] Install tizen workload on dotnet-local-workloads * [Tizen] Move package version into Versions.props * [Tizen] Move 'UseMauiApp' call into "Controls" * [Tizen] update template description of localized string files * [Tizen] Update the package reference of Microsoft.Maui.Dependencies * [Tizen] Add IWindow.DisplayDensity * [Tizen] Initial VisualDiagnostic Image APIs * [Tizen] Mark all the Device [Obsolete] * [Tizen] Mark renderers and related base classes as obsolete * [Tizen] Platform behavior implementation * [Tizen] Clean unnecessary resource files * [Tizen] Graphics events * [Tizen] Modernize Essentials Namepsaces * [Tizen] Fix Compat's control gallery build error * Fix ClipperView background color issue (#447) * Fix typo (#450) * [Tizen] Initial support for configuring the underlying Web view settings * [Tizen] BlazorWebView public API tracking * [Tizen] use latest tizen workload as default * [Tizen] specify sdk version to avoid ci build error * [Tizen] Keep the text wrapping/truncation and max lines stuff in Controls * [Tizen] Remove downcasts in BlazorWebView * [Tizen] BlazorWebView API review changes: Shared sources * [Tizen] add tizen TFM optional * [Tizen] adding informative comments for template * [Tizen] Set IncludeTizenTargetFrameworks correctly * [Tizen] install maui-tizen Co-authored-by: JoonghyunCho <jh5.cho@samsung.com> Co-authored-by: Seungkeun Lee <sngn.lee@samsung.com> Co-authored-by: 김성수/Common Platform Lab(SR)/Staff Engineer/삼성전자 <sung-su.kim@samsung.com> Co-authored-by: 박인서/Common Platform Lab(SR)/Associate/삼성전자 <inseo9.park@samsung.com> Co-authored-by: 민성현/Common Platform Lab(SR)/Staff Engineer/삼성전자 <shyun.min@samsung.com> Co-authored-by: Jay Cho <chojoong@gmail.com>
2022-04-15 11:43:01 +03:00
<PropertyGroup Condition="'$(_MauiTargetPlatformIsTizen)' == 'True'">
<SupportedOSPlatformVersion>6.5</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>6.5</TargetPlatformMinVersion>
</PropertyGroup>
<!--
NOTE: The Contains('-windows10') is a bit of a hack
because we don't want to set these properties for WPF projects...
There's probably a better way we should find to infer this
-->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True' AND $(TargetFramework.Contains('-windows10'))">
2021-10-21 01:44:27 +03:00
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
</PropertyGroup>
[android] use a custom Resource.designer.cs (#2606) Context: https://github.com/jonathanpeppers/CustomResourceDesigner Context: https://github.com/xamarin/xamarin-android/issues/6310 We found a systemic problem with Xamarin.Android class libraries: * Include AndroidX & Google Material * Include at least one `@(AndroidResource)` and use the ID from C# * `Resource.designer.cs` has 2,700+ fields. That's a lot! This problem compounds itself as you include more class libraries that depend on each other. The main app will end up repeatedly setting these fields at startup for each library that contains fields in `Resource.designer.cs`... Reviewing the .NET MAUI fields, I found: src\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5310 src\Controls\src\Core\obj\Debug\net6.0-android\Resource.designer.cs 5167 fields src\Controls\src\Xaml\obj\Release\net6.0-android\Resource.designer.cs 5167 fields src\Compatibility\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5333 fields src\Essentials\src\obj\Debug\net6.0-android\Resource.designer.cs 204 fields In fact, I found 21,497 fields were set at startup for a `dotnet new maui` app in `Resource.designer.cs`! In many projects you can simply set `$(AndroidGenerateResourceDesigner)` to `false`, but the issue is .NET MAUI actually uses some of the C# `Resource.designer.cs` values at runtime. So to solve the problem here, I came up with a new pattern: https://github.com/jonathanpeppers/CustomResourceDesigner We can copy the contents of `Resource.designer.cs` and manually delete all the fields we don't need. This allows `$(AndroidGenerateResourceDesigner)` to be turned off. We are working on a long-term solution for this issue in Xamarin.Android, but we can do this workaround in .NET MAUI now. ~~ Results ~~ Building a `dotnet new maui` then `dotnet build -c Release` and running on a Pixel 5. Before: * 21,497 fields set at startup in UpdateIdValues() * Activity Displayed: 1s454ms * .apk size: 17300275 bytes After: * 65 fields set at startup in UpdateIdValues() * Activity Displayed: 1s079ms * .apk size: 16677683 bytes > apkdiff -f before.apk after.apk Size difference in bytes ([*1] apk1 only, [*2] apk2 only): - 233 assemblies/Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup.dll - 5,264 assemblies/Microsoft.Maui.Essentials.dll - 103,010 assemblies/Microsoft.Maui.dll - 103,260 assemblies/Microsoft.Maui.Controls.Compatibility.dll - 103,811 assemblies/Microsoft.Maui.Controls.Xaml.dll - 106,127 assemblies/Microsoft.Maui.Controls.dll - 201,031 assemblies/foo.dll Summary: + 0 Other entries 0.00% (of 2,139,558) - 622,736 Assemblies -6.93% (of 8,987,664) + 0 Dalvik executables 0.00% (of 6,440,988) + 0 Shared libraries 0.00% (of 9,860,264) - 1,340,928 Uncompressed assemblies -6.55% (of 20,465,016) - 622,592 Package size difference -3.60% (of 17,300,275)
2021-09-21 21:56:32 +03:00
<!--
Comment out this section if you need to update Resource.designer.cs files.
See .github/DEVELOPMENT.md#Android for details.
[android] use a custom Resource.designer.cs (#2606) Context: https://github.com/jonathanpeppers/CustomResourceDesigner Context: https://github.com/xamarin/xamarin-android/issues/6310 We found a systemic problem with Xamarin.Android class libraries: * Include AndroidX & Google Material * Include at least one `@(AndroidResource)` and use the ID from C# * `Resource.designer.cs` has 2,700+ fields. That's a lot! This problem compounds itself as you include more class libraries that depend on each other. The main app will end up repeatedly setting these fields at startup for each library that contains fields in `Resource.designer.cs`... Reviewing the .NET MAUI fields, I found: src\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5310 src\Controls\src\Core\obj\Debug\net6.0-android\Resource.designer.cs 5167 fields src\Controls\src\Xaml\obj\Release\net6.0-android\Resource.designer.cs 5167 fields src\Compatibility\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5333 fields src\Essentials\src\obj\Debug\net6.0-android\Resource.designer.cs 204 fields In fact, I found 21,497 fields were set at startup for a `dotnet new maui` app in `Resource.designer.cs`! In many projects you can simply set `$(AndroidGenerateResourceDesigner)` to `false`, but the issue is .NET MAUI actually uses some of the C# `Resource.designer.cs` values at runtime. So to solve the problem here, I came up with a new pattern: https://github.com/jonathanpeppers/CustomResourceDesigner We can copy the contents of `Resource.designer.cs` and manually delete all the fields we don't need. This allows `$(AndroidGenerateResourceDesigner)` to be turned off. We are working on a long-term solution for this issue in Xamarin.Android, but we can do this workaround in .NET MAUI now. ~~ Results ~~ Building a `dotnet new maui` then `dotnet build -c Release` and running on a Pixel 5. Before: * 21,497 fields set at startup in UpdateIdValues() * Activity Displayed: 1s454ms * .apk size: 17300275 bytes After: * 65 fields set at startup in UpdateIdValues() * Activity Displayed: 1s079ms * .apk size: 16677683 bytes > apkdiff -f before.apk after.apk Size difference in bytes ([*1] apk1 only, [*2] apk2 only): - 233 assemblies/Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup.dll - 5,264 assemblies/Microsoft.Maui.Essentials.dll - 103,010 assemblies/Microsoft.Maui.dll - 103,260 assemblies/Microsoft.Maui.Controls.Compatibility.dll - 103,811 assemblies/Microsoft.Maui.Controls.Xaml.dll - 106,127 assemblies/Microsoft.Maui.Controls.dll - 201,031 assemblies/foo.dll Summary: + 0 Other entries 0.00% (of 2,139,558) - 622,736 Assemblies -6.93% (of 8,987,664) + 0 Dalvik executables 0.00% (of 6,440,988) + 0 Shared libraries 0.00% (of 9,860,264) - 1,340,928 Uncompressed assemblies -6.55% (of 20,465,016) - 622,592 Package size difference -3.60% (of 17,300,275)
2021-09-21 21:56:32 +03:00
-->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True' AND '$(AndroidApplication)' != 'true'">
[android] use a custom Resource.designer.cs (#2606) Context: https://github.com/jonathanpeppers/CustomResourceDesigner Context: https://github.com/xamarin/xamarin-android/issues/6310 We found a systemic problem with Xamarin.Android class libraries: * Include AndroidX & Google Material * Include at least one `@(AndroidResource)` and use the ID from C# * `Resource.designer.cs` has 2,700+ fields. That's a lot! This problem compounds itself as you include more class libraries that depend on each other. The main app will end up repeatedly setting these fields at startup for each library that contains fields in `Resource.designer.cs`... Reviewing the .NET MAUI fields, I found: src\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5310 src\Controls\src\Core\obj\Debug\net6.0-android\Resource.designer.cs 5167 fields src\Controls\src\Xaml\obj\Release\net6.0-android\Resource.designer.cs 5167 fields src\Compatibility\Core\src\obj\Debug\net6.0-android\Resource.designer.cs 5333 fields src\Essentials\src\obj\Debug\net6.0-android\Resource.designer.cs 204 fields In fact, I found 21,497 fields were set at startup for a `dotnet new maui` app in `Resource.designer.cs`! In many projects you can simply set `$(AndroidGenerateResourceDesigner)` to `false`, but the issue is .NET MAUI actually uses some of the C# `Resource.designer.cs` values at runtime. So to solve the problem here, I came up with a new pattern: https://github.com/jonathanpeppers/CustomResourceDesigner We can copy the contents of `Resource.designer.cs` and manually delete all the fields we don't need. This allows `$(AndroidGenerateResourceDesigner)` to be turned off. We are working on a long-term solution for this issue in Xamarin.Android, but we can do this workaround in .NET MAUI now. ~~ Results ~~ Building a `dotnet new maui` then `dotnet build -c Release` and running on a Pixel 5. Before: * 21,497 fields set at startup in UpdateIdValues() * Activity Displayed: 1s454ms * .apk size: 17300275 bytes After: * 65 fields set at startup in UpdateIdValues() * Activity Displayed: 1s079ms * .apk size: 16677683 bytes > apkdiff -f before.apk after.apk Size difference in bytes ([*1] apk1 only, [*2] apk2 only): - 233 assemblies/Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup.dll - 5,264 assemblies/Microsoft.Maui.Essentials.dll - 103,010 assemblies/Microsoft.Maui.dll - 103,260 assemblies/Microsoft.Maui.Controls.Compatibility.dll - 103,811 assemblies/Microsoft.Maui.Controls.Xaml.dll - 106,127 assemblies/Microsoft.Maui.Controls.dll - 201,031 assemblies/foo.dll Summary: + 0 Other entries 0.00% (of 2,139,558) - 622,736 Assemblies -6.93% (of 8,987,664) + 0 Dalvik executables 0.00% (of 6,440,988) + 0 Shared libraries 0.00% (of 9,860,264) - 1,340,928 Uncompressed assemblies -6.55% (of 20,465,016) - 622,592 Package size difference -3.60% (of 17,300,275)
2021-09-21 21:56:32 +03:00
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
<AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>
</PropertyGroup>
Update WinUI and merge projects (#1117) * Update WinUI * it builds but does not run * stuff * make it work * this * Revert "this" This reverts commit e3f25c92ef9008596d8215a246b3a9c7ecd8efe8. * Revert "Revert "this"" This reverts commit 2670ad37b4ca762b4f57fcb723834d8bc361df37. * Revert "Revert "Revert "this""" This reverts commit ba4c0e99ff9a195b46aff5c73be7c70b2d5af6a1. * Revert "Revert "Revert "Revert "this"""" This reverts commit 82e6acf65d3ce8b5aeb970c315828ef823950c9d. * more * also breaks with 5.7 * repro * Updat WinUI and add multitargeting hacks * Fix a crash as a result of a new thing * :) * dsfad * adf * single project template * MAUI_VERSION * Remove xaml from embeddedresource in windows\ * Switch output type to winexe for windows * Add more windows xaml conventions - Page should exclude all windows excludes - Page should be all subfolders in windows dir, and then link them appropriately - Make applicationdefinition link to root where the build expects it - add additional filename for application.xaml which is a windows convention too * Also exclude Windows\ xaml files from MauiXaml * this * that * make it work * that * zip * whoopsies * maybe this? * Generate the Windows app icons * that * that * Undo things * this * that * , * Roll back for now * More code changes * gen that too * that * use resizetized images * Non-square app icon files - windows' wide tile * wide tiles! * don't pack this * decimals! * no need for platforms * Windows splash screens * Create the directory * The correct paths * Build with WinUI 0.8.0-preivew * Remove these * Exclude None with Pack=true from Content * Project reference * File linking * Use a full path https://github.com/dotnet/roslyn/issues/52034 * not needed anymore * AssignTargetPath before CreateManifestResourceName * guids * not here * GUIDs * No need for linux arm right now * New blazor templates * Bump the templates versions * invariant culture * Do it earlier and see * that Co-authored-by: Jonathan Dick <jondick@gmail.com>
2021-06-09 20:20:27 +03:00
<!-- semi HACK: by default, WinUI includes all @(None) with .bmp/.png as @(Content) and adds that to the .pri -->
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
Update WinUI and merge projects (#1117) * Update WinUI * it builds but does not run * stuff * make it work * this * Revert "this" This reverts commit e3f25c92ef9008596d8215a246b3a9c7ecd8efe8. * Revert "Revert "this"" This reverts commit 2670ad37b4ca762b4f57fcb723834d8bc361df37. * Revert "Revert "Revert "this""" This reverts commit ba4c0e99ff9a195b46aff5c73be7c70b2d5af6a1. * Revert "Revert "Revert "Revert "this"""" This reverts commit 82e6acf65d3ce8b5aeb970c315828ef823950c9d. * more * also breaks with 5.7 * repro * Updat WinUI and add multitargeting hacks * Fix a crash as a result of a new thing * :) * dsfad * adf * single project template * MAUI_VERSION * Remove xaml from embeddedresource in windows\ * Switch output type to winexe for windows * Add more windows xaml conventions - Page should exclude all windows excludes - Page should be all subfolders in windows dir, and then link them appropriately - Make applicationdefinition link to root where the build expects it - add additional filename for application.xaml which is a windows convention too * Also exclude Windows\ xaml files from MauiXaml * this * that * make it work * that * zip * whoopsies * maybe this? * Generate the Windows app icons * that * that * Undo things * this * that * , * Roll back for now * More code changes * gen that too * that * use resizetized images * Non-square app icon files - windows' wide tile * wide tiles! * don't pack this * decimals! * no need for platforms * Windows splash screens * Create the directory * The correct paths * Build with WinUI 0.8.0-preivew * Remove these * Exclude None with Pack=true from Content * Project reference * File linking * Use a full path https://github.com/dotnet/roslyn/issues/52034 * not needed anymore * AssignTargetPath before CreateManifestResourceName * guids * not here * GUIDs * No need for linux arm right now * New blazor templates * Bump the templates versions * invariant culture * Do it earlier and see * that Co-authored-by: Jonathan Dick <jondick@gmail.com>
2021-06-09 20:20:27 +03:00
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>
[main] Update dependencies from xamarin/xamarin-android (#1577) * Update dependencies from https://github.com/xamarin/xamarin-android build main-e5103b0f97d542ce14f2ceb9f2d3a247aa6d5964-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.73 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142 * Full Android workload has been renamed to android-aot If you don't need AOT, the `android` workload excludes it. Note that AOT isn't working yet, but we have the Mono packs setup. * Use shortened Apple platform workload names The names are now `maccatalyst`, `macos`, `ios`, and `tvos`. * One more place the android workload name is used * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142 Conflicts: eng/Versions.props * Use shortened Apple platform workload names The names are now `maccatalyst`, `macos`, `ios`, and `tvos`. * Update dependencies from https://github.com/xamarin/xamarin-android build main-7c5fab13329ee898fb1562f83576a7ca881f2881-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.75 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210709.17 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210713.6 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159 * Revert "[build] remove workaround for iOS AOT packages on Windows" This reverts commit 5231ec3509c89325dfcfbe6ced89887d801b3f71. * Add NoWarn=CS8032 for Razor * Update dependencies from https://github.com/xamarin/xamarin-android build main-e06d71320c8f5cebb31c42b15d8172b087a98761-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.77 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Revert "Add NoWarn=CS8032 for Razor" This reverts commit d7212d435c1341e80742bbca9e76e7cb4a201e47. * Update dependencies from https://github.com/xamarin/xamarin-android build main-1d53c0095871293c38d16196982e83485a091a3f-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.81 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Do it like a madman * Update dependencies from https://github.com/xamarin/xamarin-android build main-7dacdd751dd0bd7b02ac443c32824f353a6da380-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.83 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-android build main-24f272bd357d67a5e326d4cce55899a5b98905ae-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.84 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-07-19 21:48:03 +03:00
<!-- Until we get a new enough dotnet -->
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.24" TargetingPackVersion="10.0.19041.24" />
[main] Update dependencies from xamarin/xamarin-android (#1577) * Update dependencies from https://github.com/xamarin/xamarin-android build main-e5103b0f97d542ce14f2ceb9f2d3a247aa6d5964-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.73 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142 * Full Android workload has been renamed to android-aot If you don't need AOT, the `android` workload excludes it. Note that AOT isn't working yet, but we have the Mono packs setup. * Use shortened Apple platform workload names The names are now `maccatalyst`, `macos`, `ios`, and `tvos`. * One more place the android workload name is used * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210707.26 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142 Conflicts: eng/Versions.props * Use shortened Apple platform workload names The names are now `maccatalyst`, `macos`, `ios`, and `tvos`. * Update dependencies from https://github.com/xamarin/xamarin-android build main-7c5fab13329ee898fb1562f83576a7ca881f2881-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.75 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210709.17 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20210713.6 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159 * Revert "[build] remove workaround for iOS AOT packages on Windows" This reverts commit 5231ec3509c89325dfcfbe6ced89887d801b3f71. * Add NoWarn=CS8032 for Razor * Update dependencies from https://github.com/xamarin/xamarin-android build main-e06d71320c8f5cebb31c42b15d8172b087a98761-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.77 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Revert "Add NoWarn=CS8032 for Razor" This reverts commit d7212d435c1341e80742bbca9e76e7cb4a201e47. * Update dependencies from https://github.com/xamarin/xamarin-android build main-1d53c0095871293c38d16196982e83485a091a3f-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.81 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Do it like a madman * Update dependencies from https://github.com/xamarin/xamarin-android build main-7dacdd751dd0bd7b02ac443c32824f353a6da380-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.83 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/xamarin/xamarin-android build main-24f272bd357d67a5e326d4cce55899a5b98905ae-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.84 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-07-19 21:48:03 +03:00
</ItemGroup>
<!--
Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
-->
<Import Project="src\Workload\Microsoft.Maui.Sdk\Sdk\WinUI.Unpackaged.targets" Condition=" '$(WindowsPackageType)' == 'None' and '$(_MauiTargetPlatformIsWindows)' == 'True' " />
</Project>