From 532e4597321a7d39dc16332084cd77811d44eeab Mon Sep 17 00:00:00 2001
From: Gary Ewan Park <gep13@gep13.co.uk>
Date: Fri, 26 Feb 2021 20:41:59 +0000
Subject: [PATCH] (GH-55) Enable deterministic build

---
 src/Cake.Json.Tests/Cake.Json.Tests.csproj |  6 +++++-
 src/Cake.Json/Cake.Json.csproj             |  6 ++++++
 src/Directory.Build.props                  | 11 -----------
 src/Directory.Build.targets                | 15 ++++++++++-----
 4 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 src/Directory.Build.props

diff --git a/src/Cake.Json.Tests/Cake.Json.Tests.csproj b/src/Cake.Json.Tests/Cake.Json.Tests.csproj
index a2e57f4..2528ce9 100644
--- a/src/Cake.Json.Tests/Cake.Json.Tests.csproj
+++ b/src/Cake.Json.Tests/Cake.Json.Tests.csproj
@@ -8,12 +8,16 @@
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.35.0" />
     <PackageReference Include="Cake.Testing" Version="0.35.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NSubstitute" Version="4.2.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" >
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Cake.Json/Cake.Json.csproj b/src/Cake.Json/Cake.Json.csproj
index 28545c8..4ea28e5 100644
--- a/src/Cake.Json/Cake.Json.csproj
+++ b/src/Cake.Json/Cake.Json.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,6 +25,10 @@
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.35.0" PrivateAssets="All" />
     <PackageReference Include="Cake.Common" Version="0.35.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
deleted file mode 100644
index 926d9fc..0000000
--- a/src/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-  </ItemGroup>
-</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 5cd0b11..86e3c03 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,8 +1,13 @@
+
 <!-- This target must be imported into Directory.Build.targets -->
-<!-- Workaround. Remove once we're on 3.1.300+
+<!-- Workaround. Remove once we're targeting the 3.1.300+ SDK
 https://github.com/dotnet/sourcelink/issues/572 -->
 <Project>
   <PropertyGroup>
+    <!-- Uncomment the following if you want to have pdb files embedded inside a nupkg package -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
   <ItemGroup>
@@ -13,11 +18,11 @@ https://github.com/dotnet/sourcelink/issues/572 -->
   </ItemGroup>
 
   <Target Name="CoverletGetPathMap"
-        DependsOnTargets="InitializeSourceRootMappedPaths"
-        Returns="@(_LocalTopLevelSourceRoot)"
-        Condition="'$(DeterministicSourcePaths)' == 'true'">
+          DependsOnTargets="InitializeSourceRootMappedPaths"
+          Returns="@(_LocalTopLevelSourceRoot)"
+          Condition="'$(DeterministicSourcePaths)' == 'true'">
     <ItemGroup>
-    <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
+      <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
     </ItemGroup>
   </Target>
 </Project>