Sync SourceLink, XmlDoc, build.proj

jet · Oct 22, 2018 · 5e9f769 · 5e9f769
1 parent e0032b3
commit 5e9f769
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/CallPolly.sln b/CallPolly.sln
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{6047ADD6-C48C-4583-A5C6-58FDF7A0DC10}"
 	ProjectSection(SolutionItems) = preProject
 		build.cmd = build.cmd
+		build.proj = build.proj
 		Directory.Build.props = Directory.Build.props
 		global.json = global.json
 		LICENSE = LICENSE

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,11 +4,14 @@
     <Authors>@jet @bartelink and contributors</Authors>
     <Company>Jet.com</Company>
     <Description>Apply systemwide resilience strategies consistently across subsystems, standing on Polly's shoulders</Description>
-    <PackageProjectUrl>https://github.com/jet/CallPolly</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/jet/CallPolly</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://github.com/jet/callpolly</PackageProjectUrl>
     <PackageTags>polly bulkhead circuitbreaker timeout fsharp</PackageTags>
-    <PackageLicenseUrl>https://github.com/jet/CallPolly/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/jet/callpolly/blob/master/LICENSE</PackageLicenseUrl>
     <Copyright>Copyright © 2018</Copyright>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 </Project>
diff --git a/build.cmd b/build.cmd
@@ -1,2 +1 @@
-dotnet pack build.proj /p:BN=%1 /p:PR=%2
-dotnet test build.proj -v n
+dotnet msbuild build.proj %*
diff --git a/build.proj b/build.proj
@@ -1,29 +1,26 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0" DefaultTargets="Build;Test">
 
   <PropertyGroup>
 
     <Name>CallPolly</Name>
-
+    <Cfg>--configuration Release</Cfg>
+    <Bin>-o $(RepoRootDir)bin</Bin>
+
     <RepoRootDir>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</RepoRootDir>
 
-    <BuildNumber Condition="'$(BN)' != ''">$([System.String]::Format('{0:0000000}',$([MSBuild]::Add($(BN), 0))))</BuildNumber>
-    <Suffix Condition=" '$(BuildNumber)' != '' AND '$(PR)' != ''">--version-suffix CI$(BuildNumber)-pr$(PR)</Suffix>
-    <Suffix Condition=" '$(BuildNumber)' != '' AND '$(PR)' == ''">--version-suffix CI$(BuildNumber)</Suffix>    
+    <BuildNumber Condition="'$(BuildNumber)' != ''">$([System.String]::Format('{0:0000000}',$([MSBuild]::Add($(BuildNumber), 0))))</BuildNumber>
+    <Suffix Condition=" '$(BuildNumber)' != '' AND '$(PullRequestId)' != ''">--version-suffix CI$(BuildNumber)-pr$(PullRequestId)</Suffix>
+    <Suffix Condition=" '$(BuildNumber)' != '' AND '$(PullRequestId)' == ''">--version-suffix CI$(BuildNumber)</Suffix>
 
   </PropertyGroup>
 
   <Target Name="Build">
-    <Exec Command="dotnet build src/$(Name) --configuration Release $(Suffix)" WorkingDirectory="$(RepoRootDir)" />
-  </Target>
-
-  <Target Name="Pack">
-    <Exec Command="dotnet pack src/$(Name) --configuration Release -o $(RepoRootDir)bin $(Suffix)" WorkingDirectory="$(RepoRootDir)" />
+    <Exec Command="dotnet pack src/$(Name) $(Cfg) $(Bin) $(Suffix)" />
   </Target>
 
   <Target Name="Test">
-    <Exec Command='dotnet test tests/$(Name).Tests --configuration Release' WorkingDirectory="$(RepoRootDir)" />
-    <Exec Command='dotnet test tests/$(Name).Acceptance --configuration Release' WorkingDirectory="$(RepoRootDir)" />
+    <Exec Command="dotnet test tests/$(Name).Tests $(Cfg)" />
+    <Exec Command="dotnet test tests/$(Name).Acceptance $(Cfg)" />
   </Target>
-  <Target Name="VSTest" DependsOnTargets="Test" />
 
 </Project>
diff --git a/src/CallPolly/CallPolly.fsproj b/src/CallPolly/CallPolly.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <WarningLevel>5</WarningLevel>
     <IsTestProject>false</IsTestProject>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -18,7 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+    <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <PackageReference Include="Jet.JsonNet.Converters" Version="0.0.3-CI69140" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />