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

[msbuild] Rename a few HotRestart tasks. #18077

Merged
merged 1 commit into from
Apr 18, 2023
Merged

[msbuild] Rename a few HotRestart tasks. #18077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...marin.iOS.Tasks.Windows/Tasks/Codesign.cs → ...ks.Windows/Tasks/CodesignHotRestartApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Xamarin.iOS.Windows;

namespace Xamarin.iOS.HotRestart.Tasks {
public class Codesign : Task, ICancelableTask {
public class CodesignHotRestartApp : Task, ICancelableTask {
#region Inputs

[Required]
Expand Down
2 changes: 1 addition & 1 deletion ...Tasks.Windows/Tasks/CompileAppManifest.cs → ...ows/Tasks/CompileHotRestartAppManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#nullable enable

namespace Xamarin.iOS.HotRestart.Tasks {
public class CompileAppManifest : Task {
public class CompileHotRestartAppManifest : Task {
static readonly string [] IgnorePlistKeys = {
"XSAppIconAssets",
"CFBundleIconName",
Expand Down
0 ...ks.Windows/Tasks/DetectSigningIdentity.cs → .../Tasks/DetectHotRestartSigningIdentity.cs
View file
Open in desktop
File renamed without changes.
15 changes: 8 additions & 7 deletions msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileEntitlements" AssemblyFile="Xamarin.iOS.Tasks.dll" />
<UsingTask TaskName="Xamarin.iOS.Tasks.UnpackLibraryResources" AssemblyFile="Xamarin.iOS.Tasks.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.Codesign" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CodesignHotRestartApp" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CollectDynamicFrameworks" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CompileAppManifest" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.DetectSigningIdentity" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CompileHotRestartAppManifest" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.DetectHotRestartSigningIdentity" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.PrepareAppBundle" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.UnpackFrameworks" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />

Expand Down Expand Up @@ -35,7 +35,7 @@
<Target Name="_DetectHotRestartSigningIdentity" AfterTargets="_DetectAppManifest"
Condition="'$(_CanOutputAppBundle)' == 'true' And '$(IsHotRestartBuild)' == 'true' And '$(IsHotRestartEnvironmentReady)' == 'true'" >

<HotRestart.Tasks.DetectSigningIdentity
<DetectHotRestartSigningIdentity
Condition="'$(EnableCodeSigning)' != 'false'"
GenerateApplicationManifest="$(GenerateApplicationManifest)"
ApplicationId="$(ApplicationId)"
Expand All @@ -48,7 +48,8 @@
<Output TaskParameter="DetectedCodeSigningPath" PropertyName="_CodeSigningPath" />
<Output TaskParameter="DetectedProvisioningProfileId" PropertyName="_ProvisioningProfileId" />
<Output TaskParameter="DetectedProvisioningProfilePath" PropertyName="_ProvisioningProfilePath" />
</HotRestart.Tasks.DetectSigningIdentity>
</DetectHotRestartSigningIdentity>

</Target>

<Target Name="_CollectHotRestartBundleResources" Condition="'$(IsHotRestartBuild)' == 'true'">
Expand Down Expand Up @@ -191,7 +192,7 @@
Inputs="$(AppBundleManifest);$(HotRestartAppBundlePath)\Extracted"
Outputs="$(HotRestartSignedAppDir)$([System.IO.Path]::GetFileName('$(AppBundleManifest)'));$(HotRestartSignedAppDir)Extracted">

<HotRestart.Tasks.CompileAppManifest
<CompileHotRestartAppManifest
AppBundlePath="$(HotRestartAppBundlePath)"
AppManifestPath="$(AppBundleManifest)"
ApplicationTitle="$(ApplicationTitle)"/>
Expand Down Expand Up @@ -330,7 +331,7 @@
Inputs="@(_CodeSignHotRestartInputs)"
Outputs="@(_CodeSignHotRestartInputs -> '%(Outputs)')">

<HotRestart.Tasks.Codesign
<CodesignHotRestartApp
AppBundlePath="$(HotRestartAppBundlePath)"
BundleIdentifier="$(_BundleIdentifier)"
CodeSigningPath="$(_CodeSigningPath)"
Expand Down