* Update environment variables

* Fix json snippet

* Fix text formats
This commit is contained in:
Next Turn 2019-02-19 00:08:50 +08:00 коммит произвёл Vitek Karas
Родитель 978e297157
Коммит 6d5e4a7932
1 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -123,9 +123,9 @@ The runtimeconfig.json will have a new `frameworks` array section that allows mo
},
{
"name": "Microsoft.Forms",
"version": "3.0.0"
"rollForwardOnNoCandidateFx" : 1
"applyPatches" : true
"version": "3.0.0",
"rollForwardOnNoCandidateFx": 1,
"applyPatches": true
}
]
}
@ -222,9 +222,9 @@ In addition to searching the executable directory, the global .NET location is a
Global .NET location:
Windows 32-bit: %SystemDrive%\Program Files\dotnet
Windows 64-bit (32-bit application): %SystemDrive%\Program Files (x86)\dotnet
Windows 64-bit (64-bit application): %SystemDrive%\Program Files\dotnet
Windows 32-bit: %ProgramFiles%\dotnet
Windows 64-bit (32-bit application): %ProgramFiles(x86)%\dotnet
Windows 64-bit (64-bit application): %ProgramFiles%\dotnet
Unix: none
OSX: none
@ -239,12 +239,12 @@ Default installation location. In certain cases when a framework-dependent appho
Using the specified version from the `--fx-version` argument or from the runtimeconfig.json file, the search is conducted as follows:
1. Use the first of following locations to determine the most appropriate version:
1. Use the first of following locations to determine the most appropriate version:
- If the muxer (e.g. dotnet.exe) use the directory of the muxer that is being executed.
- For 2.1+, if the apphost (e.g. myapp.exe) use the environment variable %DOTNET_ROOT% (empty by default)
- For 2.1+, if the apphost and %DOTNET_ROOT% is empty, use the `Default installation location`.
2. Obtain the most appropriate version from the `Global .NET location` and compare it agaist the most appropriate version from the first step. Select the most appropriate version from the two locations. If a compatible framework cannot be found, then an error will be displayed.
2. Obtain the most appropriate version from the `Global .NET location` and compare it agaist the most appropriate version from the first step. Select the most appropriate version from the two locations. If a compatible framework cannot be found, then an error will be displayed.
Determine the most appropriate version varies for release (production) and pre-release versions.
- For releases: