From b9bda24854cda90e05cb942be6b4756f7453399b Mon Sep 17 00:00:00 2001
From: Ruben Bartelink <ruben@bartelink.com>
Date: Thu, 25 Oct 2018 14:17:41 +0100
Subject: [PATCH] Tidy scripts

---
 CallPolly.sln                                  |  1 +
 Directory.Build.props                          | 11 ++---------
 build.proj                                     | 18 +++++++-----------
 .../CallPolly.Acceptance.fsproj                | 14 +++++++-------
 tests/CallPolly.Tests/CallPolly.Tests.fsproj   | 14 +++++++-------
 5 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/CallPolly.sln b/CallPolly.sln
index d1310c0..fdbb7b0 100644
--- a/CallPolly.sln
+++ b/CallPolly.sln
@@ -11,6 +11,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CallPolly.Tests", "tests\Ca
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{6047ADD6-C48C-4583-A5C6-58FDF7A0DC10}"
 	ProjectSection(SolutionItems) = preProject
+		azure-pipelines.yml = azure-pipelines.yml
 		build.proj = build.proj
 		build.ps1 = build.ps1
 		Directory.Build.props = Directory.Build.props
diff --git a/Directory.Build.props b/Directory.Build.props
index 0f3e405..cf30f28 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,22 +3,15 @@
     <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>
+    <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>
-
-  <!-- Hacks to disable things for mono builds -->
-  <PropertyGroup>
-    <MonoOrEmpty Condition=" '$(OS)' != 'Windows_NT' ">mono </MonoOrEmpty>
-
     <!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
     <EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
     <EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
diff --git a/build.proj b/build.proj
index bd08bdc..e8354c3 100644
--- a/build.proj
+++ b/build.proj
@@ -1,29 +1,25 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build;Test">
 
   <Import Project="Directory.Build.props" />
-  
+
   <PropertyGroup>
 
     <Name>CallPolly</Name>
     <Cfg>--configuration Release</Cfg>
 
-    <RepoRootDir>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</RepoRootDir>
-    <Bin>-o $(RepoRootDir)bin</Bin>
-    <Ver>--version-suffix "$(VersionSuffix)"</Ver>
-
-    <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>
+    <ThisDirAbsolute>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</ThisDirAbsolute>
+    <PackOptions>-o $(ThisDirAbsolute)bin --version-suffix "$(VersionSuffix)"</PackOptions>
+    <TestOptions>--logger:trx</TestOptions>
 
   </PropertyGroup>
 
   <Target Name="Build">
-    <Exec Command="dotnet pack src/$(Name) $(Cfg) $(Bin) $(Ver)" />
+    <Exec Command="dotnet pack src/$(Name) $(Cfg) $(PackOptions)" />
   </Target>
 
   <Target Name="Test">
-    <Exec Command="dotnet test tests/$(Name).Tests $(Cfg) --logger:trx" />
-    <Exec Command="dotnet test tests/$(Name).Acceptance $(Cfg) --logger:trx" />
+    <Exec Command="dotnet test tests/$(Name).Tests $(Cfg) $(TestOptions)" />
+    <Exec Command="dotnet test tests/$(Name).Acceptance $(Cfg) $(TestOptions)" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/tests/CallPolly.Acceptance/CallPolly.Acceptance.fsproj b/tests/CallPolly.Acceptance/CallPolly.Acceptance.fsproj
index 37f9fbd..a065967 100644
--- a/tests/CallPolly.Acceptance/CallPolly.Acceptance.fsproj
+++ b/tests/CallPolly.Acceptance/CallPolly.Acceptance.fsproj
@@ -16,13 +16,10 @@
     <Compile Include="..\CallPolly.Tests\Infrastructure.fs" Link="Infrastructure.fs" />
     <Compile Include="Scenarios.fs" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <!-- Workaround for https://github.com/xunit/xunit/issues/1357 -->
-    <Content Include="xunit.runner.json" Condition=" '$(OS)' != 'Windows_NT' ">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>  
+    <ProjectReference Include="..\..\src\CallPolly\CallPolly.fsproj" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
@@ -35,8 +32,11 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
+  <!-- Workaround for https://github.com/xunit/xunit/issues/1357 -->
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CallPolly\CallPolly.fsproj" />
+    <Content Include="xunit.runner.json" Condition=" '$(OS)' != 'Windows_NT' ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>
diff --git a/tests/CallPolly.Tests/CallPolly.Tests.fsproj b/tests/CallPolly.Tests/CallPolly.Tests.fsproj
index 3f4a682..638de4b 100644
--- a/tests/CallPolly.Tests/CallPolly.Tests.fsproj
+++ b/tests/CallPolly.Tests/CallPolly.Tests.fsproj
@@ -13,13 +13,10 @@
     <Compile Include="ParsingTests.fs" />
     <Compile Include="RulesTests.fs" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <!-- Workaround for https://github.com/xunit/xunit/issues/1357 -->
-    <Content Include="xunit.runner.json" Condition=" '$(OS)' != 'Windows_NT' ">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>  
+    <ProjectReference Include="..\..\src\CallPolly\CallPolly.fsproj" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
@@ -31,8 +28,11 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
+  <!-- Workaround for https://github.com/xunit/xunit/issues/1357 -->
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CallPolly\CallPolly.fsproj" />
+    <Content Include="xunit.runner.json" Condition=" '$(OS)' != 'Windows_NT' ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>