Browse Source

Fix bugs in SolutionLoader that were introduced with the Deploy.0 flag.

pull/32/merge
Daniel Grunwald 13 years ago
parent
commit
d779caaf9e
  1. 1132
      SharpDevelop.Tests.sln
  2. 818
      SharpDevelop.sln
  3. 2
      src/Main/Base/Project/Project/Configuration/ConfigurationMapping.cs
  4. 1
      src/Main/SharpDevelop/Project/SolutionLoader.cs

1132
SharpDevelop.Tests.sln

File diff suppressed because it is too large Load Diff

818
SharpDevelop.sln

File diff suppressed because it is too large Load Diff

2
src/Main/Base/Project/Project/Configuration/ConfigurationMapping.cs

@ -112,7 +112,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -112,7 +112,7 @@ namespace ICSharpCode.SharpDevelop.Project
lock (dict) {
Entry entry;
if (dict.TryGetValue(solutionConfiguration, out entry)) {
return entry.Build;
return entry.Deploy;
} else {
return false;
}

1
src/Main/SharpDevelop/Project/SolutionLoader.cs

@ -301,6 +301,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -301,6 +301,7 @@ namespace ICSharpCode.SharpDevelop.Project
if (!projectInfoDict.TryGetValue(guid, out projectInfo))
continue;
if (pair.Key.EndsWith(".Build.0", StringComparison.OrdinalIgnoreCase)) {
projectInfo.ConfigurationMapping.SetBuildEnabled(solutionConfig, true);
} else if (pair.Key.EndsWith(".Deploy.0", StringComparison.OrdinalIgnoreCase)) {
projectInfo.ConfigurationMapping.SetDeployEnabled(solutionConfig, true);
}

Loading…
Cancel
Save