From 622c3d4f28b2162c3580bf9690a4c6fc7241d039 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 22:53:26 +0200
Subject: [PATCH 1/9] Clarify the note to contributors in
 Sdk\PackageVersions.props

---
 src/Buildvana.Sdk/Sdk/PackageVersions.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Buildvana.Sdk/Sdk/PackageVersions.props b/src/Buildvana.Sdk/Sdk/PackageVersions.props
index 9c1177cd..5903810c 100644
--- a/src/Buildvana.Sdk/Sdk/PackageVersions.props
+++ b/src/Buildvana.Sdk/Sdk/PackageVersions.props
@@ -1,9 +1,9 @@
 <Project>
 
-  <!-- All versions of automatically added dependencies are grouped here for easier updating.
-       Please keep the versions below up-to-date with latest versions appearing on nuget.org.
-       If there is some compelling reason to NOT update one or more of this packages,
-       there MUST be a comment stating so. -->
+  <!-- All versions of automatically added dependencies are grouped here for easier updating. -->
+  <!-- NOTE TO CONTRIBUTORS: Please keep the versions below up-to-date with latest versions appearing on nuget.org.
+                             If there is some compelling reason to NOT update one or more of this packages,
+                             there MUST be a comment stating so. -->
   <ItemGroup>
     <PackageReference Update="JetBrains.Annotations" Version="2020.1.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" />

From fe884b4bc06fe79bde62067e53747d687c84c4b5 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 22:54:58 +0200
Subject: [PATCH 2/9] Remove redundant definition of UseJetBrainsAnnotations.

---
 .../Modules/JetBrainsAnnotations/Module.targets              | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets b/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
index 92ba3ec8..89835b67 100644
--- a/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
+++ b/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
@@ -1,10 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <UseJetBrainsAnnotations Condition="'$(UseJetBrainsAnnotations)' == ''">true</UseJetBrainsAnnotations>
-    <UseJetBrainsAnnotations Condition="'$(UseJetBrainsAnnotations)' != 'true'">false</UseJetBrainsAnnotations>
-  </PropertyGroup>
-
   <!-- Add ReSharper-related package references where appropriate. -->
   <ItemGroup Condition="$(UseJetBrainsAnnotations)">
     <PackageReference Include="JetBrains.Annotations"

From ed65887f1c0a8c6d00536598f1fec89d5a90fab6 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 22:56:14 +0200
Subject: [PATCH 3/9] Improve automatic discovery of license, thrid-paty
 notice, and package icon file.

---
 .../Modules/NuGetPack/Module.Core.targets     | 198 ++++++++++++++++--
 1 file changed, 186 insertions(+), 12 deletions(-)

diff --git a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
index 31b03ad8..aa8c2acb 100644
--- a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
+++ b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
@@ -55,12 +55,59 @@
       </ItemGroup>
     </When>
     <Otherwise>
