Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring the MSBuild tasks #158

Merged
merged 9 commits into from
Jul 28, 2023
Merged

Refactoring the MSBuild tasks #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
480d1ff
chore: added android an apple targets
pictos Jul 20, 2023
4b0e63c
chore: refactored Resizetizer.targets to not include android and appl…
pictos Jul 20, 2023
9c9a24b
chore: Refactored wasm code
pictos Jul 20, 2023
d3b45ff
chore: Refactored windows and skia code
pictos Jul 20, 2023
e7a2821
fix: fixed typo
pictos Jul 26, 2023
a6bbadd
fix: removed unnecessary conditions
pictos Jul 26, 2023
c36b2ac
fix: removed _UnoResizetizerIsUWPApp variable
pictos Jul 26, 2023
18b6510
chore: added new targets to the solution items
pictos Jul 27, 2023
1e30b00
style: formatted targets file
pictos Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions samples/NewTemplate/Resizetizer.Extensions.Sample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
..\..\src\.nuspec\Uno.Resizetizer.targets = ..\..\src\.nuspec\Uno.Resizetizer.targets
..\..\src\.nuspec\Uno.Resizetizer.android.targets = ..\..\src\.nuspec\Uno.Resizetizer.android.targets
..\..\src\.nuspec\Uno.Resizetizer.apple.targets = ..\..\src\.nuspec\Uno.Resizetizer.apple.targets
..\..\src\.nuspec\Uno.Resizetizer.wasm.targets = ..\..\src\.nuspec\Uno.Resizetizer.wasm.targets
..\..\src\.nuspec\Uno.Resizetizer.windows.skia.targets = ..\..\src\.nuspec\Uno.Resizetizer.windows.skia.targets
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resizetizer", "..\..\src\Resizetizer\src\Resizetizer.csproj", "{6D3BC015-4BF9-44FA-B3B9-9B44EE13EDA8}"
Expand Down
41 changes: 41 additions & 0 deletions src/.nuspec/Uno.Resizetizer.android.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Project>
<Target
Name="GenerateUnoSplashAndroid"
AfterTargets="GenerateUnoSplashScreens"
DependsOnTargets="GenerateUnoSplashScreens"
Condition="'$(DesignTimeBuild)' != 'True'">
<!-- Android -->
<GenerateSplashAndroidResources_v0
IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
UnoSplashScreen="@(UnoSplashScreen)"
/>
</Target>

<Target Name="ProcessUnoSplashScreens"
AfterTargets="GenerateUnoSplashAndroid"
DependsOnTargets="GenerateUnoSplashAndroid"
Condition="'@(UnoSplashScreen)' != '' And '$(DesignTimeBuild)' != 'true'">

<!-- Android -->
<ItemGroup>
<LibraryResourceDirectories Condition="Exists('$(_UnoIntermediateSplashScreen)')" Include="$(_UnoIntermediateSplashScreen)">
<StampFile>$(_UnoResizetizerStampFile)</StampFile>
</LibraryResourceDirectories>
<FileWrites Include="$(_UnoIntermediateSplashScreen)**\*"/>
</ItemGroup>
</Target>

<Target
Name="ProcessResizedImagesAndroid_v0"
AfterTargets="ProcessResizedImages_v0"
DependsOnTargets="ProcessResizedImages_v0"
Condition="'$(DesignTimeBuild)' != 'true'">

<!-- Android -->
<ItemGroup>
<AndroidResource Include="@(_UnoResizetizerCollectedAppIcons)"
Link="%(_UnoResizetizerCollectedAppIcons.RecursiveDir)%(_UnoResizetizerCollectedAppIcons.Filename)%(_UnoResizetizerCollectedAppIcons.Extension)">
</AndroidResource>
</ItemGroup>
</Target>
</Project>
84 changes: 84 additions & 0 deletions src/.nuspec/Uno.Resizetizer.apple.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<Project>
<Target
Name="GenerateUnoSplashApple"
AfterTargets="GenerateUnoSplashScreens"
DependsOnTargets="GenerateUnoSplashScreens"
Condition="'$(DesignTimeBuild)' != 'True'">
<!-- iOS, but not Catalyst -->
<GenerateSplashStoryboard_v0
Condition="'$(TargetPlatformIdentifier)' != 'maccatalyst'"
OutputFile="$(_UnoIntermediateStoryboard)"
UnoSplashScreen="@(UnoSplashScreen)"
/>
<PropertyGroup Condition="'$(TargetPlatformIdentifier)' != 'maccatalyst'">
<_UnoIntermediateSplashScreenFile>$(_UnoIntermediateStoryboard)</_UnoIntermediateSplashScreenFile>
</PropertyGroup>
<ItemGroup Condition="'$(_UnoResizetizerIsiOSApp)' == 'True' and '$(TargetPlatformIdentifier)' != 'maccatalyst'">
pictos marked this conversation as resolved.
Show resolved Hide resolved
<InterfaceDefinition Include="$(_UnoIntermediateStoryboard)" Link="$([System.IO.Path]::GetFileName($(_UnoIntermediateStoryboard)))"/>
<FileWrites Include="$(_UnoIntermediateStoryboard)"/>
</ItemGroup>

<!-- Create a partial info.plist for iOS -->
<CreatePartialInfoPlistTask_v0
Condition="'$(_UnoResizetizerIsiOSApp)' == 'True' And '$(_UnoIntermediateSplashScreenFile)' != ''"
IntermediateOutputPath="$(_UnoIntermediateSplashScreen)"
PlistName="UnoInfo.plist"
Storyboard="$(_UnoIntermediateSplashScreenFile)"/>
</Target>

<Target Name="ProcessUnoSplashScreens"
AfterTargets="GenerateUnoSplashApple"
DependsOnTargets="GenerateUnoSplashApple"
Condition="'@(UnoSplashScreen)' != '' And '$(DesignTimeBuild)' != 'true'">

<!-- iOS, but not Catalyst -->
<ItemGroup>
<_UnoSplashPListFiles Include="$(_UnoIntermediateSplashScreen)UnoInfo.plist" Condition="Exists('$(_UnoIntermediateSplashScreen)UnoInfo.plist')"/>
<PartialAppManifest Include="@(_UnoSplashPListFiles)" Condition="'@(_UnoSplashPListFiles)' != ''"/>
<FileWrites Include="@(_UnoSplashPListFiles)" Condition="'@(_UnoSplashPListFiles)' != ''"/>
</ItemGroup>

<ItemGroup Condition="'$(BuildSessionId)' != '' And '$(IsMacEnabled)'=='true'">
<_UnoAssetsToCopyToBuildServer Include="@(_UnoSplashPListFiles)">
<TargetPath>%(Identity)</TargetPath>
</_UnoAssetsToCopyToBuildServer>
</ItemGroup>
<CopyFilesToBuildServer
Condition="'$(BuildSessionId)' != '' And '$(IsMacEnabled)'=='true'"
SessionId="$(BuildSessionId)"
Files="@(_UnoAssetsToCopyToBuildServer)"/>
</Target>

<Target
Name="ProcessResizedImagesApple_v0"
AfterTargets="ProcessResizedImages_v0"
DependsOnTargets="ProcessResizedImages_v0"
Condition="'$(DesignTimeBuild)' != 'true'">
<ItemGroup>
<_UnoResizetizerCollectedBundleResourceImages Include="@(_UnoResizetizerCollectedImages->'%(FullPath)')">
<LogicalName>%(_UnoResizetizerCollectedImages.Filename)%(_UnoResizetizerCollectedImages.Extension)</LogicalName>
<TargetPath>%(_UnoResizetizerCollectedImages.Filename)%(_UnoResizetizerCollectedImages.Extension)</TargetPath>
</_UnoResizetizerCollectedBundleResourceImages>

<ImageAsset
Include="@(_UnoResizetizerCollectedBundleResourceImages)"
Condition="'@(_UnoResizetizerCollectedBundleResourceImages->Contains('Assets.xcassets'))' == 'True' and '%(_UnoResizetizerCollectedBundleResourceImages.Identity)' != ''">
<LogicalName>Assets.xcassets\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(_UnoResizetizerCollectedBundleResourceImages.Identity)))))\%(_UnoResizetizerCollectedBundleResourceImages.Filename)%(_UnoResizetizerCollectedBundleResourceImages.Extension)</LogicalName>
<TargetPath>Assets.xcassets\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(_UnoResizetizerCollectedBundleResourceImages.Identity)))))\%(_UnoResizetizerCollectedBundleResourceImages.Filename)%(_UnoResizetizerCollectedBundleResourceImages.Extension)</TargetPath>
<Link>Assets.xcassets\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(_UnoResizetizerCollectedBundleResourceImages.Identity)))))\%(_UnoResizetizerCollectedBundleResourceImages.Filename)%(_UnoResizetizerCollectedBundleResourceImages.Extension)</Link>
</ImageAsset>
</ItemGroup>

<!-- iOS Only -->
<!-- If on Windows, using build host, copy the files over to build server host too -->
<ItemGroup Condition="'$(BuildSessionId)' != '' And '$(IsMacEnabled)'=='true'">
<_UnoImagesToCopyToBuildServer Include="@(_UnoResizetizerCollectedBundleResourceImages)">
<TargetPath>%(Identity)</TargetPath>
</_UnoImagesToCopyToBuildServer>
</ItemGroup>
<CopyFilesToBuildServer
Condition="'$(BuildSessionId)' != '' And '$(IsMacEnabled)'=='true'"
SessionId="$(BuildSessionId)"
Files="@(_UnoImagesToCopyToBuildServer)"/>
</Target>
</Project>
Loading
Loading