From 479ca90e9cf0eb662c72ac0d3da1374290a2843d Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Mon, 9 Nov 2020 17:11:21 -0300
Subject: [PATCH 1/3] Simplify cref in xml doc

---
 src/Moq/Mock.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moq/Mock.cs b/src/Moq/Mock.cs
index 37406e386..c55126b3c 100644
--- a/src/Moq/Mock.cs
+++ b/src/Moq/Mock.cs
@@ -208,14 +208,14 @@ public DefaultValue DefaultValue
 		internal abstract Type MockedType { get; }
 
 		/// <summary>
-		/// Gets or sets the <see cref="DefaultValueProvider"/> instance that will be used
+		/// Gets or sets the <see cref="Moq.DefaultValueProvider"/> instance that will be used
 		/// e. g. to produce default return values for unexpected invocations.
 		/// </summary>
 		public abstract DefaultValueProvider DefaultValueProvider { get; set; }
 
 		/// <summary>
 		/// The <see cref="Moq.DefaultValueProvider"/> used to initialize automatically stubbed properties.
-		/// It is equal to the value of <see cref="Moq.Mock.DefaultValueProvider"/> at the time when
+		/// It is equal to the value of <see cref="DefaultValueProvider"/> at the time when
 		/// <see cref="SetupAllProperties"/> was last called.
 		/// </summary>
 		internal abstract DefaultValueProvider AutoSetupPropertiesDefaultValueProvider { get; set; } 

From 50eac973ad3c41ff8a5729472b57929f0d10020c Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Mon, 9 Nov 2020 17:39:43 -0300
Subject: [PATCH 2/3] Don't depend on SolutionDir to allow Pack from project

The SolutionDir property is only available when building from the
solution. For packing, it's actually not necessary and we could
also easily allow packing from the Moq.csproj project itself.

This change, in addition to enabling that, also makes the icon
path more flexible since it could be moved down to the src folder
(say) without requiring a change to the .csproj.
---
 src/Moq/Moq.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moq/Moq.csproj b/src/Moq/Moq.csproj
index e0933f90f..43b2e317d 100644
--- a/src/Moq/Moq.csproj
+++ b/src/Moq/Moq.csproj
@@ -105,7 +105,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="$(SolutionDir)moq-icon.png" Pack="true" PackagePath="moq.png" Visible="False" />
+		<None Include="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), moq-icon.png))\moq-icon.png" Pack="true" PackagePath="moq.png" Visible="False" />
 	</ItemGroup>
 
 	<Target Name="Test" />

From 3dc0d1b3f373e52d8a4f42dde7548001708d6f22 Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Mon, 9 Nov 2020 18:57:50 -0300
Subject: [PATCH 3/3] Embed symbols in assembly, drop .snupkg

Since we're generating portable symbols, these are WAY smaller than
full PDBs used to be. Their size contribution to the package are
negligible and for convenience, it's more common nowadays to just
embed the symbols always in the assembly itself. In particular for
a library that is not deployed to production apps, this makes
perfect sense.

So stop generating the (effectively legacy) .snupkg.
---
 src/Moq/Moq.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Moq/Moq.csproj b/src/Moq/Moq.csproj
index 43b2e317d..91e79e248 100644
--- a/src/Moq/Moq.csproj
+++ b/src/Moq/Moq.csproj
@@ -9,7 +9,7 @@
 		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
 		<AssemblyName>Moq</AssemblyName>
 		<DebugSymbols>True</DebugSymbols>
-		<DebugType>portable</DebugType>
+		<DebugType>embedded</DebugType>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> 
 		<GenerateDocumentation>true</GenerateDocumentation>
 		<NoWarn>0419</NoWarn>
@@ -35,8 +35,7 @@
 		<PackageTags>moq;tdd;mocking;mocks;unittesting;agile;unittest</PackageTags>
 		<PackageProjectUrl>https://github.com/moq/moq4</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/moq/moq4</RepositoryUrl>
-		<IncludeSymbols>True</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<IncludeSymbols>false</IncludeSymbols>
 	</PropertyGroup>
 
 	<ItemGroup>