-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #886 from unoplatform/dev/nr/cpmoptional
feat: Making CPM optional
- Loading branch information
Showing
16 changed files
with
617 additions
and
3 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
19 changes: 19 additions & 0 deletions
19
src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Build.nocpm.props
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 |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<Project ToolsVersion="15.0"> | ||
<PropertyGroup> | ||
<LangVersion>10.0</LangVersion> | ||
<ImplicitUsings>enable</ImplicitUsings> | ||
<Nullable>enable</Nullable> | ||
|
||
<DebugType>portable</DebugType> | ||
<DebugSymbols>True</DebugSymbols> | ||
<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata> | ||
|
||
<TreatWarningsAsErrors>True</TreatWarningsAsErrors> | ||
<NoWarn>$(NoWarn);Uno0001;CS1998;CA1416;NU1507</NoWarn> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<!--This override is used to validate the use of specific version of the C# Compiler--> | ||
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" PrivateAssets="all" /> | ||
</ItemGroup> | ||
</Project> |
104 changes: 104 additions & 0 deletions
104
...ates/content/unoapp-extensions/MyExtensionsApp.Mobile/MyExtensionsApp.Mobile.nocpm.csproj
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 |
---|---|---|
@@ -0,0 +1,104 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<!--#if (android) | ||
<TargetFrameworks>$(TargetFrameworks);net6.0-android</TargetFrameworks> | ||
#endif --> | ||
<!--#if (ios) | ||
<TargetFrameworks>$(TargetFrameworks);net6.0-ios</TargetFrameworks> | ||
#endif --> | ||
<!--#if (macos) | ||
<TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks> | ||
#endif --> | ||
<!--#if (maccatalyst) | ||
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks> | ||
#endif --> | ||
<SingleProject>true</SingleProject> | ||
<OutputType>Exe</OutputType> | ||
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier> | ||
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier> | ||
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier> | ||
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 --> | ||
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> --> | ||
<!-- Required for C# Hot Reload --> | ||
<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst'">True</UseInterpreter> | ||
<IsUnoHead>true</IsUnoHead> | ||
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion> | ||
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion> | ||
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion> | ||
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<PackageReference Include="Uno.WinUI" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.962" Condition="'$(Configuration)'=='Debug'" /> | ||
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.Material.WinUI" Version="2.4.0-dev.42"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Extensions.Authentication.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Authentication" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Configuration" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Core" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.Serilog" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="255.255.255.255"/> | ||
</ItemGroup> | ||
<Choose> | ||
<When Condition="'$(TargetFramework)'=='net6.0-android'"> | ||
<ItemGroup> | ||
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4"/> | ||
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<AndroidEnvironment Include="Android/environment.conf" /> | ||
</ItemGroup> | ||
</When> | ||
<When Condition="'$(TargetFramework)'=='net6.0-ios'"> | ||
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'"> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs> | ||
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 --> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" /> | ||
</ItemGroup> | ||
</When> | ||
<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'"> | ||
<PropertyGroup> | ||
<!-- Configure the GC --> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs> | ||
<!-- Required for unknown crash as of .NET 6 Mobile Preview 13 --> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs> | ||
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 --> | ||
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs> | ||
<!-- Full globalization is required for Uno --> | ||
<InvariantGlobalization>false</InvariantGlobalization> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0"/> | ||
</ItemGroup> | ||
</When> | ||
<When Condition="'$(TargetFramework)'=='net6.0-macos'"> | ||
<PropertyGroup> | ||
</PropertyGroup> | ||
</When> | ||
</Choose> | ||
<ItemGroup> | ||
<ProjectReference Include="..\MyExtensionsApp\MyExtensionsApp.csproj" /> | ||
</ItemGroup> | ||
|
||
<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" /> | ||
</Project> |
54 changes: 54 additions & 0 deletions
54
.../content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.nocpm.csproj
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 |
---|---|---|
@@ -0,0 +1,54 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType> | ||
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<ApplicationManifest>app.manifest</ApplicationManifest> | ||
</PropertyGroup> | ||
<ItemGroup Condition="exists('..\MyExtensionsApp.Windows')"> | ||
<EmbeddedResource Include="..\MyExtensionsApp.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" /> | ||
<Content Include="..\MyExtensionsApp.Windows\Images\StoreLogo.png" Link="Assets\StoreLogo.png" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<UpToDateCheckInput Include="..\MyExtensionsApp.UI\**\*.xaml" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.2" /> | ||
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.2" /> | ||
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.962" Condition="'$(Configuration)'=='Debug'" /> | ||
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.Material.WinUI" Version="2.4.0-dev.42"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Extensions.Authentication.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Authentication" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Configuration" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Core" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.Serilog" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="255.255.255.255"/> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<ProjectReference Include="..\MyExtensionsApp\MyExtensionsApp.csproj" /> | ||
</ItemGroup> | ||
|
||
<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" /> | ||
</Project> |
50 changes: 50 additions & 0 deletions
50
...yExtensionsApp.Skia.Linux.FrameBuffer/MyExtensionsApp.Skia.Linux.FrameBuffer.nocpm.csproj
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 |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType> | ||
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType> | ||
<TargetFramework>net6.0</TargetFramework> | ||
</PropertyGroup> | ||
<ItemGroup Condition="exists('..\MyExtensionsApp.Windows')"> | ||
<EmbeddedResource Include="..\MyExtensionsApp.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" /> | ||
<Content Include="..\MyExtensionsApp.Windows\Images\StoreLogo.png" Link="Assets\StoreLogo.png" /> | ||
<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<UpToDateCheckInput Include="..\MyExtensionsApp.UI\**\*.xaml" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.2" /> | ||
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.2" /> | ||
<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.0-dev.962" Condition="'$(Configuration)'=='Debug'" /> | ||
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.0-dev.962" /> | ||
<PackageReference Include="Uno.Material.WinUI" Version="2.4.0-dev.42"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Toolkit.WinUI" Version="2.4.0-dev.99"/> | ||
<PackageReference Include="Uno.Extensions.Authentication.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Authentication" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Configuration" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Core" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Hosting" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Http.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Localization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Logging.Serilog" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Navigation" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Http" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Serialization.Refit" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive" Version="255.255.255.255"/> | ||
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="255.255.255.255"/> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<ProjectReference Include="..\MyExtensionsApp\MyExtensionsApp.csproj" /> | ||
</ItemGroup> | ||
|
||
<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" /> | ||
</Project> |
Oops, something went wrong.