continue;
}
- Log.LogMessage (MessageImportance.Low, "Primary Reference {0}", item.ItemSpec);
+ LogWithPrecedingNewLine (MessageImportance.Low, "Primary Reference {0}", item.ItemSpec);
ResolvedReference resolved_ref = ResolveReference (item, searchPaths, true);
if (resolved_ref == null) {
Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
- assembly_resolver.LogSearchLoggerMessages ();
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
} else {
+ if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
+
Log.LogMessage (MessageImportance.Low,
"\tReference {0} resolved to {1}. CopyLocal = {2}",
item.ItemSpec, resolved_ref.TaskItem,
resolved = assembly_resolver.ResolveGacReference (item, specific_version);
} else if (String.Compare (spath, "{RawFileName}") == 0) {
//FIXME: identify assembly names, as extract the name, and try with that?
- AssemblyName aname = assembly_resolver.GetAssemblyNameFromFile (item.ItemSpec);
- if (aname != null)
+ AssemblyName aname;
+ if (assembly_resolver.TryGetAssemblyNameFromFile (item.ItemSpec, out aname))
resolved = assembly_resolver.GetResolvedReference (item, item.ItemSpec, aname, true,
SearchPath.RawFileName);
} else if (String.Compare (spath, "{CandidateAssemblyFiles}") == 0) {
assembly_resolver.ResetSearchLogger ();
if (!File.Exists (item.ItemSpec)) {
- Log.LogMessage (MessageImportance.Low,
+ LogWithPrecedingNewLine (MessageImportance.Low,
"Primary Reference from AssemblyFiles {0}, file not found. Ignoring",
item.ItemSpec);
continue;
}
- Log.LogMessage (MessageImportance.Low, "Primary Reference from AssemblyFiles {0}", item.ItemSpec);
+ LogWithPrecedingNewLine (MessageImportance.Low, "Primary Reference from AssemblyFiles {0}", item.ItemSpec);
string copy_local;
- AssemblyName aname = assembly_resolver.GetAssemblyNameFromFile (item.ItemSpec);
- if (aname == null) {
+ AssemblyName aname;
+ if (!assembly_resolver.TryGetAssemblyNameFromFile (item.ItemSpec, out aname)) {
Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
- assembly_resolver.LogSearchLoggerMessages ();
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
continue;
}
+ if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
+
ResolvedReference rr = assembly_resolver.GetResolvedReference (item, item.ItemSpec, aname, true,
SearchPath.RawFileName);
copy_local = rr.CopyLocal.ToString ();
if (TryGetResolvedReferenceByAssemblyName (aname, false, out resolved_ref))
return resolved_ref;
- Log.LogMessage (MessageImportance.Low, "Dependency {0}", aname);
+ LogWithPrecedingNewLine (MessageImportance.Low, "Dependency {0}", aname);
Log.LogMessage (MessageImportance.Low, "\tRequired by {0}", parent_asm_name);
ITaskItem item = new TaskItem (aname.FullName);
resolved_ref = ResolveReference (item, dependency_search_paths, false);
if (resolved_ref != null) {
+ if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
+
Log.LogMessage (MessageImportance.Low, "\tReference {0} resolved to {1}.",
aname, resolved_ref.TaskItem.ItemSpec);
}
} else {
Log.LogWarning ("Reference '{0}' not resolved", aname);
- assembly_resolver.LogSearchLoggerMessages ();
+ assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
}
return resolved_ref;
return true;
}
+ void LogWithPrecedingNewLine (MessageImportance importance, string format, params object [] args)
+ {
+ Log.LogMessage (importance, String.Empty);
+ Log.LogMessage (importance, format, args);
+ }
+
// conflict b/w @main and @conflicting, picking @main
void LogConflictWarning (string main, string conflicting)
{
public ITaskItem[] SuggestedRedirects {
get { return suggestedRedirects; }
}
-
+
+#if NET_4_0
+ public string TargetFrameworkMoniker { get; set; }
+
+ public string TargetFrameworkMonikerDisplayName { get; set; }
+#endif
+
+ public string TargetFrameworkVersion { get; set; }
+
public string[] TargetFrameworkDirectories {
get { return targetFrameworkDirectories; }
set { targetFrameworkDirectories = value; }
set { targetProcessorArchitecture = value; }
}
+
static Dictionary<string, string> cultureNamesTable;
static Dictionary<string, string> CultureNamesTable {
get {