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] Add support for .xcframework #10046

Merged
merged 24 commits into from Nov 30, 2020
Merged

[msbuild] Add support for .xcframework #10046

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
856d099
[msbuild] Add support for `.xcframework`
Nov 4, 2020
ad8d0bd
Test can be run from multiple places, let's be precise
Nov 5, 2020
dfdd67c
Merge branch 'main' into xcframework
Nov 11, 2020
b01b757
Add test case (and some code to make it run)
Nov 11, 2020
7b08f69
Merge branch 'main' into xcframework
Nov 19, 2020
01f02cd
Move logic into msbuild, remove/minimize changes to tools
Nov 19, 2020
b912c94
Re-enable/fix the framework sidecar support
Nov 20, 2020
8f55090
[tests] Copy new .plist into app bundle
Nov 20, 2020
7630451
Fix dependencies and set a correct default arch for tvOS simulators
Nov 20, 2020
6fedf6e
Merge branch 'main' into xcframework
Nov 24, 2020
80f3300
[tests] Build XTest.xcframework with a x86_64 slice for watchOS
Nov 24, 2020
59a5bb5
Only process the .[xc]framework inside the task, let the target deal …
Nov 25, 2020
3380ae5
Fix unrequired rebuild (NativeReference being a directory needs extra…
Nov 25, 2020
8d43752
Revert part of last change, it's needed when NoEmbedding is false
Nov 26, 2020
2d8982f
Merge branch 'main' into xcframework
Nov 26, 2020
c7e5bb4
Apply feedback
Nov 26, 2020
1dfb1b9
Move xcframework XI tests into iOS subdir
Nov 26, 2020
de355b9
Add macOS tests for xcframework
Nov 26, 2020
e52b16e
xcframework use 'macos' not 'osx' like other parts of the native tool…
Nov 26, 2020
799bab7
Fix XM
Nov 26, 2020
3a29e58
Fix tvOS and watchOS tests (modified from iOS csproj)
Nov 26, 2020
7159bcd
[tests] Simplify creation of a test xcframework.
rolfbjarne Nov 27, 2020
87c19d1
Apply feedback: Not needed (not sure why it was at one point but test…
Nov 27, 2020
b172d3a
Add dylib support (used with macOS)
Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/MSBStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
View file
Open in desktop
Expand Up @@ -823,7 +823,17 @@
<value>The {0} SDK version '{1}' is not installed. Using newer version '{2}' instead'.
</value>
</data>


<data name="E0174" xml:space="preserve">
<value>{0} has an incorrect or unknown format and cannot be processed.
</value>
</data>

<data name="E0175" xml:space="preserve">
<value>No matching framework found inside '{0}'.
</value>
</data>

<data name="E7001" xml:space="preserve">
<value>Could not resolve host IPs for WiFi debugger settings.
</value>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.cs.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.de.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.es.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.fr.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.it.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.ja.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.ko.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.pl.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.pt-BR.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.ru.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.tr.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.zh-Hans.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
14 changes: 14 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/xlf/MSBStrings.zh-Hant.xlf
View file
Open in desktop
Expand Up @@ -663,6 +663,20 @@
</target>
<note />
</trans-unit>
<trans-unit id="E0174">
<source>{0} has an incorrect or unknown format and cannot be processed.
</source>
<target state="new">{0} has an incorrect or unknown format and cannot be processed.
</target>
<note />
</trans-unit>
<trans-unit id="E0175">
<source>No matching framework found inside '{0}'.
</source>
<target state="new">No matching framework found inside '{0}'.
</target>
<note />
</trans-unit>
<trans-unit id="E7001">
<source>Could not resolve host IPs for WiFi debugger settings.
</source>
Expand Down
9 changes: 7 additions & 2 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.targets
View file
Open in desktop
Expand Up @@ -226,8 +226,13 @@ Copyright (C) 2014 Xamarin. All rights reserved.

<Target Name="_CompileToNative" DependsOnTargets="$(CompileToNativeDependsOn)"
Condition = "'$(_UsingXamarinSdk)' != 'true'"
Inputs="@(_CompileToNativeInput);@(_FrameworkNativeReference);@(_FileNativeReference);@(BundleDependentFiles)"
Inputs="@(_CompileToNativeInput);@(_FileNativeReference);@(BundleDependentFiles)"
Outputs="$(_AppBundlePath)Contents\MacOS\$(_AppBundleName)">

<ItemGroup>
<_FrameworkNativeReference Include="@(_FrameworkNativeReference -> '%(Identity)/%(Filename)')" Condition="'%(Extension)' == '.framework' Or '%(Extension)' == '.xcframework'" />
</ItemGroup>

<Mmp
Condition="'$(IsMacEnabled)' == 'true'"
SessionId="$(BuildSessionId)"
Expand All @@ -246,7 +251,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
I18n="$(I18n)"
Profiling="$(Profiling)"
ExtraArgs="$(_BundlerArguments)"
NativeReferences="@(NativeReference)"
NativeReferences="@(NativeReference);@(_FrameworkNativeReference);@(_FileNativeReference)"
References="@(ReferencePath);@(MmpReferencePath)"
ResponseFilePath="$(IntermediateOutputPath)response-file.rsp"
SdkRoot="$(_SdkDevPath)"
Expand Down
2 changes: 2 additions & 0 deletions msbuild/Xamarin.MacDev.Tasks.Core/Properties/AssemblyInfo.cs
View file
Open in desktop
Expand Up @@ -50,3 +50,5 @@
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]

[assembly: InternalsVisibleTo ("Xamarin.MacDev.Tasks.Tests")]