diff --git a/src/mono/mono.proj b/src/mono/mono.proj index e9ec6b553db24b..14cdecb05e6e10 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -8,9 +8,9 @@ $(MonoObjDir)llvm dotnet.exe dotnet - ..\..\.dotnet + $(RepoRoot).dotnet $(LocalDotnetDir)\$(DotNetExec) - ..\..\.dotnet-mono + $(RepoRoot).dotnet-mono $(LocalMonoDotnetDir)\$(DotNetExec) .cmd .sh @@ -119,30 +119,42 @@ - - + + - <_LocalDotnetFiles Include="$(LocalDotnetDir)\**\*.*" /> <_MonoRuntimeArtifacts Include="$(BinDir)\*.*" /> + + + + + + + + <_LocalDotnetFiles Include="$(LocalDotnetDir)\**\*.*" /> + - + + + + + - - - <_MonoRuntimeArtifacts Include="$(BinDir)\*.*" /> - - - + + $(CoreClrTestCoreRoot) + + diff --git a/src/mono/msvc/mono.props b/src/mono/msvc/mono.props index d9f6af48dc0276..7fc8a626ec6f4d 100644 --- a/src/mono/msvc/mono.props +++ b/src/mono/msvc/mono.props @@ -28,7 +28,8 @@ false - false + true + false .. diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile index c612b364b0ffc1..b1c5e993acc0fc 100644 --- a/src/mono/netcore/Makefile +++ b/src/mono/netcore/Makefile @@ -36,6 +36,10 @@ runtime: patch-mono-dotnet: $(DOTNET) msbuild /t:PatchLocalMonoDotnet $(MONO_PROJ) +# copy mono runtime bits from artifacts to $(DST) +copy-runtime-files-to: + $(DOTNET) msbuild /t:CopyMonoRuntimeFilesFromArtifactsToDestination /p:Destination=$(DST) $(MONO_PROJ) + # run specific coreclr test, e.g.: # make run-tests-coreclr CoreClrTest="bash ../../artifacts/tests/coreclr/OSX.x64.Release/JIT/opt/InstructionCombining/DivToMul/DivToMul.sh" run-tests-coreclr: