diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 944688f50c6c62..be21dbbb891514 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -296,7 +296,7 @@ - + @@ -330,8 +330,8 @@ - - + + @@ -629,9 +629,9 @@ - + - + - - - $([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)')) - - - - - - diff --git a/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets b/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets new file mode 100644 index 00000000000000..1bfe6b140f2ca5 --- /dev/null +++ b/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets @@ -0,0 +1,17 @@ + + + + + $([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)')) + + + + + + + diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props index ba3ff16ac72337..f798429007f348 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.props +++ b/src/mono/msbuild/apple/build/AppleBuild.props @@ -9,6 +9,24 @@ true + + true + macho + + + + + + + + + + $(AfterMicrosoftNETSdkTargets);$(Crossgen2SdkOverrideTargetsPath) + $(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.ReadyToRun.targets + + true $(TargetOS)-$(TargetArchitecture.ToLowerInvariant()) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 667fcc709e9010..bc6143fe28ea18 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -26,24 +26,11 @@ Publish - - true - macho - - - - - - - $(Crossgen2SdkOverrideTargetsPath) - $(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets - diff --git a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props index 680be4c0f552e9..efef1f3e3a4010 100644 --- a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props +++ b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/Program.cs b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/Program.cs similarity index 100% rename from src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/Program.cs rename to src/tests/FunctionalTests/iOS/Simulator/CoreCLR/Program.cs diff --git a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj similarity index 76% rename from src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj rename to src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj index 23315975066cd6..072f8102f157b8 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj @@ -7,15 +7,11 @@ true $(NetCoreAppCurrent) iossimulator - iOS.Simulator.CoreCLR.Interpreter.Test.dll + iOS.CoreCLR.Interpreter.Test.dll false 42 - - - - diff --git a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj new file mode 100644 index 00000000000000..7afa3b15947766 --- /dev/null +++ b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj @@ -0,0 +1,19 @@ + + + Exe + false + false + false + true + $(NetCoreAppCurrent) + iossimulator + iOS.CoreCLR.R2R.Test.dll + false + 42 + true + + + + + +