Skip to content

Commit fb3a9e9

Browse files
committed
Update VS blueprint package to not include in the src zip .template.config directory now that it has been moved into the src. Also make sure any file-based blueprints are always excluded for the VS packaging.
1 parent a52359a commit fb3a9e9

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Blueprints/BlueprintPackager/BaseBlueprintPackager.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ protected IList<string> SearchForblueprintManifests()
4747
break;
4848
}
4949
}
50+
51+
// Skip blueprints that are file-based which are not compatible with Visual Studio.
52+
var parentDirectory = Directory.GetParent(possible).FullName;
53+
if (!Directory.GetFiles(parentDirectory, "*.csproj", SearchOption.AllDirectories).Any() && !Directory.GetFiles(parentDirectory, "*.fsproj", SearchOption.AllDirectories).Any())
54+
{
55+
include = false;
56+
}
57+
5058
if (include)
5159
{
5260
result.Add(possible);
@@ -56,4 +64,4 @@ protected IList<string> SearchForblueprintManifests()
5664
return result;
5765
}
5866
}
59-
}
67+
}

Blueprints/BlueprintPackager/Utilities.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.IO;
44
using System.IO.Compression;
@@ -31,7 +31,8 @@ public static void ZipCode(string sourceDirectory, string zipArchivePath)
3131
relativePath.StartsWith("obj/") ||
3232
relativePath.Contains("/obj/") ||
3333
relativePath.StartsWith(".vs/") ||
34-
relativePath.Contains("/.vs/"))
34+
relativePath.Contains("/.vs/") ||
35+
relativePath.Contains("/.template.config/"))
3536
continue;
3637

3738
var entry = archive.CreateEntry(relativePath);

0 commit comments

Comments
 (0)