#50 new build of SourceLink.MSBuild

ctaggart · May 6, 2015 · 4cfb751 · 4cfb751
1 parent db36545
commit 4cfb751
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ AssemblyInfo.cs
 /docs/files/img/SourceLink128.jpg
 /docs/SourceLink128.jpg
 *.sln.ide
-/gh-pages
+/gh-pages
+*.sdf
diff --git a/ConsoleTest/ConsoleTest.fsproj b/ConsoleTest/ConsoleTest.fsproj
@@ -180,6 +180,11 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp\lib\net40\NativeBinaries\x86
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
+        <Reference Include="SourceLink.Build.Utilities.Core">
+          <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.Utilities.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
         <Reference Include="SourceLink.Build">
           <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.dll</HintPath>
           <Private>True</Private>

diff --git a/Exe/Exe.fsproj b/Exe/Exe.fsproj
@@ -23,6 +23,10 @@
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <StartArguments>
+    </StartArguments>
+    <StartWorkingDirectory>
+    </StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +38,10 @@
     <PlatformTarget>x86</PlatformTarget>
     <DocumentationFile>bin\Release\SourceLink.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <StartArguments>
+    </StartArguments>
+    <StartWorkingDirectory>
+    </StartWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
@@ -186,6 +194,11 @@
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
+        <Reference Include="SourceLink.Build.Utilities.Core">
+          <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.Utilities.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
         <Reference Include="SourceLink.Build">
           <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.dll</HintPath>
           <Private>True</Private>

diff --git a/SourceLink/SourceLink.fsproj b/SourceLink/SourceLink.fsproj
@@ -138,6 +138,11 @@
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
+        <Reference Include="SourceLink.Build.Utilities.Core">
+          <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.Utilities.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
         <Reference Include="SourceLink.Build">
           <HintPath>..\packages\SourceLink.MSBuild\lib\net45\SourceLink.Build.dll</HintPath>
           <Private>True</Private>

diff --git a/build.config b/build.config
diff --git a/build.fsx b/build.fsx
@@ -15,7 +15,6 @@ let buildDate =
     let pst = TimeZoneInfo.FindSystemTimeZoneById "Pacific Standard Time"
     DateTimeOffset(TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, pst), pst.BaseUtcOffset)
 
-let cfg = getBuildConfig __SOURCE_DIRECTORY__
 let revision =
     use repo = new GitRepo(__SOURCE_DIRECTORY__)
     repo.Commit
@@ -31,7 +30,8 @@ let versionAssembly =
 
 let buildVersion =
     if hasRepoVersionTag then versionAssembly
-    else sprintf "%s-ci%s" versionAssembly (buildDate.ToString "yyMMddHHmm") // 20 char limit
+    else if isAppVeyorBuild then sprintf "%s-b%s" versionAssembly AppVeyorEnvironment.BuildNumber
+    else sprintf "%s-a%s" versionAssembly (buildDate.ToString "yyMMddHHmm") // 20 char limit
 
 MSBuildDefaults <- { MSBuildDefaults with Verbosity = Some MSBuildVerbosity.Minimal }
 
@@ -67,8 +67,8 @@ Target "SourceLink" <| fun _ ->
     printfn "starting SourceLink"
     let sourceIndex proj pdb =
         use repo = new GitRepo(__SOURCE_DIRECTORY__)
-        //let p = VsProj.LoadRelease proj
-        let p = VsProj.Load proj ["Configuration","Release"; "VisualStudioVersion","12.0"] // on AppVeyor
+        let p = VsProj.LoadRelease proj
+        //let p = VsProj.Load proj ["Configuration","Release"; "VisualStudioVersion","12.0"] // on AppVeyor
         let pdbToIndex = if Option.isSome pdb then pdb.Value else p.OutputFilePdb
         logfn "source indexing %s" pdbToIndex
         let files = p.Compiles -- "**/AssemblyInfo.fs"

diff --git a/paket.dependencies b/paket.dependencies
@@ -12,4 +12,4 @@ nuget FSharp.Core
 nuget LibGit2Sharp
 nuget Mono.Cecil
 nuget UnionArgParser
-nuget SourceLink.MSBuild
+nuget SourceLink.MSBuild 14.1.0-b043
diff --git a/paket.lock b/paket.lock
@@ -1,7 +1,7 @@
 NUGET
   remote: http://nuget.org/api/v2
   specs:
-    FAKE (3.30.3)
+    FAKE (3.31.0)
     FSharp.Compiler.Service (0.0.89)
     FSharp.Core (3.1.2.1)
     FSharp.Formatting (2.9.4)
@@ -19,7 +19,7 @@ NUGET
     UnionArgParser (0.8.7)
   remote: https://ci.appveyor.com/nuget/sourcelink-helmesfwai2a
   specs:
-    SourceLink.Fake (0.5.1-ci1504051942)
+    SourceLink.Fake (0.5.1-ci1505042129)
   remote: https://ci.appveyor.com/nuget/msbuild-kn0ejscjf29k
   specs:
-    SourceLink.MSBuild (14.1.0)
+    SourceLink.MSBuild (14.1.0-b043)