Rename klr to dotnet #1087
Rename klr to dotnet #1087
Conversation
|
Keep the |
|
@ChengTian as part of this change lets also make the "run" command implicit.
Should just execute without requiring a command called run. |
|
We should also try out the new code path in the makefile:
|
| EndProject | ||
| Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet.hosting.shared", "src\dotnet.hosting.shared\dotnet.hosting.shared.kproj", "{FE569E9D-AAAE-43CE-BE29-2C2197C0DF8F}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet.net45.managed", "src\dotnet.net45.managed\dotnet.net45.managed.csproj", "{48CC04A6-169E-4DF5-AC70-11DD6C4F0143}" |
There was a problem hiding this comment.
curious: why can't this be a .kproj anymore?
There was a problem hiding this comment.
why can't this
be ause the .kproj anymore?
both exist but it's not clear why
There was a problem hiding this comment.
Looks like a bug. Anything managed should be kproj. Anything else is native
| @@ -136,7 +136,13 @@ HMODULE LoadCoreClr() | |||
| errno_t errno = 0; | |||
| bool fSuccess = true; | |||
| TCHAR szKreTrace[1] = {}; | |||
| bool m_fVerboseTrace = GetEnvironmentVariableW(L"KRE_TRACE", szKreTrace, 1) > 0; | |||
| // TODO: remove KRE_ env var | |||
| DWORD dwRet = GetEnvironmentVariableW(L"DOTNET_TRACE", szKreTrace, 1); | |||
|
One big thing missed is the renaming of the nuspec files that actually create the KRE. Replace KRE with dotnet in the nuspec files and ids. |
| @@ -268,15 +269,15 @@ var RC_FILES = '${FindAllFiles("Resource.rc", "klr", "klr.net45", "klr.core45")} | |||
| { | |||
| var kreName = Path.GetFileNameWithoutExtension(nupkgPath); | |||
| var krePath = Path.Combine(TEST_RESULTS, "KRE", kreName); | |||
| Environment.SetEnvironmentVariable("K_APPBASE", helloWorld); | |||
| Environment.SetEnvironmentVariable("DOTNET_APPBASE", helloWorld); | |||
There was a problem hiding this comment.
We shouldn't have to set this anymore
ChengTian
force-pushed
the
rename-klr-to-dotnet
branch
from
d3787be to
1698e09
Compare
|
Rebased and fixed naming (using runtime instead of dotnet) |
ChengTian
force-pushed
the
rename-klr-to-dotnet
branch
from
1698e09 to
ac31bbc
Compare
|
Some variables are stilling using the term |
|
@davidfowl @muratg , please check the two new commits |
| <version>0.0.1-pre</version> | ||
| <authors>Microsoft</authors> | ||
| <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
| <description>The K Runtime Environment for Desktop CLR x86</description> | ||
| <description>The .NET Runtime Environment for Mono on OSX</description> |
There was a problem hiding this comment.
Just "for Mono" I think. It's the same package on Linux/BSD/OSX/etc. because we don't have a native host for Mono, we boot straight to managed code. It could even run on Mono for Windows (kinda)
|
Thanks for @anurse 's feedbacks. Fixed in the latest commit. |
| @@ -14,4 +14,9 @@ | |||
| <SchemaVersion>2.0</SchemaVersion> | |||
| </PropertyGroup> | |||
| <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" /> | |||
| </Project> | |||
| <ProjectExtensions> | |||
There was a problem hiding this comment.
Undo. 2 more files that appear after this have the same issue.
|
Looking ok to me |
- Rename klr to dotnet - Support both DOTNET_ and KRE_ prefixed env vars - Simplify dotnet usage in kpm - Change HelloWorld tests to use dotnet in order to test new code path - Rename runtime packages, add OS name to runtime package names - Fix coreclr/dotnet crash when no --appbase is given - Rename kre prefixes to dotnet in web.config - Rename variables based on runtime renaming - Rename runtime home structure from .kre/packages to .dotnet/runtimes - Try %userprofile% before global installation path when search for runtime during kpm pack
ChengTian
force-pushed
the
rename-klr-to-dotnet
branch
from
9e35219 to
aa9704d
Compare
parent #1086
./build verifypassed