Generate symbol nupkg for EFCore.Tools and dotnet-ef

dotnet · Apr 20, 2018 · b99a318 · b99a318
1 parent de5bd2a
commit b99a318
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 22 deletions.
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -11,6 +11,7 @@
  <EnableApiCheck>false</EnableApiCheck>
  <GenerateDocumentationFile>false</GenerateDocumentationFile>
  <CodeAnalysisRuleSet>..\EFCore.ruleset</CodeAnalysisRuleSet>
+ <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
  </PropertyGroup>
 
  <ItemGroup>
@@ -22,8 +23,29 @@
  <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
  </ItemGroup>
 
- <ItemGroup>
- <None Include="$(OutputPath)$(AssemblyName).dll" Pack="true" PackagePath="analyzers\dotnet\cs\" Visible="false" />
- </ItemGroup>
+ <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
+
+ <PropertyGroup>
+ <!-- Make sure we create a symbols.nupkg. -->
+ <IncludeSymbols>true</IncludeSymbols>
+
+ <NuspecProperties>
+ id=$(PackageId);
+ version=$(PackageVersion);
+ authors=$(Authors);
+ description=$(Description);
+ tags=$(PackageTags.Replace(';', ' '));
+ licenseUrl=$(PackageLicenseUrl);
+ projectUrl=$(PackageProjectUrl);
+ iconUrl=$(PackageIconUrl);
+ repositoryUrl=$(RepositoryUrl);
+ repositoryCommit=$(RepositoryCommit);
+ copyright=$(Copyright);
+
+ OutputBinary=$(OutputPath)$(AssemblyName).dll;
+ OutputSymbol=$(OutputPath)$(AssemblyName).pdb;
+ </NuspecProperties>
+ </PropertyGroup>
+ </Target>
 
 </Project>
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+ <metadata>
+ <id>$id$</id>
+ <version>$version$</version>
+ <authors>$authors$</authors>
+ <requireLicenseAcceptance>true</requireLicenseAcceptance>
+ <licenseUrl>$licenseUrl$</licenseUrl>
+ <projectUrl>$projectUrl$</projectUrl>
+ <iconUrl>$iconUrl$</iconUrl>
+ <description>$description$</description>
+ <copyright>$copyright$</copyright>
+ <tags>$tags$</tags>
+ <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+ <dependencies>
+ <group targetFramework=".NETStandard1.3" />
+ </dependencies>
+ </metadata>
+
+ <files>
+ <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
+ <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
+ </files>
+</package>
diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj
@@ -30,6 +30,9 @@ Update-Database
 
  <Target Name="SetPackageProperties" BeforeTargets="GenerateNuspec">
  <PropertyGroup>
+ <!-- Make sure we create a symbols.nupkg -->
+ <IncludeSymbols>true</IncludeSymbols>
+
  <NuspecProperties>
  id=$(PackageId);
  version=$(PackageVersion);

diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec
@@ -25,8 +25,11 @@
  <file src="lib/**/*" target="" />
  <file src="tools/**/*" target=""/>
  <file src="../ef/bin/$configuration$/net461/ef.exe" target="tools/net461/any/" />
+ <file src="../ef/bin/$configuration$/net461/ef.pdb" target="tools/net461/any/" />
  <file src="../ef/bin/x86/$configuration$/net461/ef.exe" target="tools/net461/win-x86/" />
+ <file src="../ef/bin/x86/$configuration$/net461/ef.pdb" target="tools/net461/win-x86/" />
  <file src="../ef/bin/$configuration$/netcoreapp2.0/ef.dll" target="tools/netcoreapp2.0/any/" />
+ <file src="../ef/bin/$configuration$/netcoreapp2.0/ef.pdb" target="tools/netcoreapp2.0/any/" />
  <file src="../ef/bin/$configuration$/netcoreapp2.0/ef.runtimeconfig.json" target="tools/netcoreapp2.0/any/" />
  </files>
 </package>
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
@@ -17,8 +17,8 @@ dotnet ef database update
  <PackAsTool>true</PackAsTool>
  <RootNamespace>Microsoft.EntityFrameworkCore.Tools</RootNamespace>
  <IncludeSource>false</IncludeSource>
- <IncludeSymbols>false</IncludeSymbols>
  <EnableApiCheck>false</EnableApiCheck>
+ <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
  </PropertyGroup>
 
  <ItemGroup>
