From 95ab9009d8032df3215e94b561839fd58ec35795 Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Thu, 25 Mar 2021 15:50:13 +0200
Subject: [PATCH] Include symbols in publish (#36)

---
 .github/workflows/publish.yml    |  2 +-
 .gitignore                       |  5 ++++-
 Common.props                     | 23 -----------------------
 src/Directory.Build.props        | 24 ++++++++++++++++++++++++
 src/Parlot/Directory.Build.props | 13 -------------
 src/Parlot/Parlot.csproj         |  7 ++++---
 6 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 Common.props
 create mode 100644 src/Directory.Build.props
 delete mode 100644 src/Parlot/Directory.Build.props

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 13b9c31..54f32b8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -44,4 +44,4 @@ jobs:
         dotnet pack --output artifacts --configuration Release -p:Version=$VERSION
 
     - name: Push with dotnet
-      run: dotnet nuget push artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
+      run: dotnet nuget push artifacts/*.*nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
diff --git a/.gitignore b/.gitignore
index dfcfd56..1b6f2c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,7 @@ nunit-*.xml
 dlldata.c
 
 # Benchmark Results
-BenchmarkDotNet.Artifacts/
+BenchmarkDotNet.Artifacts*/
 
 # .NET Core
 project.lock.json
@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Rider/Idea
+.idea
diff --git a/Common.props b/Common.props
deleted file mode 100644
index 52e4d72..0000000
--- a/Common.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <Copyright>Sebastien Ros</Copyright>
-    <Authors>Sebastien Ros</Authors>
-    <PackageProjectUrl>https://github.com/sebastienros/parlot</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-    <Version>0.0.0-preview</Version>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
-    <LangVersion>Latest</LangVersion>
-    <DebugType>portable</DebugType>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..7f5dc43
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,24 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+
+    <Copyright>Sebastien Ros</Copyright>
+    <Authors>Sebastien Ros</Authors>
+    <PackageProjectUrl>https://github.com/sebastienros/parlot</PackageProjectUrl>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
+    <Version>0.0.0-preview</Version>
+
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <LangVersion>Latest</LangVersion>
+    <DebugType>portable</DebugType>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <DebugType>portable</DebugType>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Parlot/Directory.Build.props b/src/Parlot/Directory.Build.props
deleted file mode 100644
index a7e5a40..0000000
--- a/src/Parlot/Directory.Build.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <PackageId>Parlot</PackageId>
-    <Title>Fast parser combinator for .NET</Title>
-    <Description>Parser utilities with performance and simplicity as its goals.</Description>
-    <PackageTags>parser;interpreter;</PackageTags>
-    <IsPackable>true</IsPackable>
-  </PropertyGroup>
-
-  <Import Project="../../Common.props"/>
-
-</Project>
diff --git a/src/Parlot/Parlot.csproj b/src/Parlot/Parlot.csproj
index 880edd2..62f653d 100644
--- a/src/Parlot/Parlot.csproj
+++ b/src/Parlot/Parlot.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <Title>Fast parser combinator for .NET</Title>
+    <Description>Parser utilities with performance and simplicity as its goals.</Description>
+    <PackageTags>parser;interpreter;</PackageTags>
+    <IsPackable>true</IsPackable>
     <AssemblyOriginatorKeyFile>Parlot.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>