Fixed up the patching and packing of pdbs

OctopusDeploy · Dec 21, 2017 · 71798f2 · 71798f2
1 parent 0124477
commit 71798f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/build.cake b/build.cake
@@ -91,8 +91,12 @@ Task("Pack")
     .IsDependentOn("Test")
     .Does(() =>
 {
-    GitLink3("./source/Halibut/bin/Release/net45/Halibut.pdb");
-    GitLink3("./source/Halibut/bin/Release/netstandard1.5/Halibut.pdb");
+    var pdbs = GetFiles($"./source/Halibut/bin/{configuration}/**/Halibut.pdb");
+    foreach(var pdb in pdbs)
+    {
+        GitLink3(pdb);
+    }
+
     DotNetCorePack("./source/Halibut", new DotNetCorePackSettings
     {
         Configuration = configuration,

diff --git a/global.json b/global.json
diff --git a/source/Halibut/Halibut.csproj b/source/Halibut/Halibut.csproj
@@ -12,6 +12,7 @@
     <PackageProjectUrl>https://github.com/OctopusDeploy/Halibut/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/OctopusDeploy/Halibut/blob/master/LICENSE</PackageLicenseUrl>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>True</Optimize>
@@ -41,15 +42,4 @@
     <DefineConstants>$(DefineConstants);NET40;HAS_REAL_PROXY;SUPPORTS_WEB_SOCKET_CLIENT</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="$(OutputPath)\net45\Halibut.pdb">
-      <Pack>true</Pack>
-      <PackagePath>lib\net45\</PackagePath>
-    </Content>
-    <Content Include="$(OutputPath)\netstandard1.5\Halibut.pdb">
-      <Pack>true</Pack>
-      <PackagePath>lib\netstandard1.5\</PackagePath>
-    </Content>
-  </ItemGroup>
-
 </Project>