提交 1320a6d5 编写于 作者: M Manish Vasani

Don't treat template generated files with assembly attributes as generated...

Don't treat template generated files with assembly attributes as generated code (e.g. AssemblyInfo.cs)

Fixes #4390
上级 71a48400
......@@ -585,7 +585,7 @@ class Program
Dim viewModel = GetViewModel(workspaceXml, LanguageNames.CSharp)
Dim expectedDocuments = {"Test1.cs", "Test2.cs", "Test3.cs"}
Dim expectedDocuments = {"Test1.cs", "Test2.cs", "AssemblyInfo.cs", "Test3.cs"}
Assert.Equal(expectedDocuments, viewModel.DocumentList.Select(Function(d) d.Document.Name).ToArray())
End Sub
......
......@@ -37,12 +37,10 @@ private static bool IsFileNameForGeneratedCode(string fileName)
{
fileName = Path.GetFileNameWithoutExtension(fileName);
if (fileName.EndsWith("AssemblyInfo", StringComparison.OrdinalIgnoreCase) ||
fileName.EndsWith(".designer", StringComparison.OrdinalIgnoreCase) ||
if (fileName.EndsWith(".designer", StringComparison.OrdinalIgnoreCase) ||
fileName.EndsWith(".generated", StringComparison.OrdinalIgnoreCase) ||
fileName.EndsWith(".g", StringComparison.OrdinalIgnoreCase) ||
fileName.EndsWith(".g.i", StringComparison.OrdinalIgnoreCase) ||
fileName.EndsWith(".AssemblyAttributes", StringComparison.OrdinalIgnoreCase))
fileName.EndsWith(".g.i", StringComparison.OrdinalIgnoreCase))
{
return true;
}
......
......@@ -16,6 +16,10 @@ public void TestFileNamesNotGenerated()
"Test",
"Test.cs",
"Test.vb",
"AssemblyInfo.cs",
"AssemblyInfo.vb",
".NETFramework,Version=v4.5.AssemblyAttributes.cs",
".NETFramework,Version=v4.5.AssemblyAttributes.vb",
"Test.notgenerated.cs",
"Test.notgenerated.vb",
"Test.generated",
......@@ -29,8 +33,6 @@ public void TestFileNamesGenerated()
"TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92",
"TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs",
"TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.vb",
"AssemblyInfo.cs",
"AssemblyInfo.vb",
"Test.designer.cs",
"Test.designer.vb",
"Test.Designer.cs",
......@@ -40,9 +42,7 @@ public void TestFileNamesGenerated()
"Test.g.cs",
"Test.g.vb",
"Test.g.i.cs",
"Test.g.i.vb",
".NETFramework,Version=v4.5.AssemblyAttributes.cs",
".NETFramework,Version=v4.5.AssemblyAttributes.vb");
"Test.g.i.vb");
}
private static void TestFileNames(bool assertGenerated, params string[] fileNames)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册