Skip to content

Commit

Permalink
More rename for simulator packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@spouliot
spouliot committed Apr 1, 2021
1 parent 33b50b3 commit fb8f5f7
Show file tree
Hide file tree
Showing 21 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<!-- Declare the XI/XM framework bundled with this version of the SDK. See Microsoft.NETCoreSdk.BundledVersions.props -->
<PropertyGroup>
<!-- Runtime pack identifiers -->
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'iOS' ">ios-x64;ios-arm64;ios-arm;ios-x86</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'tvOS' ">tvos-x64;tvos-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'iOS' ">iossimulator-x64;ios-arm64;ios-arm;iossimulator-x86</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'tvOS' ">tvossimulator-x64;tvos-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'watchOS' ">watchos-x86;watchos-x64;watchos-arm</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'macOS' ">osx-x64;osx-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'MacCatalyst' ">maccatalyst-x64;maccatalyst-arm64</_RuntimePackRuntimeIdentifiers>
Expand Down
2 changes: 1 addition & 1 deletion tests/common/TestProjects/MyTVApp/MyTVApp.dotnet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/common/TestProjects/MyTVMetalGame/MyTVMetalGame.dotnet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/common/TestProjects/MyTVServicesExtension/MyTVServicesExtension.dotnet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/dotnet/MyInterpretedApp/MyInterpretedApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<MtouchInterpreter>all</MtouchInterpreter>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/dotnet/MySingleView/MySingleView.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>

<ApplicationTitle>MySingleTitle</ApplicationTitle>
Expand Down
2 changes: 1 addition & 1 deletion tests/dotnet/MyTVApp/MyTVApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/dotnet/MyWatchApp/MyWatchContainer/MyWatchContainer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/dotnet/MyXamarinFormsApp/MyXamarinFormsApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/dotnet/UnitTests/ProjectTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void BuildMySingleView ()
Clean (project_path);
var result = DotNet.AssertBuild (project_path, verbosity);
AssertThatLinkerExecuted (result);
var appPath = Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-ios", "ios-x64", "MySingleView.app");
var appPath = Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-ios", "iossimulator-x64", "MySingleView.app");
AssertAppContents (platform, appPath);
var infoPlistPath = Path.Combine (appPath, "Info.plist");
var infoPlist = PDictionary.FromFile (infoPlistPath);
Expand Down Expand Up @@ -87,7 +87,7 @@ public void BuildMyTVApp ()
Clean (project_path);
var result = DotNet.AssertBuild (project_path, verbosity);
AssertThatLinkerExecuted (result);
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-tvos", "tvos-x64", "MyTVApp.app"));
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-tvos", "tvossimulator-x64", "MyTVApp.app"));
}

[Test]
Expand Down Expand Up @@ -360,7 +360,7 @@ public void BuildInterdependentBindingProjects (string platform)
}

[Test]
[TestCase ("ios-x64", false)]
[TestCase ("iossimulator-x64", false)]
[TestCase ("ios-arm64", true)]
public void IsNotMacBuild (string runtimeIdentifier, bool isDeviceBuild)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/interdependent-binding-projects/dotnet/iOS/interdependent-binding-projects.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
<RootTestsDirectory>..\..\..\</RootTestsDirectory>
<!-- This is needed because the packages/ directory might be in the same folder as this project file, and some some packages might have C# files, which would then automatically be included -->
Expand Down
2 changes: 1 addition & 1 deletion tests/interdependent-binding-projects/dotnet/tvOS/interdependent-binding-projects.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
<AssetTargetFallback>xamarintvos10;$(AssetTargetFallback)</AssetTargetFallback>
<RootTestsDirectory>..\..\..\</RootTestsDirectory>
<!-- This is needed because the packages/ directory might be in the same folder as this project file, and some some packages might have C# files, which would then automatically be included -->
Expand Down
2 changes: 1 addition & 1 deletion tests/introspection/dotnet/iOS/introspection.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/introspection/dotnet/tvOS/introspection.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<RuntimeIdentifier>tvossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/linker/ios/dont link/dotnet/iOS/dont link.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/linker/ios/link all/dotnet/iOS/link all.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET;$(DefineConstants)</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/linker/ios/link sdk/dotnet/iOS/link sdk.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>
<LangVersion>latest</LangVersion>
Expand Down
4 changes: 2 additions & 2 deletions tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/TestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ public ProjectPaths SetupProjectPaths (string project, bool? includePlatform = n
var isDevice = Platform == "iPhone";
switch (TargetFrameworkIdentifier) {
case "Xamarin.iOS":
subdir = isDevice ? "ios-arm64" : "ios-x64";
subdir = isDevice ? "ios-arm64" : "iossimulator-x64";
targetPlatformSuffix = "ios";
break;
case "Xamarin.TVOS":
subdir = isDevice ? "tvos-arm64" : "tvos-x64";
subdir = isDevice ? "tvos-arm64" : "tvossimulator-x64";
targetPlatformSuffix = "tvos";
break;
case "Xamarin.WatchOS":
Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/Targets/TVOSTarget.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ protected override bool SupportsBitcode {
}

public override string DotNetSdk => "Microsoft.tvOS.Sdk";
public override string RuntimeIdentifier => "tvos-x64";
public override string RuntimeIdentifier => "tvossimulator-x64";
public override DevicePlatform ApplePlatform => DevicePlatform.tvOS;
public override string TargetFramework => "net6.0-tvos";
public override string TargetFrameworkForNuGet => "xamarintvos10";
Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/Targets/UnifiedTarget.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected override bool SupportsBitcode {
}

public override string DotNetSdk => "Microsoft.iOS.Sdk";
public override string RuntimeIdentifier => "ios-x64";
public override string RuntimeIdentifier => "iossimulator-x64";
public override DevicePlatform ApplePlatform => DevicePlatform.iOS;
public override string TargetFramework => "net6.0-ios";
public override string TargetFrameworkForNuGet => "xamarinios10";
Expand Down

1 comment on commit fb8f5f7

@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.

❌ Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

Path D:\a\1\s\artifacts\pkg-info\artifacts.json was not found!

Test results

6 tests failed, 176 tests passed.

Failed tests

  • monotouch-test/iOS Unified 64-bits - simulator/Debug [dotnet]: Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk) [dotnet]: Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar) [dotnet]: Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations) [dotnet]: Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations) [dotnet]: Failed
  • MSBuild tests/Integration: Failed (Execution failed with exit code 28)

Pipeline on Agent XAMBOT-1025

Please sign in to comment.