mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2412 from schellap/fxpresvc

Browse source 
FX Servicing and Prerelease Roll Forward Policy
This commit is contained in:
Senthil 2016-04-12 13:28:35 -07:00
commit aed81d43db
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/corehost/cli/deps_resolver.cpp
View file

@ -194,11 +194,13 @@ void deps_resolver_t::setup_probe_config(
if (pal::directory_exists(ext_ni)) if (pal::directory_exists(ext_ni))
{ {
// Servicing NI probe. // Servicing NI probe.
m_probes.push_back(probe_config_t::svc_ni(ext_ni, init.patch_roll_forward, init.prerelease_roll_forward)); m_probes.push_back(probe_config_t::svc_ni(ext_ni, false, false));
} }
// Servicing normal probe. // Servicing normal probe.
m_probes.push_back(probe_config_t::svc(args.dotnet_extensions, init.patch_roll_forward, init.prerelease_roll_forward)); pal::string_t msil = args.dotnet_extensions;
append_path(&msil, _X("msil"));
m_probes.push_back(probe_config_t::svc(msil, false, false));
} }
if (pal::directory_exists(args.dotnet_packages_cache)) if (pal::directory_exists(args.dotnet_packages_cache))

1
src/corehost/cli/fxr/fx_muxer.cpp
View file

@ -73,6 +73,7 @@ pal::string_t fx_muxer_t::resolve_fx_dir(const pal::string_t& muxer_dir, runtime
ver.is_prerelease() && // prevent roll forward to production. ver.is_prerelease() && // prevent roll forward to production.
ver.get_major() == specified.get_major() && ver.get_major() == specified.get_major() &&
ver.get_minor() == specified.get_minor() && ver.get_minor() == specified.get_minor() &&
ver.get_patch() == specified.get_patch() &&
ver > specified) ver > specified)
{ {
// Pick the smallest prerelease that is greater than specified. // Pick the smallest prerelease that is greater than specified.