Fixes #11

hvanbakel · Jun 8, 2017 · 0beb8d4 · 0beb8d4
1 parent b13dcda
commit 0beb8d4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Project2015To2017/Definition/Project.cs b/Project2015To2017/Definition/Project.cs
@@ -11,6 +11,7 @@ internal sealed class Project
  public IReadOnlyList<XElement> ItemsToInclude { get; internal set; }
  public PackageConfiguration PackageConfiguration { get; internal set; }
  public AssemblyAttributes AssemblyAttributes { get; internal set; }
+ public IReadOnlyList<XElement> ConditionalPropertyGroups { get; internal set; }
 
  public IReadOnlyList<string> TargetFrameworks { get; internal set; }
  public ApplicationType Type { get; internal set; }

diff --git a/Project2015To2017/FileTransformation.cs b/Project2015To2017/FileTransformation.cs
@@ -56,7 +56,6 @@ private static IReadOnlyList<XElement> FindNonWildcardMatchedFiles(
  var includeAttribute = compiledFile.Attribute("Include");
  if (includeAttribute != null)
  {
- Console.WriteLine(includeAttribute.Value);
  if (!Path.GetFullPath(Path.Combine(projectFolder.FullName, includeAttribute.Value)).StartsWith(projectFolder.FullName))
  {
  Console.WriteLine($"Include cannot be done through wildcard, adding as separate include {compiledFile.ToString()}.");
@@ -72,7 +71,6 @@ private static IReadOnlyList<XElement> FindNonWildcardMatchedFiles(
  var dependentUpon = compiledFile.Element(elementName.Namespace + "DependentUpon");
  if (dependentUpon != null && dependentUpon.Value.EndsWith(".resx", StringComparison.OrdinalIgnoreCase))
  {
- Console.WriteLine("Found resx generatedcode file.");
  // resx generated code file
  manualIncludes.Add(new XElement(
  "Compile",
@@ -114,11 +112,7 @@ private static IReadOnlyList<XElement> FindNonWildcardMatchedFiles(
  continue;
  }
 
- Console.WriteLine($"File found which was not included, will now create exclude for {nonListedFile}.");
-
- manualIncludes.Add(new XElement(
- "Compile",
- new XAttribute("Exclude", nonListedFile.Substring(projectFolder.FullName.Length))));
+ Console.WriteLine($"File found which was not included, consider removing {nonListedFile}.");
  }
 
  foreach (var fileNotOnDisk in knownFullPaths.Except(filesInFolder).Where(x => x.StartsWith(projectFolder.FullName, StringComparison.OrdinalIgnoreCase)))

diff --git a/Project2015To2017/ProjectPropertiesTransformation.cs b/Project2015To2017/ProjectPropertiesTransformation.cs
@@ -26,6 +26,7 @@ public Task TransformAsync(XDocument projectFile, DirectoryInfo projectFolder, P
  ? ApplicationType.TestProject
  : ToApplicationType(propertyGroups.Elements(nsSys + "OutputType").FirstOrDefault()?.Value);
  definition.TargetFrameworks = new[] { ToTargetFramework(targetFramework) };
+ definition.ConditionalPropertyGroups = propertyGroups.Where(x => x.Attribute("Condition") != null).ToArray();
 
  if (definition.Type == ApplicationType.Unkown)
  {

diff --git a/Project2015To2017/Writing/ProjectWriter.cs b/Project2015To2017/Writing/ProjectWriter.cs
@@ -17,6 +17,11 @@ public void Write(Project project, FileInfo outputFile)
 
  projectNode.Add(GetMainPropertyGroup(project, outputFile));
 
+ if (project.ConditionalPropertyGroups != null)
+ {
+ projectNode.Add(project.ConditionalPropertyGroups.Select(RemoveAllNamespaces));
+ }
+
  if (project.ProjectReferences?.Count > 0)
  {
  var itemGroup = new XElement("ItemGroup");