Skip to content

Commit

Permalink
feat: adding support for Single Project
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel authored and spouliot committed Mar 4, 2024
1 parent a897c0d commit 3a85523
Show file tree
Hide file tree
Showing 19 changed files with 307 additions and 47 deletions.
21 changes: 7 additions & 14 deletions src/Uno.Sdk/targets/Uno.Common.Android.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,13 @@
<PropertyGroup>
<IsAndroid>true</IsAndroid>
<SupportedOSPlatformVersion Condition=" $(SupportedOSPlatformVersion) == '' ">21.0</SupportedOSPlatformVersion>
<AndroidManifest Condition=" $(AndroidManifest) == '' AND '$(SingleProject)' == 'true' AND Exists($([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', 'Android', 'AndroidManifest.xml'))) ">Android\AndroidManifest.xml</AndroidManifest>
<AndroidManifest Condition=" $(AndroidManifest) == '' AND '$(SingleProject)' == 'true' AND Exists($([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', 'Platforms', 'Android', 'AndroidManifest.xml'))) ">Platforms\Android\AndroidManifest.xml</AndroidManifest>
<EnableDefaultAndroidItems>false</EnableDefaultAndroidItems>
<AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">$(PlatformsProjectFolder)Android\</AndroidProjectFolder>
<AndroidProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(AndroidProjectFolder)'))</AndroidProjectFolder>
<AndroidProjectFolder Condition=" !Exists('$(AndroidProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('Android'))</AndroidProjectFolder>

<AndroidManifest Condition=" $(AndroidManifest) == '' AND '$(SingleProject)' == 'true' AND Exists($(AndroidProjectFolder)AndroidManifest.xml) ">$(AndroidProjectFolder)AndroidManifest.xml</AndroidManifest>
</PropertyGroup>

<ItemGroup>
<AndroidEnvironment Include="Android\environment.conf"
Condition=" '$(SingleProject)' == 'true' AND Exists($([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', 'Android', 'environment.conf'))) ">
<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
<IsDefaultItem>true</IsDefaultItem>
</AndroidEnvironment>
<AndroidEnvironment Include="Platforms\Android\environment.conf"
Condition=" '$(SingleProject)' == 'true' AND Exists($([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', 'Platforms', 'Android', 'environment.conf'))) ">
<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
<IsDefaultItem>true</IsDefaultItem>
</AndroidEnvironment>
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)Uno.SingleProject.Android.targets" Condition="$(SingleProject) == 'true'" />
</Project>
7 changes: 7 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.MacCatalyst.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@
<IsIOSOrCatalyst>true</IsIOSOrCatalyst>
<IsMacCatalyst>true</IsMacCatalyst>
<SupportedOSPlatformVersion Condition=" $(SupportedOSPlatformVersion) == '' ">14.0</SupportedOSPlatformVersion>

<EnableDefaultMacCatalystItems>false</EnableDefaultMacCatalystItems>
<MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">$(PlatformsProjectFolder)MacCatalyst\</MacCatalystProjectFolder>
<MacCatalystProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(MacCatalystProjectFolder)'))</MacCatalystProjectFolder>
<MacCatalystProjectFolder Condition=" !Exists('$(MacCatalystProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('MacCatalyst'))</MacCatalystProjectFolder>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Uno.SingleProject.iOSMac.targets" Condition="$(SingleProject) == 'true'" />
</Project>
12 changes: 12 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.MacOS.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<Project>
<!--
We aren't currently fully supporting macos because of
https://github.com/xamarin/xamarin-macios/issues/16401
https://github.com/dotnet/sdk/issues/21877
-->
<PropertyGroup>
<IsMacOS>true</IsMacOS>
<SupportedOSPlatformVersion Condition=" $(SupportedOSPlatformVersion) == '' ">10.14</SupportedOSPlatformVersion>

