backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Reduced the amount warnings that appear when a ContentProject is loaded.

Browse Source
This commit is contained in:
Konstantin Koch 2015-10-24 18:58:08 +02:00
parent 6f1b068bf5
commit 4381ef7c82
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Visual Studio/ANXVisualStudioPackage/Nodes/ContentProjectReferenceContainer.cs
View File

@ -278,7 +278,20 @@ namespace ANX.Framework.VisualStudio.Nodes
foreach (var referenceEntry in allReferences) foreach (var referenceEntry in allReferences)
{ {
if (referenceEntry.AssemblyName != null && referenceEntry.AssemblyName.FullName == assemblyName.FullName && File.Exists(referenceEntry.Url)) if (referenceEntry.AssemblyName == null || !File.Exists(referenceEntry.Url))
continue;
//Strong assembly name, try to do an exact match for these.
//If it hasn't a strong name, just match assemblies with the same name and don't care about the version.
if (referenceEntry.AssemblyName.GetPublicKey() != null)
{
if (referenceEntry.AssemblyName.FullName == assemblyName.FullName)
{
assemblyIdentifier = referenceEntry.Url;
break;
}
}
else if (referenceEntry.AssemblyName.Name == assemblyName.Name)
{ {
assemblyIdentifier = referenceEntry.Url; assemblyIdentifier = referenceEntry.Url;
break; break;
@ -291,9 +304,6 @@ namespace ANX.Framework.VisualStudio.Nodes
assemblyNamesAndPaths[name] = path; assemblyNamesAndPaths[name] = path;
} }
var callback = new LoadAssembliesCallback(this);
buildDomain.Proxy.LoadProjectAssemblies(assemblyNamesAndPaths.Values, buildDomain.SearchPaths, buildDomain.Redirects, callback.ErrorCallback);
} }
catch (Exception exc) catch (Exception exc)
{ {
@ -301,6 +311,17 @@ namespace ANX.Framework.VisualStudio.Nodes
Console.WriteLine(exc.Message); Console.WriteLine(exc.Message);
} }
} }
try
{
var callback = new LoadAssembliesCallback(this);
buildDomain.Proxy.LoadProjectAssemblies(assemblyNamesAndPaths.Values, buildDomain.SearchPaths, buildDomain.Redirects, callback.ErrorCallback);
}
catch (Exception exc)
{
Debugger.Break();
Console.WriteLine(exc.Message);
}
} }
}); });
} }