diff --git a/.editorconfig b/.editorconfig index 8ee3e16..29161ea 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ end_of_line = lf insert_final_newline = true indent_style = tab -[*.sln] +[*.{sign-file-list,sln}] end_of_line = crlf # Visual Studio demands 2-spaced project files diff --git a/.gitattributes b/.gitattributes index e0606f4..bc1fa32 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ *.csproj text merge=union *.ico binary *.resx text merge=union +*.sign-file-list eol=crlf *.sln text eol=crlf merge=union *.snk binary *.vbproj text merge=union diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.sign-file-list b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.sign-file-list new file mode 100644 index 0000000..5c2c097 --- /dev/null +++ b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.sign-file-list @@ -0,0 +1,2 @@ +build\net462\xunit.runner.visualstudio.testadapter.dll +build\net6.0\xunit.runner.visualstudio.testadapter.dll diff --git a/tools/builder/common b/tools/builder/common index 46185ff..ad8cf65 160000 --- a/tools/builder/common +++ b/tools/builder/common @@ -1 +1 @@ -Subproject commit 46185ff648e231ae79df8df1cf9a8cdc3359c69c +Subproject commit ad8cf655e07ef0dfbf8c0d1f44c2157f4b165572 diff --git a/tools/builder/targets/Packages.cs b/tools/builder/targets/Packages.cs index d2ab11d..c6eb6bd 100644 --- a/tools/builder/targets/Packages.cs +++ b/tools/builder/targets/Packages.cs @@ -1,3 +1,4 @@ +using System.IO; using System.Threading.Tasks; using Xunit.BuildTools.Models; @@ -11,5 +12,10 @@ public static async Task OnExecute(BuildContext context) var packArgs = $"pack --nologo --no-build --configuration {context.ConfigurationText} --output {context.PackageOutputFolder} --verbosity {context.Verbosity} src/xunit.runner.visualstudio -p:NuspecFile=xunit.runner.visualstudio.nuspec"; await context.Exec("dotnet", packArgs); + + File.Copy( + Path.Join(context.BaseFolder, "src", "xunit.runner.visualstudio", "xunit.runner.visualstudio.sign-file-list"), + Path.Join(context.PackageOutputFolder, "xunit.runner.visualstudio.sign-file-list") + ); } }