<EnableDefaultMacOSItems>false</EnableDefaultMacOSItems>
<MacOSProjectFolder Condition=" '$(MacOSProjectFolder)' == '' ">$(PlatformsProjectFolder)MacOS\</MacOSProjectFolder>
<MacOSProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(MacOSProjectFolder)'))</MacOSProjectFolder>
<MacOSProjectFolder Condition=" !Exists('$(MacOSProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('MacOS'))</MacOSProjectFolder>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Uno.SingleProject.iOSMac.targets" Condition="$(SingleProject) == 'true'" />
</Project>
5 changes: 5 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.Skia.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<Project>
<PropertyGroup>
<IsSkia>true</IsSkia>

<EnableDefaultSkiaItems>false</EnableDefaultSkiaItems>
<SkiaProjectFolder Condition=" '$(SkiaProjectFolder)' == '' ">$(PlatformsProjectFolder)Skia\</SkiaProjectFolder>
<SkiaProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(SkiaProjectFolder)'))</SkiaProjectFolder>
<SkiaProjectFolder Condition=" !Exists('$(SkiaProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('Skia'))</SkiaProjectFolder>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\targets\Uno.SingleProject.Skia.targets"
Expand Down
5 changes: 5 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.Wasm.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<Project>
<PropertyGroup>
<IsBrowser>true</IsBrowser>

<EnableDefaultWasmItems>false</EnableDefaultWasmItems>
<WasmProjectFolder Condition=" '$(WasmProjectFolder)' == '' ">$(PlatformsProjectFolder)Wasm\</WasmProjectFolder>
<WasmProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(WasmProjectFolder)'))</WasmProjectFolder>
<WasmProjectFolder Condition=" !Exists('$(WasmProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('Wasm'))</WasmProjectFolder>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\targets\Uno.SingleProject.Wasm.targets"
Expand Down
5 changes: 5 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
<EnableMsixTooling Condition=" $(EnableMsixTooling) == '' AND ('$(OutputType)' == 'WinExe' OR '$(OutputType)' == 'Exe') ">true</EnableMsixTooling>

<EnableWindowsTargeting Condition=" $(EnableWindowsTargeting) == '' ">true</EnableWindowsTargeting>

<EnableDefaultWindowsItems>false</EnableDefaultWindowsItems>
<WindowsProjectFolder Condition=" '$(WindowsProjectFolder)' == '' ">$(PlatformsProjectFolder)Windows\</WindowsProjectFolder>
<WindowsProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(WindowsProjectFolder)'))</WindowsProjectFolder>
<WindowsProjectFolder Condition=" !Exists('$(WindowsProjectFolder)') ">$([MSBuild]::EnsureTrailingSlash('Windows'))</WindowsProjectFolder>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
Expand Down
7 changes: 7 additions & 0 deletions src/Uno.Sdk/targets/Uno.Common.iOS.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@
<IsIOSOrCatalyst>true</IsIOSOrCatalyst>
<IsIOS>true</IsIOS>
<SupportedOSPlatformVersion Condition=" $(SupportedOSPlatformVersion) == '' ">14.2</SupportedOSPlatformVersion>

<EnableDefaultiOSItems>false</EnableDefaultiOSItems>
<iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">$(PlatformsProjectFolder)iOS\</iOSProjectFolder>
<iOSProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(iOSProjectFolder)'))</iOSProjectFolder>
<iOSProjectFolder Condition=" !Exists($(iOSProjectFolder)) ">$([MSBuild]::EnsureTrailingSlash('iOS'))</iOSProjectFolder>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Uno.SingleProject.iOSMac.targets" Condition="$(SingleProject) == 'true'" />
</Project>
18 changes: 14 additions & 4 deletions src/Uno.Sdk/targets/Uno.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,18 @@
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" $(SingleProject) == 'true' ">
<PlatformsProjectFolder Condition=" '$(PlatformsProjectFolder)' == '' ">Platforms\</PlatformsProjectFolder>
<PlatformsProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(PlatformsProjectFolder)'))</PlatformsProjectFolder>
<PlatformsProjectFolder Condition=" !Exists('$(PlatformsProjectFolder)') "></PlatformsProjectFolder>
<IsUnoHead>true</IsUnoHead>
</PropertyGroup>

<PropertyGroup>
<DefaultLanguage Condition=" $(DefaultLanguage) == '' ">en</DefaultLanguage>
</PropertyGroup>

<!-- TFM Specific Targets -->
<Import Project="Uno.Common.Android.targets"
Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' " />
<Import Project="Uno.Common.iOS.targets"
Expand All @@ -22,14 +30,16 @@
Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos' " />
<Import Project="Uno.Common.Skia.targets"
Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'skia' " />
<Import Project="Uno.Common.Skia.targets"
Condition=" $(MSBuildProjectName.Contains('.Skia.')) " />
<Import Project="Uno.Common.Wasm.targets"
Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browser' " />
<Import Project="Uno.Common.Wasm.targets"
Condition=" $(MSBuildProjectName.EndsWith('.Wasm')) or $(MSBuildProjectName.EndsWith('.WebAssembly')) " />
<!-- Evaluate windows10 instead of using GetTargetPlatformIdentifier because of duplicate value for WPF -->
<Import Project="Uno.Common.WinAppSdk.targets"
Condition=" $(TargetFramework.Contains('windows10')) " />

<!-- Legacy Project Support -->
<Import Project="Uno.Common.Skia.targets"
Condition=" $(MSBuildProjectName.Contains('.Skia.')) " />
<Import Project="Uno.Common.Wasm.targets"
Condition=" $(MSBuildProjectName.EndsWith('.Wasm')) or $(MSBuildProjectName.EndsWith('.WebAssembly')) " />

</Project>
39 changes: 39 additions & 0 deletions src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project>
<PropertyGroup>
<!-- App Icon Defaults -->
<UnoIconFolder Condition="$(UnoIconFolder) == ''">$([MSBuild]::EnsureTrailingSlash('$(AssetsFolder)Icons'))</UnoIconFolder>
<UnoSplashFolder Condition="$(UnoSplashFolder) == ''">$([MSBuild]::EnsureTrailingSlash('$(AssetsFolder)Splash'))</UnoSplashFolder>
<UnoIconBackgroundFile Condition="$(UnoIconBackgroundFile) == ''">$(UnoIconFolder)icon.svg</UnoIconBackgroundFile>
<UnoIconForegroundFile Condition="$(UnoIconForegroundFile) == ''">$(UnoIconFolder)icon_foreground.svg</UnoIconForegroundFile>
<UnoIconForegroundScale Condition="$(UnoIconForegroundScale) == ''">0.65</UnoIconForegroundScale>
<UnoIconBackgroundColor Condition="$(UnoIconBackgroundColor) == ''">#00000000</UnoIconBackgroundColor>
<UnoSplashScreenFile Condition="$(UnoSplashScreenFile) == ''">$(UnoSplashFolder)splash_screen.svg</UnoSplashScreenFile>
<UnoSplashScreenBaseSize Condition="$(UnoSplashScreenBaseSize) == ''">128,128</UnoSplashScreenBaseSize>
<UnoSplashScreenColor Condition="$(UnoSplashScreenColor) == ''">#FFFFFF</UnoSplashScreenColor>
</PropertyGroup>

<ItemGroup Condition="$(SingleProject) == 'true'">
<UnoIcon Include="$(UnoIconBackgroundFile)"
ForegroundFile="$(UnoIconForegroundFile)"
ForegroundScale="$(UnoIconForegroundScale)"
Color="$(UnoIconBackgroundColor)"
IsDefaultItem="true"
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))"
Exclude="@(UnoIcom)"
Condition="Exists('$(UnoIconBackgroundFile)') and Exists('$(UnoIconForegroundFile)')" />
<UnoSplashScreen Include="$(UnoSplashScreenFile)"
BaseSize="$(UnoSplashScreenBaseSize)"
Color="$(UnoSplashScreenColor)"
IsDefaultItem="true"
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))"
Exclude="@(UnoSplashScreen)"
Condition="Exists('$(UnoSplashScreenFile)')" />
</ItemGroup>

