From 57006a19bd63baf0a81456bb4c880ec82a20638d Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <teo.tsirpanis.718@gmail.com>
Date: Sat, 15 Jun 2019 00:54:56 +0300
Subject: [PATCH 1/3] Use SourceLink and separate symbol packages.

---
 Directory.Build.props                   |  3 ---
 appveyor.yml                            |  4 ++--
 src/Serilog/Serilog.csproj              | 14 ++++++++++++--
 test/Serilog.Tests/Serilog.Tests.csproj |  3 ---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9744ad788..74897aab3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,4 @@
 <Project>
-  <ItemGroup>
-      <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
-  </ItemGroup>
   <!-- Workaround for https://github.com/dotnet/sdk/pull/908 -->
   <Target Name="GetPackagingOutputs" />
   <PropertyGroup>
diff --git a/appveyor.yml b/appveyor.yml
index a0b5ef1ab..2812b5a61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ for:
   build_script:
   - sh build.sh
 artifacts:
-  - path: artifacts/Serilog.*.nupkg
+- path: artifacts/Serilog.*.?nupkg
 deploy:
 - provider: NuGet
   api_key:
@@ -31,7 +31,7 @@ deploy:
 - provider: GitHub
   auth_token:
     secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
-  artifact: /Serilog.*\.nupkg/
+  artifact: /Serilog.*\.?nupkg/
   tag: v$(appveyor_build_version)
   on:
     branch: master
diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj
index 211047f24..2641fec0c 100644
--- a/src/Serilog/Serilog.csproj
+++ b/src/Serilog/Serilog.csproj
@@ -14,8 +14,6 @@
     <PackageIconUrl>https://serilog.net/images/serilog-nuget.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/serilog/serilog</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/serilog/serilog</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
@@ -58,4 +56,16 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All"/>
+  </ItemGroup>
+
 </Project>
diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj
index d1947d4ed..5712c49f7 100644
--- a/test/Serilog.Tests/Serilog.Tests.csproj
+++ b/test/Serilog.Tests/Serilog.Tests.csproj
@@ -38,7 +38,4 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.8.1" />
-  </ItemGroup>
 </Project>
\ No newline at end of file

From 177ecd2b4b0e8cbe6eb2009d8a799e8a6dbff962 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <teo.tsirpanis.718@gmail.com>
Date: Sat, 15 Jun 2019 01:12:26 +0300
Subject: [PATCH 2/3] Use the actual project's site in the package metadata.

---
 src/Serilog/Serilog.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj
index 2641fec0c..cc4c34971 100644
--- a/src/Serilog/Serilog.csproj
+++ b/src/Serilog/Serilog.csproj
@@ -12,7 +12,7 @@
     <PackageId>Serilog</PackageId>
     <PackageTags>serilog;logging;semantic;structured</PackageTags>
     <PackageIconUrl>https://serilog.net/images/serilog-nuget.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/serilog/serilog</PackageProjectUrl>
+    <PackageProjectUrl>https://serilog.net/</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>

From fde1a3211c71f4dbf8cbb09b679fed2497ae5515 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <teo.tsirpanis.718@gmail.com>
Date: Sat, 15 Jun 2019 01:25:58 +0300
Subject: [PATCH 3/3] Fix AppVeyor artifact paths.

---
 appveyor.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2812b5a61..06f4f73e5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,8 @@ for:
   build_script:
   - sh build.sh
 artifacts:
-- path: artifacts/Serilog.*.?nupkg
+- path: artifacts/Serilog.*.nupkg
+- path: artifacts/Serilog.*.snupkg
 deploy:
 - provider: NuGet
   api_key:
@@ -31,7 +32,9 @@ deploy:
 - provider: GitHub
   auth_token:
     secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
-  artifact: /Serilog.*\.?nupkg/
+  artifacts:
+    /Serilog.*\.nupkg/
+    /Serilog.*\.snupkg/
   tag: v$(appveyor_build_version)
   on:
     branch: master