Move to snupkg for symbols, and ditch SourceLink

README.md

@@ -61,16 +61,6 @@ Documentation
 [The Wiki is the documentation source](https://github.com/canton7/Stylet/wiki).
 There's loads of information there - go and have a look, or start with the [Quick Start](https://github.com/canton7/Stylet/wiki/Quick-Start).
 
-Symbols
-------
-
-The source is also available when you are debugging, using [Source Link](https://github.com/dotnet/sourcelink).
-Go to Debug -> Options and Settings -> General, and make the following changes:
-
- - Turn **off** "Enable Just My Code"
- - Turn **on** "Enable Source Link support"
- - Turn **off** "Enable .NET Framework source stepping". Yes, it is misleading, but if you don't, then Visual Studio will ignore your custom server order and only use its own servers.
-
 
 Contributing
 ------------

Rakefile

@@ -19,7 +19,7 @@ directory COVERAGE_DIR
 
 desc "Build the project using the current CONFIG (or Debug)"
 task :build do
-  sh 'dotnet', 'build', '-c', CONFIG, '-p:ContinuousIntegrationBuild=true', CSPROJ
+  sh 'dotnet', 'build', '-c', CONFIG, CSPROJ
 end
 
 desc "Run unit tests using the current CONFIG (or Debug)"
@@ -31,7 +31,7 @@ desc "Create NuGet package"
 task :package do
   # Not sure why these have to be this way around, but they do
   sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}"
-  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ
+  sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true'
   sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ
 end
 

Stylet/Stylet.csproj

@@ -24,16 +24,17 @@
     <Authors>Antony Male</Authors>
     <Description>A very lightweight but powerful ViewModel-First MVVM framework for WPF, inspired by Caliburn.Micro.</Description>
 
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- https://github.com/dotnet/sourcelink/issues/91#issuecomment-397123585 -->
-    <DebugType>embedded</DebugType>
-    <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
+    <!-- Just embed all sources in the PDB: snupkg files don't support bare .cs files, and SourceLink is annoying -->
+    <!-- We set IncludeSymbols in the Rakefile, because we don't want it to apply to Stylet.Start -->
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedAllSources>true</EmbedAllSources>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19351-01" PrivateAssets="All" />
-  </ItemGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <!-- Stack traces on < net471 don't work with portable -->
+    <DebugType>full</DebugType>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="System.Drawing.Common" Version="4.6.0" />