Add initial support for both Debug and Release CoreCLR builds

Script/AtomicNET/AtomicNET/build.cmd

@@ -1,44 +1,44 @@
 
 csc /out:../../../Artifacts/AtomicNET/TPA/AtomicNETBootstrap.dll /nostdlib+ /noconfig /t:library ^
-/lib:../../../Submodules/CoreCLR/Windows/x64/;../../../Submodules/CoreCLR/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Collections.Concurrent.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Collections.dll ^
-/r:../../../Submodules/CoreCLR/Windows/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.Concurrent.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
 AtomicNETBootstrap/*.cs
 
 csc /out:../../../Artifacts/AtomicNET/AtomicNETEngine.dll /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/x64/;../../../Submodules/CoreCLR/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.IO.FileSystem.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/Windows/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.FileSystem.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/Atomic/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicNET/Managed/*.cs ^
 ../../../Build/Source/Generated/WINDOWS/CSharp/Packages/AtomicPlayer/Managed/*.cs ^
 AtomicNETEngine/*.cs
 
 csc /unsafe /out:../../../Artifacts/AtomicNET/AtomicNETTools.dll /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/x64/;../../../Submodules/CoreCLR/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Linq.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Reflection.Primitives.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Reflection.Metadata.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Collections.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Collections.Immutable.dll ^
-/r:../../../Submodules/CoreCLR/Windows/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Linq.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Reflection.Primitives.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Reflection.Metadata.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Collections.Immutable.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 AtomicNETTools/*.cs
 
 csc /out:C:/Dev/atomic/AtomicExamples/AtomicNET/Basic3D/Resources/Assemblies/AtomicNETTest.dll ^
 /debug+ /nostdlib+ /noconfig /t:library /w:0 ^
-/lib:../../../Submodules/CoreCLR/Windows/x64/;../../../Submodules/CoreCLR/AnyCPU/TPA/ ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.Runtime.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.IO.dll ^
-/r:../../../Submodules/CoreCLR/AnyCPU/TPA/System.IO.FileSystem.dll ^
-/r:../../../Submodules/CoreCLR/Windows/x64/mscorlib.dll ^
+/lib:../../../Submodules/CoreCLR/Windows/Debug/x64/;../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/ ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.Runtime.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/System.IO.FileSystem.dll ^
+/r:../../../Submodules/CoreCLR/Windows/Debug/x64/mscorlib.dll ^
 /r:../../../Artifacts/AtomicNET/AtomicNETEngine.dll ^
 ../AtomicNETTest/MyClass.cs

Source/AtomicEditor/Application/AEEditorCommon.cpp

@@ -76,11 +76,12 @@ void AEEditorCommon::Setup()
 
 #ifdef ATOMIC_DEV_BUILD
 
-#ifdef ATOMIC_PLATFORM_WINDOWS
-    String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/Windows/x64/", ATOMIC_ROOT_SOURCE_DIR));
     String  assemblyLoadPaths = GetNativePath(ToString("%s/Artifacts/AtomicNET/", ATOMIC_ROOT_SOURCE_DIR));
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/Windows/Debug/x64/", ATOMIC_ROOT_SOURCE_DIR));
 #else
-    String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/OSX/x64/", ATOMIC_ROOT_SOURCE_DIR);
+    String  coreCLRAbsPath = GetNativePath(ToString("%s/Submodules/CoreCLR/OSX/Debug/x64/", ATOMIC_ROOT_SOURCE_DIR);
 #endif
 
 #else

Source/AtomicNET/NETCore/Platforms/Windows/NETHostWindows.cpp

@@ -415,8 +415,7 @@ bool NETHostWindows::GenerateTPAList()
     AddFilesFromDirectoryToTPAList(WString(coreCLRFilesAbsPath_).CString(), rgTPAExtensions, _countof(rgTPAExtensions));
 
 #ifdef ATOMIC_DEV_BUILD
-
-    WString  tpaAbsPath(GetNativePath(ToString("%s/Submodules/CoreCLR/AnyCPU/TPA/", ATOMIC_ROOT_SOURCE_DIR)));
+    WString  tpaAbsPath(GetNativePath(ToString("%s/Submodules/CoreCLR/Windows/Debug/AnyCPU/TPA/", ATOMIC_ROOT_SOURCE_DIR)));
     WString  atomicTPAAbsPath(GetNativePath(ToString("%s/Artifacts/AtomicNET/TPA/", ATOMIC_ROOT_SOURCE_DIR)));
 #else
     assert(0);