Merge pull request #98 from fle-bach/FixPathNupkg

Generate .snupkg for get .pdb file

Author: Julien-Molina

ReactiveXComponent/ReactiveXComponent.csproj

@@ -11,7 +11,7 @@
     <PackageProjectUrl>https://github.com/xcomponent/ReactiveXComponent.Net</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>ReactiveXComponent.Net</PackageId>
-    <Version>2.0.0</Version>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,13 +21,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
+    <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="SuperSocket.ClientEngine" Version="0.10.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Core" Version="3.1.1">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Interfaces" Version="3.1.1">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Reactive.Linq" Version="3.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="RabbitMQ.Client" Version="4.1.3" />
-    <PackageReference Include="SuperSocket.ClientEngine" Version="0.10.0" />
-    <PackageReference Include="System.Reactive.Core" Version="3.1.1" />
-    <PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" />
-    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
     <PackageReference Include="WebSocket4Net" Version="0.15.2" />
   </ItemGroup>
 
@@ -36,7 +47,13 @@
     <PropertyGroup>
         <WorkingDirectory>$(MSBuildThisFileDirectory)$(OutputPath)</WorkingDirectory>
     </PropertyGroup>
+    <ItemGroup>
+			<InputAssemblies Include="$(WorkingDirectory)\ReactiveXComponent.dll" />
+			<InputAssemblies Include="$(WorkingDirectory)\Newtonsoft.Json.dll" />
+			<InputAssemblies Include="$(WorkingDirectory)\RabbitMQ.Client.dll" />
+			<InputAssemblies Include="$(WorkingDirectory)\WebSocket4Net.dll" />
+		</ItemGroup>
 
-    <ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(MSBuildThisFileDirectory)\..\packaging\$(AssemblyName).dll" InputAssemblies="$(WorkingDirectory)\*.dll" WilcardInputAssemblies="true" Internalize="true" WorkingDirectory="$(WorkingDirectory)" />
+    <ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(MSBuildThisFileDirectory)\..\packaging\$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" WilcardInputAssemblies="true" Internalize="true" WorkingDirectory="$(WorkingDirectory)" />
   </Target>
 </Project>

ReactiveXComponentTest/ReactiveXComponentTest.csproj

@@ -11,6 +11,7 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

build.cake

@@ -39,6 +39,8 @@ Task("Build")
         "ReactiveXComponent.sln",
         new DotNetCoreBuildSettings {
             Configuration = buildConfiguration,
+            VersionSuffix = version,
+            MSBuildSettings = new DotNetCoreMSBuildSettings{}.SetVersion(version),
         });
     });
 
@@ -64,6 +66,8 @@ Task("CreatePackage")
             "ReactiveXComponent/ReactiveXComponent.csproj",
             new DotNetCorePackSettings  {
                 Configuration = buildConfiguration,
+                IncludeSymbols = true,
+                NoBuild = true,
                 OutputDirectory = @"nuget",
                 VersionSuffix = version,
                 MSBuildSettings = new DotNetCoreMSBuildSettings{}.SetVersion(version),