diff --git a/src/Uno.Sdk/targets/Uno.Common.Android.targets b/src/Uno.Sdk/targets/Uno.Common.Android.targets index a1e8e181ca63..7865da42517d 100644 --- a/src/Uno.Sdk/targets/Uno.Common.Android.targets +++ b/src/Uno.Sdk/targets/Uno.Common.Android.targets @@ -2,20 +2,13 @@ true 21.0 - Android\AndroidManifest.xml - Platforms\Android\AndroidManifest.xml + false + $(PlatformsProjectFolder)Android\ + $([MSBuild]::EnsureTrailingSlash('$(AndroidProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('Android')) + + $(AndroidProjectFolder)AndroidManifest.xml - - - $([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)')) - true - - - $([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)')) - true - - + diff --git a/src/Uno.Sdk/targets/Uno.Common.MacCatalyst.targets b/src/Uno.Sdk/targets/Uno.Common.MacCatalyst.targets index 1131d575220c..d4761785de9f 100644 --- a/src/Uno.Sdk/targets/Uno.Common.MacCatalyst.targets +++ b/src/Uno.Sdk/targets/Uno.Common.MacCatalyst.targets @@ -3,5 +3,12 @@ true true 14.0 + + false + $(PlatformsProjectFolder)MacCatalyst\ + $([MSBuild]::EnsureTrailingSlash('$(MacCatalystProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('MacCatalyst')) + + diff --git a/src/Uno.Sdk/targets/Uno.Common.MacOS.targets b/src/Uno.Sdk/targets/Uno.Common.MacOS.targets index 1f30fe0531ce..24dc01d904e5 100644 --- a/src/Uno.Sdk/targets/Uno.Common.MacOS.targets +++ b/src/Uno.Sdk/targets/Uno.Common.MacOS.targets @@ -1,6 +1,18 @@ + true 10.14 + + false + $(PlatformsProjectFolder)MacOS\ + $([MSBuild]::EnsureTrailingSlash('$(MacOSProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('MacOS')) + + diff --git a/src/Uno.Sdk/targets/Uno.Common.Skia.targets b/src/Uno.Sdk/targets/Uno.Common.Skia.targets index 6d108b070f7f..b73624b6dca3 100644 --- a/src/Uno.Sdk/targets/Uno.Common.Skia.targets +++ b/src/Uno.Sdk/targets/Uno.Common.Skia.targets @@ -1,6 +1,11 @@ true + + false + $(PlatformsProjectFolder)Skia\ + $([MSBuild]::EnsureTrailingSlash('$(SkiaProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('Skia')) true + + false + $(PlatformsProjectFolder)Wasm\ + $([MSBuild]::EnsureTrailingSlash('$(WasmProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('Wasm')) true true + + false + $(PlatformsProjectFolder)Windows\ + $([MSBuild]::EnsureTrailingSlash('$(WindowsProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('Windows')) diff --git a/src/Uno.Sdk/targets/Uno.Common.iOS.targets b/src/Uno.Sdk/targets/Uno.Common.iOS.targets index 7222645d1401..12838d550840 100644 --- a/src/Uno.Sdk/targets/Uno.Common.iOS.targets +++ b/src/Uno.Sdk/targets/Uno.Common.iOS.targets @@ -3,5 +3,12 @@ true true 14.2 + + false + $(PlatformsProjectFolder)iOS\ + $([MSBuild]::EnsureTrailingSlash('$(iOSProjectFolder)')) + $([MSBuild]::EnsureTrailingSlash('iOS')) + + diff --git a/src/Uno.Sdk/targets/Uno.Common.targets b/src/Uno.Sdk/targets/Uno.Common.targets index 05864b4cde18..23c77bde01b2 100644 --- a/src/Uno.Sdk/targets/Uno.Common.targets +++ b/src/Uno.Sdk/targets/Uno.Common.targets @@ -8,10 +8,18 @@ false + + Platforms\ + $([MSBuild]::EnsureTrailingSlash('$(PlatformsProjectFolder)')) + + true + + en + - - + + + + diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets new file mode 100644 index 000000000000..e825e2854b36 --- /dev/null +++ b/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets @@ -0,0 +1,39 @@ + + + + $([MSBuild]::EnsureTrailingSlash('$(AssetsFolder)Icons')) + $([MSBuild]::EnsureTrailingSlash('$(AssetsFolder)Splash')) + $(UnoIconFolder)icon.svg + $(UnoIconFolder)icon_foreground.svg + 0.65 + #00000000 + $(UnoSplashFolder)splash_screen.svg + 128,128 + #FFFFFF + + + + + + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.SingleProject.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.SingleProject.targets new file mode 100644 index 000000000000..e465eaaed7c1 --- /dev/null +++ b/src/Uno.Sdk/targets/Uno.DefaultItems.SingleProject.targets @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.targets index 461c3d9c23f9..270bf1a11cc8 100644 --- a/src/Uno.Sdk/targets/Uno.DefaultItems.targets +++ b/src/Uno.Sdk/targets/Uno.DefaultItems.targets @@ -51,12 +51,11 @@ Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" /> - - - $([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)')) - true - - + + + + + diff --git a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets new file mode 100644 index 000000000000..113ac894f2dd --- /dev/null +++ b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + true + + diff --git a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.WinAppSdk.targets index a6256c831469..d12a81d005f5 100644 --- a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.WinAppSdk.targets +++ b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.WinAppSdk.targets @@ -15,7 +15,19 @@ Explorer "Package and Publish" context menu entry to be enabled for this project even if the Windows App SDK Nuget package has not yet been restored. --> - - true - + + + + true + + + + + true + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets index 6ec46c4f5da0..73d3b8bd5a20 100644 --- a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets +++ b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets @@ -9,26 +9,6 @@ WinUI - - - - - - - - - - - - - - - - - - - - @@ -48,4 +28,8 @@ + + + + diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.Android.targets b/src/Uno.Sdk/targets/Uno.SingleProject.Android.targets new file mode 100644 index 000000000000..c10a9c70236e --- /dev/null +++ b/src/Uno.Sdk/targets/Uno.SingleProject.Android.targets @@ -0,0 +1,18 @@ + + + + + + True + + $(AndroidProjectFolder)Resources + $(AndroidProjectFolder)Assets + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.Skia.targets b/src/Uno.Sdk/targets/Uno.SingleProject.Skia.targets index a37f3ca95595..6887df88c30d 100644 --- a/src/Uno.Sdk/targets/Uno.SingleProject.Skia.targets +++ b/src/Uno.Sdk/targets/Uno.SingleProject.Skia.targets @@ -1,4 +1,20 @@ + + $([MSBuild]::EnsureTrailingSlash($([System.IO.Path]::Combine('Platforms', 'Skia')))) + $(SkiaHeadBaseDirectory)app.manifest + + + + + + + $([MSBuild]::EnsureTrailingSlash($([System.IO.Path]::Combine('Platforms', 'Wasm')))) + $(WasmHeadBaseDirectory)manifest.webmanifest + $(WasmHeadBaseDirectory)Properties + + / + + + true + $(DefineConstants);DEBUG + $(DefineConstants);TRACE + + false + + + + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets index faf2349bae2d..3bd915336bad 100644 --- a/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets +++ b/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets @@ -1,3 +1,23 @@ + + true + WinExe + + true + + + $(WindowsProjectFolder)app.manifest + x86;x64;arm64 + + + + + + + + + + + diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.iOSMac.targets b/src/Uno.Sdk/targets/Uno.SingleProject.iOSMac.targets new file mode 100644 index 000000000000..dea71bfa75bd --- /dev/null +++ b/src/Uno.Sdk/targets/Uno.SingleProject.iOSMac.targets @@ -0,0 +1,50 @@ + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + + $(MtouchExtraArgs) --registrar:static + + + + + + + True + + $(iOSProjectFolder)Resources + $(iOSProjectFolder)Entitlements.plist + $(iOSProjectFolder)Entitlements-$(Configuration).plist + <_SingleProjectiOSExcludes>$(iOSProjectFolder)/**/.*/** + + + + + + false + + $(MacCatalystProjectFolder)Resources + $(MacCatalystProjectFolder)Entitlements.plist + $(MacCatalystProjectFolder)Entitlements-$(Configuration).plist + <_SingleProjectMacCatalystExcludes>$(MacCatalystProjectFolder)/**/.*/** + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + link + + + + +