Skip to content

Commit

Permalink
[dotnet] Only validate the RuntimeIdentifier if we need/use it. Fixes #…
Browse files Browse the repository at this point in the history 
…13482. (#14339)

Fixes #13482.
  • Loading branch information
@rolfbjarne
rolfbjarne authored Mar 9, 2022
1 parent f248e9f commit bb655a3
Show file tree
Hide file tree
Showing 27 changed files with 158 additions and 2 deletions.
5 changes: 4 additions & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@
<!-- MSBuild will discard the 'PublishFolderType' metadata on items unless we set these properties -->
<MSBuildDisableGetCopyToOutputDirectoryItemsOptimization>true</MSBuildDisableGetCopyToOutputDirectoryItemsOptimization>
<MSBuildDisableGetCopyToPublishDirectoryItemsOptimization>true</MSBuildDisableGetCopyToPublishDirectoryItemsOptimization>

<!-- Do we need a RuntimeIdentifier? For apps and app extensions we do -->
<_RuntimeIdentifierIsRequired Condition="'$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true'">true</_RuntimeIdentifierIsRequired>
</PropertyGroup>

<!-- Set the default RuntimeIdentifier if not already specified. -->
<PropertyGroup Condition=" ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true') And '$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifiers)' == '' ">
<PropertyGroup Condition="'$(_RuntimeIdentifierIsRequired)' == 'true' And '$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifiers)' == '' ">
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'iOS'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'tvOS'">tvossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'macOS'">osx-x64</RuntimeIdentifier>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@
</Target>

<Target Name="_ValidateRuntimeIdentifier"
Condition="'$(RuntimeIdentifier)' != '' And '$(_RuntimeIdentifierValidation)' != 'false'"
Condition="'$(RuntimeIdentifier)' != '' And '$(_RuntimeIdentifierValidation)' != 'false' And '$(_RuntimeIdentifierIsRequired)' == 'true'"
BeforeTargets="Restore;Build;ResolvedFrameworkReference;ResolveRuntimePackAssets;ProcessFrameworkReferences">
<PropertyGroup>
<_IsValidRuntimeIdentifier Condition="@(_XamarinValidRuntimeIdentifier->WithMetadataValue('Platform', '$(_PlatformName)')->WithMetadataValue('Filename', '$(RuntimeIdentifier)')->Count()) &gt; 0">true</_IsValidRuntimeIdentifier>
Expand Down
19 changes: 19 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Runtime.InteropServices;

using Foundation;

namespace MySimpleApp
{
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;
}
}
}
13 changes: 13 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using System.Runtime.InteropServices;

namespace MySimpleApp
{
public class Program
{
public static int SomeFunction ()
{
return 42;
}
}
}
8 changes: 8 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/MacCatalyst/Library.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- The point is to have netstandard2.1 + another which isn't the TargetFramework we're building for -->
<TargetFrameworks>net6.0-macos;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/MacCatalyst/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
2 changes: 2 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TOP=../../../..
include $(TOP)/tests/common/shared-dotnet-test.mk
8 changes: 8 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/iOS/Library.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- The point is to have netstandard2.1 + another which isn't the TargetFramework we're building for -->
<TargetFrameworks>net6.0-macos;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/iOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 8 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/macOS/Library.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- The point is to have netstandard2.1 + another which isn't the TargetFramework we're building for -->
<TargetFrameworks>net6.0-ios;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/macOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
10 changes: 10 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/shared.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<Compile Include="../*.cs" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/shared.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TOP=../../../../..
include $(TOP)/tests/common/shared-dotnet.mk
8 changes: 8 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/tvOS/Library.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- The point is to have netstandard2.1 + another which isn't the TargetFramework we're building for -->
<TargetFrameworks>net6.0-macos;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Library/tvOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
7 changes: 7 additions & 0 deletions ...s/dotnet/AppWithGenericLibraryReference/MacCatalyst/AppWithGenericLibraryReference.csproj
View file
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>net6.0-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/MacCatalyst/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
2 changes: 2 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TOP=../../..
include $(TOP)/tests/common/shared-dotnet-test.mk
7 changes: 7 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/iOS/AppWithGenericLibraryReference.csproj
View file
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>net6.0-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/iOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
7 changes: 7 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/macOS/AppWithGenericLibraryReference.csproj
View file
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>net6.0-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/macOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
16 changes: 16 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/shared.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<OutputType>Exe</OutputType>

<ApplicationTitle>AppWithGenericLibraryReference</ApplicationTitle>
<ApplicationId>com.xamarin.appwithgenericlibraryreference</ApplicationId>
</PropertyGroup>

<Import Project="../../common/shared-dotnet.csproj" />

<ItemGroup>
<Compile Include="../*.cs" />
<ProjectReference Include="../Library/$(_PlatformName)/Library.csproj" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/shared.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TOP=../../../..
include $(TOP)/tests/common/shared-dotnet.mk
7 changes: 7 additions & 0 deletions tests/dotnet/AppWithGenericLibraryReference/tvOS/AppWithGenericLibraryReference.csproj
View file
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>net6.0-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/AppWithGenericLibraryReference/tvOS/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
19 changes: 19 additions & 0 deletions tests/dotnet/UnitTests/ProjectTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,5 +840,24 @@ public void BuildProjectsWithExtensions (ApplePlatform platform, string appPath)
var extensionPath = Path.Combine (Path.GetDirectoryName (consumingProjectDir)!, appPath);
Assert.That (Directory.Exists (extensionPath), $"App extension directory does not exist: {extensionPath}");
}

[TestCase (ApplePlatform.iOS, "iossimulator-x64;iossimulator-arm64")]
[TestCase (ApplePlatform.TVOS, "tvossimulator-x64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64")]
[TestCase (ApplePlatform.MacOSX, "osx-x64")]
[TestCase (ApplePlatform.MacOSX, "osx-arm64;osx-x64")]
public void AppWithGenericLibraryReference (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "AppWithGenericLibraryReference";
Configuration.IgnoreIfIgnoredPlatform (platform);

var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath);
Clean (project_path);

DotNet.AssertBuild (project_path, GetDefaultProperties (runtimeIdentifiers));

var appExecutable = GetNativeExecutable (platform, appPath);
ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);
}
}
}

1 comment on commit bb655a3

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Tests didn't execute on Build. ❌

Tests didn't execute on Build.

API diff

✅ API Diff from stable

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff

API Current PR diff

ℹ️ API Diff (from PR only) (please review changes)

View API diff
View dotnet API diff
View dotnet legacy API diff
View dotnet iOS-MacCatalayst API diff
  • ⚠️ Generator diff comments have not been provided.
    Path D:\a\1\s\artifacts\pkg-info\artifacts.json was not found!

No test summary was found (something probably failed before the tests could execute)

Pipeline on Agent
[dotnet] Only validate the RuntimeIdentifier if we need/use it. Fixes #13482. (#14339)

Please sign in to comment.