@@ -72,23 +72,39 @@ dotnet ef database update
  </Compile>
  </ItemGroup>
 
- <ItemGroup>
- <None Include="..\ef\bin\$(Configuration)\net461\ef.exe">
- <Pack>True</Pack>
- <PackagePath>tools\$(TargetFramework)\any\tools\net461\any</PackagePath>
- </None>
- <None Include="..\ef\bin\x86\$(Configuration)\net461\ef.exe">
- <Pack>True</Pack>
- <PackagePath>tools\$(TargetFramework)\any\tools\net461\win-x86</PackagePath>
- </None>
- <None Include="..\ef\bin\$(Configuration)\netcoreapp2.0\ef.dll">
- <Pack>True</Pack>
- <PackagePath>tools\$(TargetFramework)\any\tools\netcoreapp2.0\any</PackagePath>
- </None>
- <None Include="..\ef\bin\$(Configuration)\netcoreapp2.0\ef.runtimeconfig.json">
- <Pack>True</Pack>
- <PackagePath>tools\$(TargetFramework)\any\tools\netcoreapp2.0\any</PackagePath>
- </None>
- </ItemGroup>
+ <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
+
+ <PropertyGroup>
+ <!-- Make sure we create a symbols.nupkg. -->
+ <IncludeSymbols>true</IncludeSymbols>
+
+ <NuspecProperties>
+ id=$(PackageId);
+ version=$(PackageVersion);
+ authors=$(Authors);
+ description=$(Description);
+ tags=$(PackageTags.Replace(';', ' '));
+ licenseUrl=$(PackageLicenseUrl);
+ projectUrl=$(PackageProjectUrl);
+ iconUrl=$(PackageIconUrl);
+ repositoryUrl=$(RepositoryUrl);
+ repositoryCommit=$(RepositoryCommit);
+ copyright=$(Copyright);
+ packageType=$(PackageType);
+ AssemblyName=$(AssemblyName);
+ targetFramework=$(TargetFramework);
+
+ SettingsFile=$(_ToolsSettingsFilePath);
+ Output=$(PublishDir)**\*;
+ OutputBinary=..\ef\bin\$(Configuration)\netcoreapp2.0\ef.dll;
+ OutputRuntimeConfig=..\ef\bin\$(Configuration)\netcoreapp2.0\ef.runtimeconfig.json;
+ OutputSymbol=..\ef\bin\$(Configuration)\netcoreapp2.0\ef.pdb;
+ OutputExe=..\ef\bin\$(Configuration)\net461\ef.exe;
+ OutputExeSymbol=..\ef\bin\$(Configuration)\net461\ef.pdb;
+ OutputX86Exe=..\ef\bin\x86\$(Configuration)\net461\ef.exe;
+ OutputX86ExeSymbol=..\ef\bin\x86\$(Configuration)\net461\ef.pdb;
+ </NuspecProperties>
+ </PropertyGroup>
+ </Target>
 
 </Project>
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+ <metadata>
+ <id>$id$</id>
+ <version>$version$</version>
+ <authors>$authors$</authors>
+ <requireLicenseAcceptance>true</requireLicenseAcceptance>
+ <licenseUrl>$licenseUrl$</licenseUrl>
+ <projectUrl>$projectUrl$</projectUrl>
+ <iconUrl>$iconUrl$</iconUrl>
+ <description>$description$</description>
+ <copyright>$copyright$</copyright>
+ <tags>$tags$</tags>
+ <packageTypes>
+ <packageType name="$packageType$" />
+ </packageTypes>
+ <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+ <dependencies>
+ <group targetFramework=".NETCoreApp2.0" />
+ </dependencies>
+ </metadata>
+
+ <files>
+ <file src="$SettingsFile$" target="tools\$targetFramework$\any" />
+ <file src="$Output$" target="tools\$targetFramework$\any" />
+ <file src="$OutputBinary$" target="tools\$targetFramework$\any\tools\netcoreapp2.0\any" />
+ <file src="$OutputRuntimeConfig$" target="tools\$targetFramework$\any\tools\netcoreapp2.0\any" />
+ <file src="$OutputSymbol$" target="tools\$targetFramework$\any\tools\netcoreapp2.0\any" />
+ <file src="$OutputExe$" target="tools\$targetFramework$\any\tools\net461\any" />
+ <file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net461\any" />
+ <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
+ <file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
+ </files>
+</package>