Skip to content

Commit

Permalink
Replace path for mscorlib.pe (#288)
Browse files Browse the repository at this point in the history
- now using the one from the official distribution from the test app

Signed-off-by: José Simões <[email protected]>
  • Loading branch information
josesimoes authored May 4, 2017
1 parent 183e97a commit d218bae
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions targets/os/win32/nanoCLR/CLRStartup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,15 @@ struct Settings
vec.push_back(L"..\\netnf\\TestApplication\\bin\\Release\\TestApplication.pe");
#endif

vec.push_back(L"-load");
vec.push_back(L"C:\\Program Files (x86)\\Microsoft .NET Micro Framework\\v4.4\\Assemblies\\le\\mscorlib.pe");

vec.push_back(L"-load");
vec.push_back(L"C:\\Program Files (x86)\\Microsoft .NET Micro Framework\\v4.4\\Assemblies\\le\\Microsoft.SPOT.Native.pe");
// grab mscorlib.pe from the packages folder (it has to be there because the NF.TestApplication has just build)
// ************************************************************************* //
// just need to update the path on the package folder as the version changes //
// ************************************************************************* //
vec.push_back(L"-load");
vec.push_back(L"..\\packages\\nanoFramework.CoreLibrary.1.0.0-preview011\\build\\mscorlib.pe");

//vec.push_back(L"-load");
//vec.push_back(L"C:\\Program Files (x86)\\Microsoft .NET Micro Framework\\v4.4\\Assemblies\\le\\Microsoft.SPOT.Native.pe");

//wchar_t* pContext = NULL;
//wchar_t* pch = wcstok_s(emulatorArgs, L" ", &pContext); // UNDONE: FIXME: wcstok_s(this->m_clrOptions.EmulatorArgs, L" ", &pContext);
Expand Down

0 comments on commit d218bae

Please sign in to comment.