<ItemGroup>
<UnoImage Include="Assets\**\*.svg"
Exclude="@(UnoImage);@(UnoIcon);@(UnoSplashScreen);$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"
IsDefaultItem="true"
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" />
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions src/Uno.Sdk/targets/Uno.DefaultItems.SingleProject.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project>
<ItemGroup Condition="Exists('App.xaml') AND !$(TargetFramework.Contains('windows10'))">
<ApplicationDefinition Include="App.xaml"
SubType="Designer"
XamlRuntime="WinUI"
Generator="MSBuild:Compile" />
<Compile Include="App.xaml.cs"
XamlRuntime="WinUI"
DependentUpon="App.xaml" />
</ItemGroup>
</Project>
11 changes: 5 additions & 6 deletions src/Uno.Sdk/targets/Uno.DefaultItems.targets
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" />
</ItemGroup>

<ItemGroup Condition=" '$(PkgUno_Resizetizer)'!='' ">
<UnoImage Include="Assets\**\*.svg" Exclude="@(UnoImage)">
<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
<IsDefaultItem>true</IsDefaultItem>
</UnoImage>
</ItemGroup>
<!-- Single Project -->
<Import Project="Uno.DefaultItems.SingleProject.targets" Condition="$(SingleProject) == 'true'" />

<!-- Resizetizer -->
<Import Project="Uno.DefaultItems.Resizetizer.targets" Condition="$(PkgUno_Resizetizer) != ''" />

<!-- Cross Targetting -->
<Import Project="Uno.CrossTargeting.targets" />
Expand Down
23 changes: 23 additions & 0 deletions src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project>
<!-- Taken from: https://github.com/dotnet/maui/blob/c02a6706534888ccea577d771c9edfc820bfc001/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Sdk.After.targets#L16C3-L26C15 -->
<!-- SingleProject-specific features -->
<ItemGroup>
<ProjectCapability Include="Msix" Exclude="@(ProjectCapability)" />
<ProjectCapability Include="MauiSingleProject" Exclude="@(ProjectCapability)" />
<ProjectCapability Include="LaunchProfiles" Exclude="@(ProjectCapability)" />
<!-- If VS is older than Dev17 -->
<ProjectCapability Include="XamarinStaticLaunchProfiles" Condition=" '$(VisualStudioVersion)' != '' and '$(VisualStudioVersion)' &lt; '17.0' " Exclude="@(ProjectCapability)" />
<!-- Otherwise define LaunchProfilesGroupByPlatformFilters by default -->
<ProjectCapability Include="LaunchProfilesGroupByPlatformFilters" Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &gt;= '17.0' " Exclude="@(ProjectCapability)" />
<ProjectCapability Include="SingleTargetBuildForStartupProjects" Condition=" '$(EnableSingleTargetBuildForStartupProjects)' != 'false' " Exclude="@(ProjectCapability)" />

<!-- Required since VS 2022 17.4 Preview 1 -->
<ProjectCapability Include="MauiCore" Exclude="@(ProjectCapability)" />
<ProjectCapability Include="Maui" Exclude="@(ProjectCapability)" />
<ProjectCapability Include="UseMauiCore" Exclude="@(ProjectCapability)" />
</ItemGroup>

<PropertyGroup Condition="$(IsWinAppSdk)">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
</Project>
18 changes: 15 additions & 3 deletions src/Uno.Sdk/targets/Uno.ProjectCapabilities.WinAppSdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<PropertyGroup Condition="$(OutputType)=='WinExe' and '$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
<Choose>
<When Condition="$(SingleProject) == 'true'">
<PropertyGroup>
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
</When>
<When Condition="$(SingleProject) != 'true' and $(OutputType)=='WinExe' and '$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<PropertyGroup>
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
<ItemGroup>
<ProjectCapability Include="HasPackageAndPublishMenuAddedByProject"/>
</ItemGroup>
</When>
</Choose>
</Project>
24 changes: 4 additions & 20 deletions src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,6 @@
<DefaultXamlRuntime Condition="'$(DefaultXamlRuntime)'==''">WinUI</DefaultXamlRuntime>
</PropertyGroup>

