Scripts adjustments to reflect the changed paths

.gitignore

@@ -84,6 +84,9 @@ dlldata.c
 *.svclog
 *.scc
 
+# Special file
+!src/coreclr/.nuget/_.pdb
+
 # Chutzpah Test files
 _Chutzpah*
 
@@ -133,9 +136,6 @@ AutoTest.Net/
 # Web workbench (sass)
 .sass-cache/
 
-# BenchmarkDotNet
-BenchmarkDotNet.Artifacts/
-
 # Installshield output folder
 [Ee]xpress/
 
@@ -295,10 +295,10 @@ prime/
 stage/
 
 # CLR prebuilt generated files
-!src/pal/prebuilt/idl/*_i.c
+!pal/prebuilt/idl/*_i.c
 
 # Valid 'debug' folder, that contains CLR debugging code
-!src/debug
+!debug
 
 # Ignore folders created by the CLR test build
 TestWrappers_x64_[d|D]ebug
@@ -313,7 +313,6 @@ TestWrappers_arm_[r|R]elease
 TestWrappers_arm64_[d|D]ebug
 TestWrappers_arm64_[c|C]hecked
 TestWrappers_arm64_[r|R]elease
-tests/src/common/test_runtime/project.json
 
 Vagrantfile
 .vagrant
@@ -333,7 +332,7 @@ cross/android-rootfs/*
 *.pyc
 
 # JIT32 files
-src/jit32
+jit32
 
 # performance testing sandbox
 sandbox
@@ -344,17 +343,23 @@ linker
 # Symbolic link for the shared portion of CoreLib to make grep/findstr work for runtime devs
 #
 # On Windows, make your own by running these commands from the repo root:
-# mklink /D src\coreclr\src\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
-# mklink /D src\coreclr\src\System.Private.CoreLib\common %CD%\src\libraries\Common\src
+# mklink /D src\coreclr\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
+# mklink /D src\coreclr\System.Private.CoreLib\common %CD%\src\libraries\Common\src
 #
 # On Unix, make your own by running these commands from the repo root:
-# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/src/System.Private.CoreLib/shared
-# ln -s $(pwd)/src/libraries/Common/src src/coreclr/src/System.Private.CoreLib/common
-src/coreclr/src/System.Private.CoreLib/shared
-src/coreclr/src/System.Private.CoreLib/common
+# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/System.Private.CoreLib/shared
+# ln -s $(pwd)/src/libraries/Common/src src/coreclr/System.Private.CoreLib/common
+src/coreclr/System.Private.CoreLib/shared
+src/coreclr/System.Private.CoreLib/common
 
 # The debug directory should not be ignored
-!src/coreclr/src/debug
+!src/coreclr/debug
+
+# Exceptions to the exclusions
+!src/coreclr/.nuget/_.pdb
+!src/coreclr/inc/obj/
+!src/coreclr/vm/.vscode/
+!src/coreclr/vm/.vscode/c_cpp_properties.json
 
 # Mono Wasm-specific excludes
 src/mono/wasm/emsdk/

Directory.Build.props

@@ -47,7 +47,7 @@
 
     <!-- System.Private.CoreLib -->
     <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
-    <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
+    <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
     <CoreLibProject Condition="'$(RuntimeFlavor)' == 'Mono'">$([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'netcore', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
   </PropertyGroup>
 

eng/Subsets.props

@@ -136,12 +136,12 @@
 
   <!-- CoreClr sets -->
   <ItemGroup Condition="$(_subset.Contains('+clr.corelib+'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\System.Private.CoreLib\System.Private.CoreLib.csproj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)System.Private.CoreLib\System.Private.CoreLib.csproj" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'windows' and ($(_subset.Contains('+clr.dactools+')) or $(_subset.Contains('+clr.runtime+')))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\ToolBox\SOS\DacTableGen\DacTableGen.csproj;
-                             $(CoreClrProjectRoot)src\ToolBox\SOS\DIALib\DIALib.ilproj"
+    <ProjectToBuild Include="$(CoreClrProjectRoot)ToolBox\SOS\DacTableGen\DacTableGen.csproj;
+                             $(CoreClrProjectRoot)ToolBox\SOS\DIALib\DIALib.ilproj"
                     Category="clr"/>
   </ItemGroup>
 
@@ -166,7 +166,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.paltestlist+'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src/pal/tests/palsuite/producepaltestlist.proj" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)pal/tests/palsuite/producepaltestlist.proj" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+linuxdac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
@@ -178,17 +178,17 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+crossdacpack+'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\.nuget\Microsoft.CrossOsDiag.Private.CoreCLR\Microsoft.CrossOsDiag.Private.CoreCLR.proj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot).nuget\Microsoft.CrossOsDiag.Private.CoreCLR\Microsoft.CrossOsDiag.Private.CoreCLR.proj" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.tools+'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\runincontext\runincontext.csproj;
-                             $(CoreClrProjectRoot)src\tools\r2rdump\R2RDump.csproj;
-                             $(CoreClrProjectRoot)src\tools\dotnet-pgo\dotnet-pgo.csproj;
-                             $(CoreClrProjectRoot)src\tools\r2rtest\R2RTest.csproj;
-                             $(CoreClrProjectRoot)src\tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\runincontext\runincontext.csproj;
+                             $(CoreClrProjectRoot)tools\r2rdump\R2RDump.csproj;
+                             $(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj;
+                             $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj;
+                             $(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
 
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj"
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj"
       Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64'"/>
   </ItemGroup>
 
@@ -197,7 +197,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.packages+'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)src\.nuget\coreclr-packages.proj" Pack="true" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot).nuget\coreclr-packages.proj" Pack="true" Category="clr" />
   </ItemGroup>
 
   <!-- Mono sets -->

src/coreclr/CMakeLists.txt

@@ -19,11 +19,11 @@ endif (MSVC)
 
 # Set commonly used directory names
 set(CLR_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(VM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/vm)
-set(GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/inc)
+set(VM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vm)
+set(GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/inc)
 set(GENERATED_EVENTING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Eventing)
 set(VERSION_FILE_PATH "${CMAKE_BINARY_DIR}/version.c")
-set(PAL_REDEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/dlls/mscordac/palredefines.S)
+set(PAL_REDEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dlls/mscordac/palredefines.S)
 
 # Avoid logging when skipping up-to-date copies
 set(CMAKE_INSTALL_MESSAGE LAZY)
@@ -79,24 +79,24 @@ if(CLR_CMAKE_HOST_UNIX)
         endif()
     endif()
 
-    add_subdirectory(src/pal)
-    add_subdirectory(src/hosts)
+    add_subdirectory(pal)
+    add_subdirectory(hosts)
 else(CLR_CMAKE_HOST_UNIX)
     if(CLR_CMAKE_TARGET_UNIX)
-        add_subdirectory(src/pal/src/libunwind)
+        add_subdirectory(pal/src/libunwind)
     endif(CLR_CMAKE_TARGET_UNIX)
 endif(CLR_CMAKE_HOST_UNIX)
 
 # Add this subdir. We install the headers for the jit.
-add_subdirectory(src/pal/prebuilt/inc)
+add_subdirectory(pal/prebuilt/inc)
 
-add_subdirectory(src/debug/debug-pal)
+add_subdirectory(debug/debug-pal)
 
 if(CLR_CMAKE_TARGET_WIN32 AND CLR_CMAKE_BUILD_SUBSET_RUNTIME)
-  add_subdirectory(src/gc/sample)
+  add_subdirectory(gc/sample)
 endif()
 
-add_subdirectory(src/tools/aot/jitinterface)
+add_subdirectory(tools/aot/jitinterface)
 
 # Above projects do not build with these compile options
 # All of the compiler options are specified in file compileoptions.cmake
@@ -116,20 +116,20 @@ include(clrdefinitions.cmake)
 # Include directory directives
 #-------------------------------------
 # Include the basic prebuilt headers - required for getting fileversion resource details.
-include_directories("src/pal/prebuilt/inc")
+include_directories("pal/prebuilt/inc")
 include_directories("../../artifacts/obj/coreclr")
 
 if(FEATURE_STANDALONE_GC)
   add_definitions(-DFEATURE_STANDALONE_GC)
   if (CLR_CMAKE_BUILD_SUBSET_RUNTIME)
-    add_subdirectory(src/gc)
+    add_subdirectory(gc)
   endif (CLR_CMAKE_BUILD_SUBSET_RUNTIME)
 endif(FEATURE_STANDALONE_GC)
 
 if (CLR_CMAKE_HOST_UNIX)
-  include_directories("src/pal/inc")
-  include_directories("src/pal/inc/rt")
-  include_directories("src/pal/src/safecrt")
+  include_directories("pal/inc")
+  include_directories("pal/inc/rt")
+  include_directories("pal/src/safecrt")
 endif (CLR_CMAKE_HOST_UNIX)
 
 #------------------------------

src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -104,7 +104,7 @@
   </PropertyGroup>
 
   <!-- Compilation options -->
-  <Import Project="../../clr.featuredefines.props" />
+  <Import Project="../clr.featuredefines.props" />
 
   <!-- Sources -->
   <ItemGroup>
@@ -320,8 +320,8 @@
 
   <!-- Setup eventing file generation -->
   <ItemGroup>
-    <EventingGenerationScript Include="$(CoreClrProjectRoot)/src/scripts/genRuntimeEventSources.py" />
-    <EventManifestFile Include="$(CoreClrProjectRoot)/src/vm/ClrEtwAll.man" />
+    <EventingGenerationScript Include="$(CoreClrProjectRoot)scripts/genRuntimeEventSources.py" />
+    <EventManifestFile Include="$(CoreClrProjectRoot)vm/ClrEtwAll.man" />
     <EventingSourceFile Include="$(IntermediateOutputPath)..\..\..\Eventing\$(TargetArchitecture)\$(Configuration)\NativeRuntimeEventSource.CoreCLR.cs" Condition="'$(FeaturePerfTracing)' == 'true' ">
       <Link>src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.CoreCLR.cs</Link>
     </EventingSourceFile>

src/coreclr/build-runtime.cmd

@@ -364,7 +364,7 @@ REM === Restore optimization profile data
 REM ===
 REM =========================================================================================
 
-set OptDataProjectFilePath=%__ProjectDir%\src\.nuget\optdata\optdata.csproj
+set OptDataProjectFilePath=%__ProjectDir%\.nuget\optdata\optdata.csproj
 if %__RestoreOptData% EQU 1 (
     echo %__MsgPrefix%Restoring the OptimizationData Package
     set "__BinLog=\"%__LogsDir%\OptRestore_%__TargetOS%__%__BuildArch%__%__BuildType%.binlog\""

src/coreclr/build-runtime.sh

@@ -41,7 +41,7 @@ setup_dirs_local()
 
 restore_optdata()
 {
-    local OptDataProjectFilePath="$__ProjectRoot/src/.nuget/optdata/optdata.csproj"
+    local OptDataProjectFilePath="$__ProjectRoot/.nuget/optdata/optdata.csproj"
     if [[ "$__SkipRestoreOptData" == 0 && "$__IsMSBuildOnNETCoreSupported" == 1 ]]; then
         echo "Restoring the OptimizationData package"
         "$__RepoRootDir/eng/common/msbuild.sh" /clp:nosummary $__ArcadeScriptArgs \

src/coreclr/debug/createdump/CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include_directories(BEFORE ${VM_DIR})
 if(CLR_CMAKE_HOST_OSX)
-  include_directories(${CLR_DIR}/src/inc/llvm)
+  include_directories(${CLR_DIR}/inc/llvm)
 endif(CLR_CMAKE_HOST_OSX)
 
 remove_definitions(-DUNICODE)

src/coreclr/debug/daccess/CMakeLists.txt

@@ -3,9 +3,9 @@ add_definitions(-DFEATURE_NO_HOST)
 include_directories(BEFORE ${VM_DIR})
 include_directories(BEFORE ${VM_DIR}/${ARCH_SOURCES_DIR})
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CLR_DIR}/src/debug/ee)
-include_directories(${CLR_DIR}/src/gcdump)
-include_directories(${CLR_DIR}/src/interop/inc)
+include_directories(${CLR_DIR}/debug/ee)
+include_directories(${CLR_DIR}/gcdump)
+include_directories(${CLR_DIR}/interop/inc)
 
 if(CLR_CMAKE_HOST_UNIX)
   include_directories(${GENERATED_INCLUDE_DIR})
@@ -52,7 +52,7 @@ if(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_
     DEPENDS coreclr
     VERBATIM
     COMMAND_EXPAND_LISTS
-    COMMAND sh ${CLR_DIR}/src/pal/tools/gen-dactable-rva.sh ${args}
+    COMMAND sh ${CLR_DIR}/pal/tools/gen-dactable-rva.sh ${args}
     COMMENT Generating ${GENERATED_INCLUDE_DIR}/dactablerva.h
   )
 

src/coreclr/debug/dbgutil/CMakeLists.txt

@@ -6,7 +6,7 @@ if(CLR_CMAKE_HOST_WIN32)
 endif(CLR_CMAKE_HOST_WIN32)
 
 if(CLR_CMAKE_HOST_WIN32 OR CLR_CMAKE_HOST_OSX)
-  include_directories(${CLR_DIR}/src/inc/llvm)
+  include_directories(${CLR_DIR}/inc/llvm)
 endif(CLR_CMAKE_HOST_WIN32 OR CLR_CMAKE_HOST_OSX)
 
 add_definitions(-DPAL_STDCPP_COMPAT)

src/coreclr/dlls/dbgshim/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_definitions(-DFEATURE_NO_HOST)
 add_definitions(-DSELF_NO_HOST)
 
-include_directories(${CLR_DIR}/src/debug/shim)
+include_directories(${CLR_DIR}/debug/shim)
 
 set(DBGSHIM_SOURCES
     dbgshim.cpp

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

@@ -183,7 +183,7 @@ if(CLR_CMAKE_TARGET_WIN32)
     # Add dac table & debug resource to coreclr
     get_include_directories(INC_DIR)
     get_compile_definitions(PREPROCESS_DEFINITIONS)
-    list(APPEND INC_DIR -I${CLR_DIR}/src/vm -I${CLR_DIR}/src/vm/${ARCH_SOURCES_DIR} -I${CLR_DIR}/src/debug/ee -I${CLR_DIR}/src/gc)
+    list(APPEND INC_DIR -I${CLR_DIR}/vm -I${CLR_DIR}/vm/${ARCH_SOURCES_DIR} -I${CLR_DIR}/debug/ee -I${CLR_DIR}/gc)
     list(APPEND PREPROCESS_DEFINITIONS -DDACCESS_COMPILE -DTARGET_64BIT)
 
     if (CLR_CMAKE_HOST_ARCH_AMD64)
@@ -204,9 +204,9 @@ if(CLR_CMAKE_TARGET_WIN32)
     endif()
 
     add_custom_command(
-        DEPENDS coreclr mscordaccore mscordbi ${CLR_DIR}/src/debug/daccess/daccess.cpp
+        DEPENDS coreclr mscordaccore mscordbi ${CLR_DIR}/debug/daccess/daccess.cpp
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/inject_debug_resources.timestamp
-        COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TP ${PREPROCESS_DEFINITIONS} ${INC_DIR} /Fi${CMAKE_CURRENT_BINARY_DIR}/daccess.i  ${CLR_DIR}/src/debug/daccess/daccess.cpp
+        COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TP ${PREPROCESS_DEFINITIONS} ${INC_DIR} /Fi${CMAKE_CURRENT_BINARY_DIR}/daccess.i  ${CLR_DIR}/debug/daccess/daccess.cpp
         COMMAND cmd /c ${CLR_REPO_ROOT_DIR}/dotnet.cmd exec ${CMAKE_INSTALL_PREFIX}/DacTableGen/DacTableGen.dll /dac:${CMAKE_CURRENT_BINARY_DIR}/daccess.i /pdb:$<TARGET_PDB_FILE:coreclr> /dll:$<TARGET_FILE:coreclr> /bin:${CMAKE_CURRENT_BINARY_DIR}/wks.bin
         COMMAND InjectResource /bin:${CMAKE_CURRENT_BINARY_DIR}/wks.bin /dll:$<TARGET_FILE:coreclr>
         COMMAND GenClrDebugResource /dac:$<TARGET_FILE:mscordaccore> /dbi:$<TARGET_FILE:mscordbi> /sku:onecoreclr /out:${CMAKE_CURRENT_BINARY_DIR}/clrDebugResource.bin

src/coreclr/pal/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(COREPAL)
 
-include(../../clrfeatures.cmake)
+include(../clrfeatures.cmake)
 
 include_directories(${COREPAL_SOURCE_DIR}/inc)
 include_directories(${COREPAL_SOURCE_DIR}/src)

src/coreclr/pal/src/eventprovider/dummyprovider/CMakeLists.txt

@@ -1,6 +1,6 @@
 include(FindPythonInterp)
 
-set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genDummyProvider.py)
+set (GENERATE_SCRIPT ${CLR_DIR}/scripts/genDummyProvider.py)
 
 set(GENERATE_COMMAND ${PYTHON_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR})
 

src/coreclr/pal/src/eventprovider/lttngprovider/CMakeLists.txt

@@ -1,5 +1,5 @@
 include(FindPythonInterp)
-set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genLttngProvider.py)
+set (GENERATE_SCRIPT ${CLR_DIR}/scripts/genLttngProvider.py)
 
 set(GENERATE_COMMAND ${PYTHON_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR})
 

src/coreclr/pal/src/libunwind/src/CMakeLists.txt

@@ -342,7 +342,7 @@ else(CLR_CMAKE_HOST_UNIX)
         list(APPEND libunwind_setjmp_la_SOURCES     x86_64/longjmp.S x86_64/siglongjmp.SA)
     endif()
 
-    set_source_files_properties(${CLR_DIR}/src/pal/src/exception/remote-unwind.cpp PROPERTIES COMPILE_FLAGS /TP INCLUDE_DIRECTORIES ${CLR_DIR}/src/inc)
+    set_source_files_properties(${CLR_DIR}/pal/src/exception/remote-unwind.cpp PROPERTIES COMPILE_FLAGS /TP INCLUDE_DIRECTORIES ${CLR_DIR}/inc)
 
     add_library(libunwind_xdac
       OBJECT

src/coreclr/pal/tests/palsuite/eventprovider/CMakeLists.txt

@@ -4,7 +4,7 @@ set(SOURCES
 )
 
 set(EVENT_MANIFEST ${VM_DIR}/ClrEtwAll.man)
-set(TEST_GENERATOR ${CLR_DIR}/src/scripts/genEventingTests.py)
+set(TEST_GENERATOR ${CLR_DIR}/scripts/genEventingTests.py)
 
 include(FindPythonInterp)