+      <!-- Default license file can be one of (in order of discovery):
+             - LICENSE
+             - LICENSE.txt
+             - LICENSE.md
+             - License
+             - License.txt
+             - License.md
+             - license
+             - license.txt
+             - license.md
+             
+           Files found outside repository are ignored. -->
       <PropertyGroup>
         <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('LICENSE', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
-        <PackageLicensePath Condition="'$(PackageLicensePath)' == ''">$([MSBuild]::GetPathOfFileAbove('LICENSE.txt', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
-        <PackageLicensePath Condition="'$(PackageLicensePath)' == ''">$([MSBuild]::GetPathOfFileAbove('LICENSE.md', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
-        <PackageLicenseFile Condition="'$(PackageLicensePath)' != ''">$([System.IO.Path]::GetFileName('$(PackageLicensePath)'))</PackageLicenseFile>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
       </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('LICENSE.txt', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('LICENSE.md', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('License', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('License.txt', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('License.md', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('license', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('license.txt', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageLicensePath)' == ''">
+        <PackageLicensePath>$([MSBuild]::GetPathOfFileAbove('license.md', '$(MSBuildProjectDirectory)'))</PackageLicensePath>
+        <PackageLicensePath Condition="'$(PackageLicensePath)' != '' And !$(PackageLicensePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <!-- Use found filename to set PackageLicenseFile. -->
+      <PropertyGroup Condition="'$(PackageLicensePath)' != ''">
+        <PackageLicenseFile>$([System.IO.Path]::GetFileName('$(PackageLicensePath)'))</PackageLicenseFile>
+      </PropertyGroup>
+      <!-- Error if not found. -->
       <ItemGroup>
         <BV_EvaluationError Condition="'$(PackageLicensePath)' == ''"
                             Include="BVE1502"
@@ -124,12 +171,59 @@
       </ItemGroup>
     </When>
     <Otherwise>
+      <!-- Default third-party notice file can be one of (in order of discovery):
+             - THIRD-PARTY-NOTICES
+             - THIRD-PARTY-NOTICES.txt
+             - THIRD-PARTY-NOTICES.md
+             - third-party-notices
+             - third-party-notices.txt
+             - third-party-notices.md
+             - ThirdPartyNotices
+             - ThirdPartyNotices.txt
+             - ThirdPartyNotices.md
+             
+           Files found outside repository are ignored. -->
       <PropertyGroup>
-        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICE', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
-        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' == ''">$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICE.txt', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
-        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' == ''">$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICE.md', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
-        <PackageThirdPartyNoticeFile Condition="'$(PackageThirdPartyNoticePath)' != ''">$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticePath)'))</PackageThirdPartyNoticeFile>
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICES', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICES.txt', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('THIRD-PARTY-NOTICES.md', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('third-party-notices', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('third-party-notices.txt', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('third-party-notices.md', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('ThirdPartyNotices', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('ThirdPartyNotices.txt', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
       </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' == ''">
+        <PackageThirdPartyNoticePath>$([MSBuild]::GetPathOfFileAbove('ThirdPartyNotices.md', '$(MSBuildProjectDirectory)'))</PackageThirdPartyNoticePath>
+        <PackageThirdPartyNoticePath Condition="'$(PackageThirdPartyNoticePath)' != '' And !$(PackageThirdPartyNoticePath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <!-- Use found filename to set PackageThirdPartyNoticeFile. -->
+      <PropertyGroup Condition="'$(PackageThirdPartyNoticePath)' != ''">
+        <PackageThirdPartyNoticeFile>$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticePath)'))</PackageThirdPartyNoticeFile>
+      </PropertyGroup>
+      <!-- Error if not found. -->
       <ItemGroup>
         <BV_EvaluationError Condition="'$(PackageThirdPartyNoticePath)' == ''"
                             Include="BVE1505"
@@ -187,13 +281,93 @@
       </ItemGroup>
     </When>
     <Otherwise>
+      <!-- Default icon file can be one of (in order of discovery):
+             - <project_name>.package.png
+             - <project_name>.package.png in a "graphics" subfolder
+             - <project_name>.package.png in a "branding" subfolder
+             - <product_name>.package.png
+             - <product_name>.package.png in a "graphics" subfolder
+             - <product_name>.package.png in a "branding" subfolder
+             - PackageIcon.png
+             - PackageIcon.png in a "graphics" subfolder
+             - PackageIcon.png in a "branding" subfolder
+             - icon.png
+             - icon.png in a "graphics" subfolder
+             - icon.png in a "branding" subfolder
+             
+           Files found outside repository are ignored.
+             
+           To look for a file in a specific subfolder, since GetPathOfFileAbove only accepts filenames,
+           use GetDirectoryNameOfFileAbove and combine it with the searched-for subpath later if found. -->
       <PropertyGroup>
-        <PackageIconPath>$([MSBuild]::GetPathOfFileAbove('LICENSE', '$(MSBuildProjectDirectory)'))</PackageIconPath>
-        <PackageIconPath Condition="'$(PackageIconPath)' == ''">$([MSBuild]::GetPathOfFileAbove('icon.png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
-        <PackageIconPath Condition="'$(PackageIconPath)' == ''">$([MSBuild]::GetPathOfFileAbove('$(Product).png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
-        <PackageIconPath Condition="'$(PackageIconPath)' == ''">$([MSBuild]::GetPathOfFileAbove('$(MSBuildProjectName).png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
-        <PackageIcon Condition="'$(PackageIconPath)' != ''">$([System.IO.Path]::GetFileName('$(PackageIconPath)'))</PackageIcon>
+        <PackageIconPath>$([MSBuild]::GetPathOfFileAbove('$(MSBuildProjectName).package.png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>graphics/$(MSBuildProjectName).package.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>branding/$(MSBuildProjectName).package.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <PackageIconPath>$([MSBuild]::GetPathOfFileAbove('$(Product).package.png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>graphics/$(Product).package.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>branding/$(Product).package.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <PackageIconPath>$([MSBuild]::GetPathOfFileAbove('PackageIcon.png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>graphics/PackageIcon.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>branding/PackageIcon.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <PackageIconPath>$([MSBuild]::GetPathOfFileAbove('icon.png', '$(MSBuildProjectDirectory)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>graphics/icon.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(PackageIconPath)' == ''">
+        <BV_PackageIconSubPath>branding/icon.png</BV_PackageIconSubPath>
+        <BV_PackageIconDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildProjectDirectory)','$(BV_PackageIconSubPath)'))</BV_PackageIconDirectory>
+        <PackageIconPath Condition="'$(BV_PackageIconDirectory)' != ''">$([System.IO.Path]::Combine('$(BV_PackageIconDirectory)', '$(BV_PackageIconSubPath)'))</PackageIconPath>
+        <PackageIconPath Condition="'$(PackageIconPath)' != '' And !$(PackageIconPath.StartsWith('$(HomeDirectory)'))" />
+      </PropertyGroup>
+      <!-- Use found filename to set PackageIcon. -->
+      <PropertyGroup Condition="'$(PackageIconPath)' != ''">
+        <PackageIcon>$([System.IO.Path]::GetFileName('$(PackageIconPath)'))</PackageIcon>
       </PropertyGroup>
+      <!-- Error if not found. -->
       <ItemGroup>
         <BV_EvaluationError Condition="'$(PackageIconPath)' == ''"
                             Include="BVE1508"

From 700286d6d4884fd267f144978faae1cc8eab6289 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 22:57:05 +0200
Subject: [PATCH 4/9] [ADD] Support for .nuspec file alongside project.

---
 .../Modules/NuGetPack/Module.Core.targets     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
index aa8c2acb..0a433e15 100644
--- a/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
+++ b/src/Buildvana.Sdk/Modules/NuGetPack/Module.Core.targets
@@ -384,4 +384,48 @@
 
   <!-- ===================================================================================== -->
 
+  <!-- Automatically use a <project_name>.nuspec file if present alongside the project file. -->
+  <PropertyGroup Condition="'$(NuspecFile)' == ''">
+    <NuspecFile Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec')">$(MSBuildProjectName).nuspec</NuspecFile>
+  </PropertyGroup>
+
+  <!-- Set NuspecProperties if there is a .nuspec file to use. -->
+  <PropertyGroup Condition="'$(NuspecFile)' != ''">
+    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);BV_SetNuspecProperties</GenerateNuspecDependsOn>
+  </PropertyGroup>
+
+  <Target Name="BV_SetNuspecProperties">
+
+    <PropertyGroup>
+      <!-- Reset 'SourceRevisionId' to default value when not set -->
+      <SourceRevisionId Condition="'$(SourceRevisionId)' == ''">0</SourceRevisionId>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <NuspecProperties>
+        id=$(PackageId);
+        title=$(Title);
+        version=$(PackageVersion);
+        summary=$(Summary);
+        description=$(Description);
+        owners=$(Owners.Replace(';',','));
+        authors=$(Authors.Replace(';',','));
+        copyright=$(Copyright);
+        tags=$(PackageTags.Replace(';',','));
+        repositoryType=$(RepositoryType);
+        repositoryUrl=$(RepositoryUrl);
+        projectUrl=$(PackageProjectUrl);
+        licenseFile=$(PackageLicenseFile);
+        icon=$([System.IO.Path]::GetFileName('$(PackageIcon)'));
+        requireLicenseAcceptance=$(PackageRequireLicenseAcceptance);
+        packageType=$(PackageType);
+        releaseNotes=$(PackageReleaseNotes);
+        sourceRevisionId=$(SourceRevisionId);
+        developmentDependency=$(DevelopmentDependency);
+        serviceable=$(Serviceable)
+      </NuspecProperties>
+    </PropertyGroup>
+
+  </Target>
+
 </Project>
\ No newline at end of file

From c4088bd244f4702af3d30d8755ce0cf4c28553c4 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 22:59:42 +0200
Subject: [PATCH 5/9] Restructure project type detection code.

---
 src/Buildvana.Sdk/Sdk/Sdk.props | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Buildvana.Sdk/Sdk/Sdk.props b/src/Buildvana.Sdk/Sdk/Sdk.props
index ee368dfe..69f52ee6 100644
--- a/src/Buildvana.Sdk/Sdk/Sdk.props
+++ b/src/Buildvana.Sdk/Sdk/Sdk.props
@@ -49,29 +49,29 @@
     <BuildvanaModulesDirectory>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)..\Modules'))</BuildvanaModulesDirectory>
   </PropertyGroup>
 
-  <!-- Determine whether this is a test project. -->
-  <PropertyGroup Condition="'$(BV_IsTestProject)' == ''">
-    <BV_IsTestProject Condition="'$(TestProjectType)' != '' Or '$(IsTestProject)' == 'true'">true</BV_IsTestProject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(BV_IsTestProject)' != 'true'">
+  <!-- Determine the kind of project. -->
+  <PropertyGroup>
     <BV_IsTestProject>false</BV_IsTestProject>
-  </PropertyGroup>
-
-  <!-- Determine whether this is a non-test library project. -->
-  <PropertyGroup Condition="'$(BV_IsLibraryProject)' == ''">
-    <BV_IsLibraryProject Condition="'$(OutputType)' == 'Library' And '$(BV_IsTestProject)' != 'true'">true</BV_IsLibraryProject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(BV_IsLibraryProject)' != 'true'">
     <BV_IsLibraryProject>false</BV_IsLibraryProject>
-  </PropertyGroup>
-
-  <!-- Determine whether this is an executable project. -->
-  <PropertyGroup Condition="'$(BV_IsExeProject)' == ''">
-    <BV_IsExeProject Condition="'$(OutputType)' == 'Exe' Or '$(OutputType)' == 'WinExe'">true</BV_IsExeProject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(BV_IsExeProject)' != 'true'">
     <BV_IsExeProject>false</BV_IsExeProject>
   </PropertyGroup>
+  <Choose>
+    <When Condition="'$(TestProjectType)' != '' Or '$(IsTestProject)' == 'true'">
+      <PropertyGroup Condition="!$(BV_IsNoTargetsProject)">
+        <BV_IsTestProject>true</BV_IsTestProject>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(OutputType)' == 'Library' And '$(BV_IsTestProject)' != 'true'">
+      <PropertyGroup>
+        <BV_IsLibraryProject>true</BV_IsLibraryProject>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(OutputType)' == 'Exe' Or '$(OutputType)' == 'WinExe'">
+      <PropertyGroup Condition="!$(BV_IsNoTargetsProject)">
+        <BV_IsExeProject>true</BV_IsExeProject>
+      </PropertyGroup>
+    </When>
+  </Choose>
 
   <!-- Import modules -->
   <Import Condition="$(BV_IsConfigured)" Project="$(BuildvanaModulesDirectory)**\BeforeModules.props" />

From 5f56a3b1a13d160e43928569ea0ee9a910bac408 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 23:01:22 +0200
Subject: [PATCH 6/9] Add global.json to build using .NET SDK 3.1.300 or
 higher, but NOT .NET 5 Preview.

---
 global.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 global.json

diff --git a/global.json b/global.json
new file mode 100644
index 00000000..7caee59b
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "3.1.300",
+    "rollForward": "latestMinor"
+  }
+}
\ No newline at end of file

From 8716cd7f749cb08a5a4ebe8acbcebe5ed1815e5d Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 23:03:23 +0200
Subject: [PATCH 7/9] [ADD] Support for projects using
 Microsoft.Build.NoTargets SDK.

---
 .../Modules/JetBrainsAnnotations/Module.targets             | 5 +++--
 .../Modules/StandardAnalyzers/BeforeModules.targets         | 4 ++--
 src/Buildvana.Sdk/Sdk/Sdk.props                             | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets b/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
index 89835b67..fad7e070 100644
--- a/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
+++ b/src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
@@ -1,7 +1,8 @@
 <Project>
 
-  <!-- Add ReSharper-related package references where appropriate. -->
-  <ItemGroup Condition="$(UseJetBrainsAnnotations)">
+  <!-- Add ReSharper-related package references where appropriate,
+       except for no-targets projects. -->
+  <ItemGroup Condition="$(UseJetBrainsAnnotations) And !$(BV_IsNoTargetsProject)">
     <PackageReference Include="JetBrains.Annotations"
                       IsImplicitlyDefined="true"
                       PrivateAssets="All" />
diff --git a/src/Buildvana.Sdk/Modules/StandardAnalyzers/BeforeModules.targets b/src/Buildvana.Sdk/Modules/StandardAnalyzers/BeforeModules.targets
index fef3239d..72700c59 100644
--- a/src/Buildvana.Sdk/Modules/StandardAnalyzers/BeforeModules.targets
+++ b/src/Buildvana.Sdk/Modules/StandardAnalyzers/BeforeModules.targets
@@ -1,9 +1,9 @@
 <Project>
 
-  <!-- UseStandardAnalyzers default = true, except for test projects. -->
+  <!-- UseStandardAnalyzers default = true, except for test projects and no-target projects. -->
   <PropertyGroup Condition="'$(UseStandardAnalyzers)' == ''">
     <UseStandardAnalyzers>true</UseStandardAnalyzers>
-    <UseStandardAnalyzers Condition="$(BV_IsTestProject)">false</UseStandardAnalyzers>
+    <UseStandardAnalyzers Condition="$(BV_IsTestProject) Or $(BV_IsNoTargetsProject)">false</UseStandardAnalyzers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(UseStandardAnalyzers)' != 'true'">
     <UseStandardAnalyzers>false</UseStandardAnalyzers>
diff --git a/src/Buildvana.Sdk/Sdk/Sdk.props b/src/Buildvana.Sdk/Sdk/Sdk.props
index 69f52ee6..699ada76 100644
--- a/src/Buildvana.Sdk/Sdk/Sdk.props
+++ b/src/Buildvana.Sdk/Sdk/Sdk.props
@@ -51,11 +51,17 @@
 
   <!-- Determine the kind of project. -->
   <PropertyGroup>
+    <BV_IsNoTargetsProject>false</BV_IsNoTargetsProject>
     <BV_IsTestProject>false</BV_IsTestProject>
     <BV_IsLibraryProject>false</BV_IsLibraryProject>
     <BV_IsExeProject>false</BV_IsExeProject>
   </PropertyGroup>
   <Choose>
+    <When Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true'">
+      <PropertyGroup>
+        <BV_IsNoTargetsProject>true</BV_IsNoTargetsProject>
+      </PropertyGroup>
+    </When>
     <When Condition="'$(TestProjectType)' != '' Or '$(IsTestProject)' == 'true'">
       <PropertyGroup Condition="!$(BV_IsNoTargetsProject)">
         <BV_IsTestProject>true</BV_IsTestProject>

From 51ac0cf2bd8ad5a00a0336924d338e4b83a2f5a7 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 23:11:18 +0200
Subject: [PATCH 8/9] Ditch build scripts; use Microsoft.Build.NoTargets +
 Buildvana.Sdk

---
 Common.props                           | 20 ++++++
 Directory.Build.props                  | 39 +----------
 Directory.Build.targets                | 13 +---
 Directory.Packages.props               |  7 --
 build/MSBuild.Packaging.props          | 15 -----
 build/MSBuild.Packaging.targets        | 90 --------------------------
 src/Buildvana.Sdk/Buildvana.Sdk.csproj |  9 ++-
 7 files changed, 32 insertions(+), 161 deletions(-)
 create mode 100644 Common.props
 delete mode 100644 Directory.Packages.props
 delete mode 100644 build/MSBuild.Packaging.props
 delete mode 100644 build/MSBuild.Packaging.targets

diff --git a/Common.props b/Common.props
new file mode 100644
index 00000000..21d24376
--- /dev/null
+++ b/Common.props
@@ -0,0 +1,20 @@
+<Project>
+
+  <!-- Branding, ownership, and licensing -->
+  <PropertyGroup>
+    <Product>Buildvana.Sdk</Product>
+    <Authors>rdeago</Authors>
+    <Owners>Buildvana</Owners>
+    <Copyright>Copyright (C) 2020 Riccardo De Agostini.</Copyright>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
+
+  <!-- Repository and documentation -->
+  <PropertyGroup>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Buildvana/Buildvana.Sdk</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Buildvana/Buildvana</PackageProjectUrl>
+    <PackageReleaseNotes>Release notes are available at https://github.com/Buildvana/Buildvana.Sdk/blob/master/CHANGELOG.md</PackageReleaseNotes>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 25e66b26..8b21087d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,40 +1,7 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-  <Import Project="$(MSBuildThisFileDirectory)build\MSBuild.Packaging.props"/>
+  <!-- DO NOT MODIFY THIS FILE! Create or modify Common.props instead. -->
 
-  <!-- Branding, ownership, and licensing -->
-  <PropertyGroup>
-    <Product>Buildvana.Sdk</Product>
-    <Authors>rdeago</Authors>
-    <Owners>Buildvana</Owners>
-    <Copyright>Copyright (C) 2020 Buildvana contributors.</Copyright>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)LICENSE" Link="LICENSE" Visible="false" Pack="true" />
-    <Content Include="$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES" Link="THIRD-PARTY-NOTICES" Visible="false" Pack="true" />
-  </ItemGroup>
-
-  <!-- Package Central Version Management -->
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-
-  <!-- Repository and documentation -->
-  <PropertyGroup>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/Buildvana/Buildvana.Sdk</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Buildvana/Buildvana</PackageProjectUrl>
-    <PackageReleaseNotes>Release notes are available at https://github.com/Buildvana/Buildvana.Sdk/blob/master/CHANGELOG.md</PackageReleaseNotes>
-  </PropertyGroup>
-  
-  <!-- Package icon -->
-  <PropertyGroup>
-    <PackageIcon>$(Product).png</PackageIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)graphics\PackageIcon.png" Link="$(Product).png" Visible="false" Pack="true" />
-  </ItemGroup>
+  <Import Project="Sdk.props" Sdk="Buildvana.Sdk" Version="0.1.0" />
 
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5a6b4b24..06dca416 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,14 +1,7 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-  <Import Project="$(MSBuildThisFileDirectory)build\MSBuild.Packaging.targets"/>
+  <!-- DO NOT MODIFY THIS FILE! Create or modify Common.targets instead. -->
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-  <!-- Put packages in artifacts folder. -->
-  <PropertyGroup>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts\$(Configuration)\</PackageOutputPath>
-  </PropertyGroup>
+  <Import Project="Sdk.targets" Sdk="Buildvana.Sdk" Version="0.1.0" />
 
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
deleted file mode 100644
index 7d10eff3..00000000
--- a/Directory.Packages.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/MSBuild.Packaging.props b/build/MSBuild.Packaging.props
deleted file mode 100644
index e88e45ca..00000000
--- a/build/MSBuild.Packaging.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Build">
-    <!-- Full symbols, so that unit test assertions have more info -->
-    <DebugType Condition="'$(Configuration)' == 'Debug'">Full</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(EnableDefaultBuildItems)' == 'true'">
-    <Content Include="*\**\*.props;*\**\*.targets;*\**\*.tasks;*\**\*.items" Pack="true" Exclude="$(DefaultContentItemExcludes)"/>
-    <None Remove="@(Content)"/>
-    <!-- Make sure VS considers any change to any of the targets as requiring a new build/pack -->
-    <UpToDateCheckInput Include="@(Content)"/>
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/build/MSBuild.Packaging.targets b/build/MSBuild.Packaging.targets
deleted file mode 100644
index 81dca9a3..00000000
--- a/build/MSBuild.Packaging.targets
+++ /dev/null
@@ -1,90 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <PackageType>MSBuildSdk</PackageType>
-    <_DefaultTags>build;msbuild;sdk;dotnet</_DefaultTags>
-    <PackageTags Condition="'$(PackageTags)' != ''">$(_DefaultTags);$(PackageTags)</PackageTags>
-    <PackageTags Condition="'$(PackageTags)' == ''">$(_DefaultTags)</PackageTags>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <Serviceable>true</Serviceable>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <EnableDefaultContentItems Condition="'$(EnableDefaultContentItems)' == ''">true</EnableDefaultContentItems>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(EnableDefaultContentItems)' == 'true'">
-    <IncludeContentInPack>true</IncludeContentInPack>
-    <DefaultContentItemExcludes>$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)</DefaultContentItemExcludes>
-    <DefaultContentItemExcludes>$(DefaultContentItemExcludes);**\*$(DefaultLanguageSourceExtension);**\*.resx</DefaultContentItemExcludes>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(PackageOnlyBuild)' == 'true'">
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(PackageOnlyBuild)' == 'true'">
-    <IntermediateAssembly Remove="@(IntermediateAssembly)"/>
-    <IntermediateRefAssembly Remove="@(IntermediateRefAssembly)"/>
-  </ItemGroup>
-
-  <!-- This property must be overridden to remove a few targets that compile assemblies. -->
-  <PropertyGroup Condition="'$(PackageOnlyBuild)' == 'true'">
-    <CoreBuildDependsOn>
-      InitializeSourceControlInformation;
-      BuildOnlySettings;
-      PrepareForBuild;
-      PreBuildEvent;
-      ResolveProjectReferences;
-      GetTargetPath;
-      PrepareForRun;
-      IncrementalClean;
-      PostBuildEvent
-    </CoreBuildDependsOn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(NuspecFile)' == ''">
-    <NuspecFile Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec')">$(MSBuildProjectName).nuspec</NuspecFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(NuspecFile)' != ''">
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuSpecProperties</GenerateNuspecDependsOn>
-  </PropertyGroup>
-
-  <Target Name="SetNuSpecProperties" Condition="'$(NuspecFile)' != ''">
-    <PropertyGroup>
-      <!-- Reset 'SourceRevisionId' to default value when not set -->
-      <SourceRevisionId Condition="'$(SourceRevisionId)' == ''">0</SourceRevisionId>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <NuspecProperties>
-        id=$(PackageId);
-        title=$(Title);
-        version=$(PackageVersion);
-        summary=$(Summary);
-        description=$(Description);
-        authors=$(Authors.Replace(';',','));
-        copyright=$(Copyright);
-        tags=$(PackageTags.Replace(';',','));
-        repositoryType=$(RepositoryType);
-        repositoryUrl=$(RepositoryUrl);
-        projectUrl=$(PackageProjectUrl);
-        licenseFile=$(PackageLicenseFile);
-        requireLicenseAcceptance=$(PackageRequireLicenseAcceptance);
-        packageType=$(PackageType);
-        releaseNotes=$(PackageReleaseNotes);
-        sourceRevisionId=$(SourceRevisionId);
-        developmentDependency=$(DevelopmentDependency);
-        serviceable=$(Serviceable)
-      </NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/src/Buildvana.Sdk/Buildvana.Sdk.csproj b/src/Buildvana.Sdk/Buildvana.Sdk.csproj
index 1e94a7ae..70c0e050 100644
--- a/src/Buildvana.Sdk/Buildvana.Sdk.csproj
+++ b/src/Buildvana.Sdk/Buildvana.Sdk.csproj
@@ -1,12 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.Build.NoTargets/2.0.1">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageOnlyBuild>true</PackageOnlyBuild>
+    <IsPackable>true</IsPackable>
     <Title>Buildvana SDK</Title>
     <Summary>An opinionated, best-practices-based, CI-friendly, VS-friendly, MSBuild-powered build system for .NET projects.</Summary>
     <Description>Documentation is available here: https://github.com/Buildvana/Buildvana.Sdk/blob/master/README.md</Description>
-    <Version>0.1.0</Version>
+    <PackageTags>build;msbuild;sdk;dotnet</PackageTags>
+    <PackageType>MSBuildSdk</PackageType>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <Serviceable>true</Serviceable>
   </PropertyGroup>
 
   <PropertyGroup>

From e15c9939927a643686a11d96009e6d5b1b394857 Mon Sep 17 00:00:00 2001
From: Riccardo De Agostini <riccardo@tenacom.it>
Date: Tue, 18 Aug 2020 23:11:46 +0200
Subject: [PATCH 9/9] [FIX] Authors are duplicated as owners in nuspec file.

---
 src/Buildvana.Sdk/Buildvana.Sdk.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Buildvana.Sdk/Buildvana.Sdk.nuspec b/src/Buildvana.Sdk/Buildvana.Sdk.nuspec
index ee28c766..4d24ef1b 100644
--- a/src/Buildvana.Sdk/Buildvana.Sdk.nuspec
+++ b/src/Buildvana.Sdk/Buildvana.Sdk.nuspec
@@ -2,7 +2,7 @@
   <metadata>
     <id>$id$</id>
     <title>$title$</title>
-    <owners>$authors$</owners>
+    <owners>$owners$</owners>
     <authors>$authors$</authors>
     <version>$version$</version>
     <copyright>$copyright$</copyright>