<!-- Taken from: https://github.com/dotnet/maui/blob/c02a6706534888ccea577d771c9edfc820bfc001/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Sdk.After.targets#L16C3-L26C15 -->
<!-- SingleProject-specific features -->
<ItemGroup Condition=" '$(SingleProject)' == 'true' ">
<ProjectCapability Include="Msix" />
<ProjectCapability Include="MauiSingleProject" />
<ProjectCapability Include="LaunchProfiles" />
<!-- If VS is older than Dev17 -->
<ProjectCapability Include="XamarinStaticLaunchProfiles" Condition=" '$(VisualStudioVersion)' != '' and '$(VisualStudioVersion)' &lt; '17.0' " />
<!-- Otherwise define LaunchProfilesGroupByPlatformFilters by default -->
<ProjectCapability Include="LaunchProfilesGroupByPlatformFilters" Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &gt;= '17.0' " />
<ProjectCapability Include="SingleTargetBuildForStartupProjects" Condition=" '$(EnableSingleTargetBuildForStartupProjects)' != 'false' " />

<!-- Required since VS 2022 17.4 Preview 1 -->
<ProjectCapability Include="MauiCore" />
<ProjectCapability Include="Maui" />
<ProjectCapability Include="UseMauiCore" />
</ItemGroup>

<Import Project="Uno.ProjectCapabilities.WinAppSdk.targets" Condition="$(IsWinAppSdk)" />

<!-- Additional capabilities to enable XAML Intellisense for non WinUI native projects -->
<ItemGroup Condition="'$(BuildingInsideVisualStudio)' == 'true'">
<AvailableItemName Include="PRIResource" />
Expand All @@ -48,4 +28,8 @@
<ProjectCapability Include="WindowsXamlUserControl"/>
<ProjectCapability Include="WindowsUniversalMultiViews"/>
</ItemGroup>

<Import Project="Uno.ProjectCapabilities.WinAppSdk.targets" Condition="$(IsWinAppSdk)" />

<Import Project="Uno.ProjectCapabilities.SingleProject.targets" Condition=" '$(SingleProject)' == 'true' " />
</Project>
18 changes: 18 additions & 0 deletions src/Uno.Sdk/targets/Uno.SingleProject.Android.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project>
<PropertyGroup>
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
<!-- <MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
<!-- Required for C# Hot Reload -->
<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>

<MonoAndroidResourcePrefix>$(AndroidProjectFolder)Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets</MonoAndroidAssetsPrefix>
</PropertyGroup>

<ItemGroup>
<AndroidEnvironment Include="$(AndroidProjectFolder)environment.conf"
Condition=" Exists($(AndroidProjectFolder)environment.conf) "
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))"
IsDefaultItem="true" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Uno.Sdk/targets/Uno.SingleProject.Skia.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
<Project>
<PropertyGroup>
<SkiaHeadBaseDirectory Condition="$(SkiaHeadBaseDirectory) == ''">$([MSBuild]::EnsureTrailingSlash($([System.IO.Path]::Combine('Platforms', 'Skia'))))</SkiaHeadBaseDirectory>
<ApplicationManifest Condition="$(ApplicationManifest) == ''">$(SkiaHeadBaseDirectory)app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="$(SkiaHeadBaseDirectory)Package.appxmanifest"
Condition="Exists('$(SkiaHeadBaseDirectory)Package.appxmanifest')"
Condition="@(EmbeddedResource)"
IsDefaultItem="true"
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" />
<Manifest Include="$(SkiaHeadBaseDirectory)$(ApplicationManifest)"
Condition="Exists('$(SkiaHeadBaseDirectory)$(ApplicationManifest)')"
Condition="@(EmbeddedResource)"
IsDefaultItem="true"
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" />
</ItemGroup>

<Target Name="_UnoRemoveTransitiveWPFDependency"
BeforeTargets="_CheckForTransitiveWindowsDesktopDependencies"
Expand Down
Loading

0 comments on commit 3a85523

Please sign in to comment.