-
Notifications
You must be signed in to change notification settings - Fork 573
Expose application artifacts #25723
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.
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
Merged
Merged
Expose application artifacts #25723
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
7463e2e
Expose MaciOS artifact outputs
Redth 672e66c
Rename Apple artifact output items
Redth 4cb54a5
Split Apple package signing metadata
Redth 8298e84
Remove Apple package signing metadata
Redth d5e41ec
Remove Apple app bundle path metadata
Redth b0e26ef
Test Apple package output query target
Redth fc92ec2
Rename application artifact item group
Redth 4bd1e60
Make application artifact target extensible
Redth 2d01224
Strengthen application artifact extension test
Redth c92439d
Run artifact extensions during publish
Redth 778f75a
Merge branch 'main' into redth/apple-artifacts-plan
dalexsoto 390b162
Clarify artifact metadata extension guidance
Redth 576858c
Harden application artifact extension ordering
Redth 8beec2d
Use dotnet build artifact query examples
Redth 10ad74d
Merge main into apple artifacts plan
Redth 7b37b7e
Harden application artifact target graph
Redth 57a0455
Guard application artifact producer conditions
Redth 5c1a952
Simplify application artifact query target
Redth 73624bf
Merge branch 'main' into dev/redth/apple-artifacts-plan
dalexsoto c53752e
Merge branch 'main' into dev/redth/apple-artifacts-plan
dalexsoto 33fedd1
[tests] Address review feedback for application artifact tests
dalexsoto eebb829
[docs] Clarify GetApplicationArtifacts contract and query examples
dalexsoto 1c8dc7d
[msbuild] Make @(ApplicationArtifact) paths absolute and fix artifact…
dalexsoto e0d618e
[msbuild] Collect the Windows Pair-to-Mac .xcarchive after copy-back
dalexsoto c540b7e
[tests] Add Windows Pair-to-Mac @(ApplicationArtifact) tests
dalexsoto 9aabadf
[msbuild] Don't collect the .app artifact on remote Windows builds
dalexsoto 129743c
Merge branch 'main' into dev/redth/apple-artifacts-plan
dalexsoto ee63ecc
[msbuild] Fix app extensions not being embedded after adding @(Applic…
dalexsoto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
tests/dotnet/MySimpleAppWithArtifactMetadata/AppDelegate.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| using System; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| using Foundation; | ||
|
|
||
| namespace MySimpleAppWithArtifactMetadata { | ||
| public class Program { | ||
| static int Main (string [] args) | ||
| { | ||
| GC.KeepAlive (typeof (NSObject)); // prevent linking away the platform assembly | ||
|
|
||
| Console.WriteLine (Environment.GetEnvironmentVariable ("MAGIC_WORD")); | ||
|
|
||
| return args.Length; | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
tests/dotnet/MySimpleAppWithArtifactMetadata/MacCatalyst/Makefile
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include ../shared.mk |
7 changes: 7 additions & 0 deletions
7
...dotnet/MySimpleAppWithArtifactMetadata/MacCatalyst/MySimpleAppWithArtifactMetadata.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework> | ||
| </PropertyGroup> | ||
| <Import Project="..\shared.csproj" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| TOP=../../.. | ||
|
|
||
| include $(TOP)/tests/common/shared-dotnet-test.mk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include ../shared.mk |
7 changes: 7 additions & 0 deletions
7
tests/dotnet/MySimpleAppWithArtifactMetadata/iOS/MySimpleAppWithArtifactMetadata.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework> | ||
| </PropertyGroup> | ||
| <Import Project="..\shared.csproj" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include ../shared.mk |
7 changes: 7 additions & 0 deletions
7
tests/dotnet/MySimpleAppWithArtifactMetadata/macOS/MySimpleAppWithArtifactMetadata.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-macos</TargetFramework> | ||
| </PropertyGroup> | ||
| <Import Project="..\shared.csproj" /> | ||
| </Project> |
32 changes: 32 additions & 0 deletions
32
tests/dotnet/MySimpleAppWithArtifactMetadata/shared.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
|
|
||
| <ApplicationTitle>MySimpleAppWithArtifactMetadata</ApplicationTitle> | ||
| <ApplicationId>com.xamarin.mysimpleappwithartifactmetadata</ApplicationId> | ||
| <ApplicationVersion>3.14</ApplicationVersion> | ||
|
|
||
| <!-- Simulates an SDK (such as .NET MAUI) enriching the platform-produced @(ApplicationArtifact) items --> | ||
| <GetApplicationArtifactsDependsOn>$(GetApplicationArtifactsDependsOn);AddMauiApplicationArtifactMetadata</GetApplicationArtifactsDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="../../common/shared-dotnet.csproj" /> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="../*.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="AddMauiApplicationArtifactMetadata"> | ||
| <ItemGroup> | ||
| <_MauiObservedAppArtifact Include="@(ApplicationArtifact)" Condition="'%(ApplicationArtifact.PackageFormat)' == 'app'" /> | ||
| <_MauiObservedPackageArtifact Include="@(ApplicationArtifact)" Condition="'%(ApplicationArtifact.PackageFormat)' == '$(ExpectedAugmentedPackageFormat)'" /> | ||
| <ApplicationArtifact Update="@(ApplicationArtifact)"> | ||
| <ApplicationTitle>My MAUI App</ApplicationTitle> | ||
| <MauiObservedPackageFormat>%(ApplicationArtifact.PackageFormat)</MauiObservedPackageFormat> | ||
| </ApplicationArtifact> | ||
| </ItemGroup> | ||
| <Error Condition="'@(_MauiObservedAppArtifact)' == ''" Text="Expected app ApplicationArtifact items before MAUI metadata is added." /> | ||
| <Error Condition="'@(_MauiObservedPackageArtifact)' == ''" Text="Expected $(ExpectedAugmentedPackageFormat) ApplicationArtifact items before MAUI metadata is added." /> | ||
| </Target> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| TOP=../../../.. | ||
| TESTNAME=MySimpleAppWithArtifactMetadata | ||
| include $(TOP)/tests/common/shared-dotnet.mk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include ../shared.mk |
7 changes: 7 additions & 0 deletions
7
tests/dotnet/MySimpleAppWithArtifactMetadata/tvOS/MySimpleAppWithArtifactMetadata.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework> | ||
| </PropertyGroup> | ||
| <Import Project="..\shared.csproj" /> | ||
| </Project> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.