Browse Source

Fixed null reference when compiling IronPython projects or projects that explicitly do not reference mscorlib.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5862 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Matt Ward 15 years ago
parent
commit
eeb136c17e
  1. 13
      src/Libraries/ICSharpCode.Build.Tasks/Project/CopyLocalWorkaround.cs

13
src/Libraries/ICSharpCode.Build.Tasks/Project/CopyLocalWorkaround.cs

@ -23,7 +23,6 @@ namespace ICSharpCode.Build.Tasks
[Output] [Output]
public ITaskItem[] OutputAssemblies { get; set; } public ITaskItem[] OutputAssemblies { get; set; }
public ITaskItem[] AssemblyFiles { get; set; } public ITaskItem[] AssemblyFiles { get; set; }
[Output] [Output]
@ -52,11 +51,13 @@ namespace ICSharpCode.Build.Tasks
// mark mscorlib as copy local=false // mark mscorlib as copy local=false
List<ITaskItem> outputAssemblyFiles = new List<ITaskItem>(); List<ITaskItem> outputAssemblyFiles = new List<ITaskItem>();
foreach (ITaskItem item in this.AssemblyFiles) { if (this.AssemblyFiles != null) {
if (string.IsNullOrEmpty(item.GetMetadata("Private"))) { foreach (ITaskItem item in this.AssemblyFiles) {
if (item.ItemSpec.EndsWith("\\mscorlib.dll", StringComparison.OrdinalIgnoreCase)) { if (string.IsNullOrEmpty(item.GetMetadata("Private"))) {
item.SetMetadata("Private", "False"); if (item.ItemSpec.EndsWith("\\mscorlib.dll", StringComparison.OrdinalIgnoreCase)) {
outputAssemblyFiles.Add(item); item.SetMetadata("Private", "False");
outputAssemblyFiles.Add(item);
}
} }
} }
} }

Loading…
Cancel
Save