Přesun z Directory.Build.targets na NuGet.targets a jeho použití v (z…

…atím jediném) projektu pro opravu restore balíčků WebForms projektů ve VS
havit · Mar 29, 2019 · 307ec55 · 307ec55
1 parent 2751083
commit 307ec55
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 40 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,16 +9,4 @@
 	<AssemblyTitle>HAVIT .NET Framework Extensions</AssemblyTitle>
   </PropertyGroup>
 
-  <!-- NuGet -->
-  <PropertyGroup>
-	<Authors>HAVIT</Authors>
-	<PackageLicenseExpression>MIT</PackageLicenseExpression>	
-	<PackageIconUrl>https://www.gravatar.com/avatar/e59ffb10448162f0c6d6b5ae3fecd0ce?s=64</PackageIconUrl>
-
-	<!-- Jako default nebudeme dávat content do balíčků (stačí ukliknutí a máme content v nuget balíčku).
-		 V projektech, ve kterých content do nuget balíčku chceme, si jej povolíme. -->
-	<IncludeContentInPack>false</IncludeContentInPack>
-  </PropertyGroup>
-  <!-- /NuGet -->
-
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/Havit.Core/Havit.Core.csproj b/Havit.Core/Havit.Core.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <!-- NuGet -->
+  <Import Project="../NuGet.targets"/>
   <PropertyGroup>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageVersion>2.0.1</PackageVersion>
     <Description>HAVIT .NET Framework Extensions - Basic Class Library</Description>
   </PropertyGroup>

diff --git a/HavitFramework.sln b/HavitFramework.sln
@@ -82,7 +82,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 	ProjectSection(SolutionItems) = preProject
 		CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
 		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
+		NuGet.targets = NuGet.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{345552D1-56B8-41F1-9513-AD2F31D2F985}"
@@ -224,7 +224,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsoleApp", "TestConso
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Havit.Core", "Havit.Core\Havit.Core.csproj", "{9F542D56-262C-4569-96FD-84AD9AA7B381}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Havit.NuGetPackage", "Havit.NuGetPackage\Havit.NuGetPackage.csproj", "{3FDD2013-1F21-4645-90A5-938649958734}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Havit.NuGetPackage", "Havit.NuGetPackage\Havit.NuGetPackage.csproj", "{3FDD2013-1F21-4645-90A5-938649958734}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Havit.Core.Tests", "Havit.Core.Tests\Havit.Core.Tests.csproj", "{48BA6236-3B42-41AB-AC48-7F977E85863E}"
 EndProject

diff --git a/NuGet.targets b/NuGet.targets
@@ -0,0 +1,39 @@
+<Project>
+
+  <PropertyGroup>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>HAVIT</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIconUrl>https://www.gravatar.com/avatar/e59ffb10448162f0c6d6b5ae3fecd0ce?s=64</PackageIconUrl>
+
+    <!-- Jako default nebudeme dávat content do balíèkù (staèí ukliknutí a máme content v nuget balíèku).
+		 V projektech, ve kterých content do nuget balíèku chceme, si jej povolíme. -->
+    <IncludeContentInPack>false</IncludeContentInPack>
+  </PropertyGroup>
+
+  <!-- SourceLink -->
+  <PropertyGroup>
+    <!-- Source: https://github.com/dotnet/sourcelink/#using-sourcelink -->
+    <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- Optional: Include the PDB in the built .nupkg -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Pokud se tento øádek dostane do WebForms projektu, rozbije restorování nuget balíèkù, bohužel nepomáhá ani jedno podmínìní pomocí Condition.
+         Proto nepoužíváme Directory.Build.targets,  který by se automaticky použil pro všechny projekty,
+         ale do projektù importujeme tento NuGet.targets. -->
+    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+  </ItemGroup>
+
+  <!-- Publish NuGet -->
+  <PropertyGroup>
+    <NuGetPublishFolder Condition="'$(NuGetPublishFolder)' == ''">PublicNuGets</NuGetPublishFolder>
+    <PackageOutputPath Condition="'$(PublishDirectory)' != ''">$(PublishDirectory)\$(NuGetPublishFolder)</PackageOutputPath>
+  </PropertyGroup>
+  <!-- /Publish NuGet -->
+
+</Project>