From 46736e2100e863b30fb8fa239c92afd29e2fa102 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 18:05:39 -0400 Subject: [PATCH 1/6] Bump problematic NuGet packages On my machine, the old versions caused strange errors, complaining of non-overridden abstract methods (I think). Works now, though. --- .../NuGet.Packaging.VisualStudio.15.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj index fa17573..bebc720 100644 --- a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj +++ b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj @@ -58,8 +58,8 @@ - - + + From 909f43d64bf2e77f576e2e4a80bb98b2e7321190 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 19:19:14 -0400 Subject: [PATCH 2/6] Stop the build from stepping on its own toes This line caused every NuGet.Build.Packages.Tasks build after the first to fail, because it deleted the files needed to build the package a second time. --- src/Directory.Build.targets | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index d7eaa61..3252b5f 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,4 +1,4 @@ - + @@ -60,8 +60,6 @@ AssemblyVersion=$(AssemblyVersion)" /> - - From 71d5894360c13a37fadac5faa721ff50b42233c2 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 19:38:49 -0400 Subject: [PATCH 3/6] Rearrange project file imports This changes fixes an issue where the PackOnBuild property is not respected, because the BuildDependsOn property is set too soon, and is then overwritten with the default values in MSBuild. This only affects projects build as part of this solution. --- src/Directory.Build.targets | 2 ++ src/NuGet.Build.Packaging.Shared.targets | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 3252b5f..a08ef27 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -69,4 +69,6 @@ AssemblyVersion=$(AssemblyVersion)" /> + + \ No newline at end of file diff --git a/src/NuGet.Build.Packaging.Shared.targets b/src/NuGet.Build.Packaging.Shared.targets index 16884df..eeb7a7c 100644 --- a/src/NuGet.Build.Packaging.Shared.targets +++ b/src/NuGet.Build.Packaging.Shared.targets @@ -7,8 +7,6 @@ - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true From 7989aa33799b300bc2d601e76994410a5356e8e4 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 19:39:50 -0400 Subject: [PATCH 4/6] Move msbuild.rsp properties into csproj --- .../NuGet.Build.Packaging.Tasks.csproj | 3 +++ src/Build/msbuild.rsp | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 src/Build/msbuild.rsp diff --git a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj index e35818e..68cd42c 100644 --- a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj +++ b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj @@ -4,6 +4,9 @@ {A3D231D7-31E4-4A70-8CD1-7246C7D069F6} net46 NO-SDK-PACK + + true + $(Out) diff --git a/src/Build/msbuild.rsp b/src/Build/msbuild.rsp deleted file mode 100644 index 20e4484..0000000 --- a/src/Build/msbuild.rsp +++ /dev/null @@ -1,2 +0,0 @@ -/p:PackOnBuild=true -/p:PackageOutputPath=..\..\..\out \ No newline at end of file From f6acb275553c30da6a1561bf7c83725685fddfe2 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 19:52:19 -0400 Subject: [PATCH 5/6] Bump more NuGet packages This change is an addendum to 46736e2, which started failing again for some strange reason. VSLangProj150 was not bumped, because doing so caused class-not-found compilation errors. --- .../NuGet.Packaging.VisualStudio.15.csproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj index bebc720..dc36b15 100644 --- a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj +++ b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj @@ -44,20 +44,20 @@ - - + + - + - - + + - - - + + + - + From bfc62c9dc0cfddc22f2d3cb28e9f7f2eda8143b7 Mon Sep 17 00:00:00 2001 From: William Kent Date: Fri, 29 Jun 2018 21:39:42 -0400 Subject: [PATCH 6/6] Revert "Move msbuild.rsp properties into csproj" @kzu disagreed with me on whether or not this change was desirable. Since he's the maintainer, his judgment takes precedence. This reverts commit 7989aa33799b300bc2d601e76994410a5356e8e4. --- .../NuGet.Build.Packaging.Tasks.csproj | 3 --- src/Build/msbuild.rsp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/Build/msbuild.rsp diff --git a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj index 68cd42c..e35818e 100644 --- a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj +++ b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj @@ -4,9 +4,6 @@ {A3D231D7-31E4-4A70-8CD1-7246C7D069F6} net46 NO-SDK-PACK - - true - $(Out) diff --git a/src/Build/msbuild.rsp b/src/Build/msbuild.rsp new file mode 100644 index 0000000..20e4484 --- /dev/null +++ b/src/Build/msbuild.rsp @@ -0,0 +1,2 @@ +/p:PackOnBuild=true +/p:PackageOutputPath=..\..\..\out \ No newline at end of file