huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify the 'InstallLocation' registry key. (#7877) 

Before = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>\sdk
After = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>
This commit is contained in:
John Beisner 2019-02-25 11:05:00 -08:00 committed by Pavel Krymets
parent 23c528c176
commit f0cb6cc68b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp
View File

@ -264,11 +264,11 @@ HostFxrResolver::GetAbsolutePathToDotnet(
if (isWow64Process) if (isWow64Process)
{ {
regKeySubSection = L"SOFTWARE\\WOW6432Node\\dotnet\\Setup\\InstalledVersions\\x64\\sdk"; regKeySubSection = L"SOFTWARE\\WOW6432Node\\dotnet\\Setup\\InstalledVersions\\x64";
} }
else else
{ {
regKeySubSection = L"SOFTWARE\\dotnet\\Setup\\InstalledVersions\\x86\\sdk"; regKeySubSection = L"SOFTWARE\\dotnet\\Setup\\InstalledVersions\\x86";
} }
const auto installationLocation = RegistryKey::TryGetString( const auto installationLocation = RegistryKey::TryGetString(

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
View File

@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
var installDir = DotNetCommands.GetDotNetInstallDir(runtimeArchitecture); var installDir = DotNetCommands.GetDotNetInstallDir(runtimeArchitecture);
using (new TestRegistryKey( using (new TestRegistryKey(
localMachine, localMachine,
"SOFTWARE\\dotnet\\Setup\\InstalledVersions\\" + runtimeArchitecture + "\\sdk", "SOFTWARE\\dotnet\\Setup\\InstalledVersions\\" + runtimeArchitecture,
"InstallLocation", "InstallLocation",
installDir)) installDir))
{ {