Skip to content

Commit

Permalink
fix: remove the RequiredAtrribute and change the dependency chain
Browse files Browse the repository at this point in the history
UnoGeneratePackageAppxManifest doesn't exist on other targets, so we changed the UnoGeneratePackageAppxManifest to depend on _GenerateWindowUnoIconExtension target instead
  • Loading branch information
pictos committed Jan 29, 2024
1 parent d5d4e15 commit 6976558
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/.nuspec/Uno.Resizetizer.targets
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@
<Target Name="_GenerateWindowUnoIconExtension"
Condition="'$(_UnoResizetizerIsCompatibleApp)' == 'True'"
BeforeTargets="Build;CoreCompile;XamlPreCompile"
DependsOnTargets="UnoGeneratePackageAppxManifest"
Inputs="@(UnoIcon)"
Outputs="@(_WindowIconExtension)">
<WindowIconGeneratorTask_v0
Expand Down
3 changes: 2 additions & 1 deletion src/.nuspec/Uno.Resizetizer.windows.skia.targets
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@
BeforeTargets="_ValidatePresenceOfAppxManifestItems"
DependsOnTargets="UnoGeneratePackageAppxManifest"
Condition="'$(_UnoResizetizerIsWindowsAppSdk)' == 'True' Or '$(_UnoResizetizerIsSkiaApp)' == 'True'"/>

<Target Name="UnoGeneratePackageAppxManifest"
Condition="('$(_UnoResizetizerIsWindowsAppSdk)' == 'True' Or '$(_UnoResizetizerIsSkiaApp)' == 'True') And ('@(AppxManifest)@(_UnoAppxManifest)' !='' Or @(_SkiaManifest) != '')"
DependsOnTargets="$(UnoGeneratePackageAppxManifestDependsOnTargets)"
BeforeTargets="$(UnoGeneratePackageAppxManifestBeforeTargets)"
BeforeTargets="$(UnoGeneratePackageAppxManifestBeforeTargets);_GenerateWindowUnoIconExtension"
Inputs="$(MSBuildThisFileFullPath);$(_UnoResizetizerTaskAssemblyName);$(_UnoResizetizerInputsFile);$(_UnoSplashInputsFile);@(AppxManifest);@(_UnoAppxManifest)"
Outputs="$(_UnoManifestStampFile);$(_UnoIntermediateManifest)Package.appxmanifest">

Expand Down
1 change: 0 additions & 1 deletion src/Resizetizer/src/WindowIconGeneratorTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class WindowIconGeneratorTask_V0 : Task
[Required]
public string IntermediateOutputDirectory { get; set; }

[Required]
public string WindowTitle { get; set; }

[Output]
Expand Down

0 comments on commit 6976558

Please sign in to comment.