From c786d39abeea38532c6811bcf2edc42138cf324f Mon Sep 17 00:00:00 2001 From: Samuel Bronson Date: Thu, 1 Apr 2021 22:53:04 -0400 Subject: [PATCH 1/3] Add global MSBuild files to solution items --- src/Greenshot.sln | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Greenshot.sln b/src/Greenshot.sln index ad1a7ee86..581044043 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -46,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig ..\azure-pipelines.yml = ..\azure-pipelines.yml + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject Global From 9be9e5bac10c8336e272f3c9fa823cf303c0fdc5 Mon Sep 17 00:00:00 2001 From: Samuel Bronson Date: Thu, 1 Apr 2021 22:56:09 -0400 Subject: [PATCH 2/3] Replace XCOPY kludge with a wildcard ProjectReference --- src/Directory.Build.props | 12 ------------ src/Greenshot/Greenshot.csproj | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 77faddc33..cbc66cbe0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -107,16 +107,4 @@ - - - - diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 39fd2fb5c..73f69aa3c 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -38,6 +38,7 @@ + From 68c72e5d8c3584ae7c191bbab22c28231c68bf2d Mon Sep 17 00:00:00 2001 From: Samuel Bronson Date: Thu, 1 Apr 2021 23:05:12 -0400 Subject: [PATCH 3/3] Workaround a project system regression Apparently, this project system was never taught to copy PDB and XML documentation files alongside the DLL they go with. We'll have to do it ourselves for now. For details, see: * https://github.com/dotnet/sdk/issues/1458 * https://github.com/NuGet/Home/issues/5926 --- src/Directory.Build.targets | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index f2ce406a1..d845ebb73 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -10,4 +10,16 @@ + + + + + + + + \ No newline at end of file