Browse Source

Fixed exception when importing VS.NET project without ".user" file.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@514 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
ec3966a4ea
  1. 10
      src/Main/Base/Project/Src/Project/Converter/PrjxToSolutionProject.cs

10
src/Main/Base/Project/Src/Project/Converter/PrjxToSolutionProject.cs

@ -228,14 +228,18 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
string oldUserFile = fileName + ".user.old"; string oldUserFile = fileName + ".user.old";
File.Copy(fileName, old, true); File.Copy(fileName, old, true);
File.Delete(fileName); File.Delete(fileName);
File.Copy(userFile, oldUserFile, true); if (File.Exists(userFile)) {
File.Delete(userFile); File.Copy(userFile, oldUserFile, true);
File.Delete(userFile);
}
Conversion conversion = new Conversion(); Conversion conversion = new Conversion();
if (Path.GetExtension(fileName).ToLower() == ".vbproj") if (Path.GetExtension(fileName).ToLower() == ".vbproj")
conversion.IsVisualBasic = true; conversion.IsVisualBasic = true;
Solution.ReadSolutionInformation(Solution.SolutionBeingLoaded.FileName, conversion); Solution.ReadSolutionInformation(Solution.SolutionBeingLoaded.FileName, conversion);
RunConverter(old, fileName, "vsnet2msbuild.xsl", conversion); RunConverter(old, fileName, "vsnet2msbuild.xsl", conversion);
RunConverter(oldUserFile, userFile, "vsnet2msbuild_user.xsl", conversion); if (File.Exists(oldUserFile)) {
RunConverter(oldUserFile, userFile, "vsnet2msbuild_user.xsl", conversion);
}
} }
} }
} }

Loading…
Cancel
Save