Merge pull request #39 from petabridge/dev

v0.1.3 Release

Author: Aaronontheweb

RELEASE_NOTES.md

@@ -1,3 +1,3 @@
-#### 0.1.2 November 18 2019 ####
-* [Resolved: case insensitive HTTP headers](https://github.com/petabridge/Petabridge.Tracing.ApplicationInsights/issues/22)
-* Updated all underlying dependencies.
+#### 0.1.3 January 29 2020 ####
+* Updated to latest Application Insights driver (2.12.1)
+* Updated to latest Akka.NET version (1.3.17)

build.fsx

@@ -14,23 +14,29 @@ let product = "Petabridge.Library"
 let configuration = "Release"
 
 // Metadata used when signing packages and DLLs
-let signingName = "Petabridge.Tracing.Zipkin"
-let signingDescription = "Zipkin dristributed tracing engine driver, developed by Petabridge®"
-let signingUrl = "https://github.com/petabridge/Petabridge.Tracing.Zipkin"
+let signingName = "Petabridge.Tracing.ApplicationInsights"
+let signingDescription = "OpenTracing-compatible ApplicationInsights tracing engine driver, developed by Petabridge®"
+let signingUrl = "https://github.com/petabridge/Petabridge.Tracing.ApplicationInsights"
 
 // Read release notes and version
 let solutionFile = FindFirstMatchingFile "*.sln" __SOURCE_DIRECTORY__  // dynamically look up the solution
 let buildNumber = environVarOrDefault "BUILD_NUMBER" "0"
 let hasTeamCity = (not (buildNumber = "0")) // check if we have the TeamCity environment variable for build # set
 let preReleaseVersionSuffix = "beta" + (if (not (buildNumber = "0")) then (buildNumber) else DateTime.UtcNow.Ticks.ToString())
+let releaseNotes =
+    File.ReadLines (__SOURCE_DIRECTORY__ @@ "RELEASE_NOTES.md")
+    |> ReleaseNotesHelper.parseReleaseNotes
+
+let versionFromReleaseNotes =
+    match releaseNotes.SemVer.PreRelease with
+    | Some r -> r.Origin
+    | None -> ""
+
 let versionSuffix = 
     match (getBuildParam "nugetprerelease") with
     | "dev" -> preReleaseVersionSuffix
-    | _ -> ""
-
-let releaseNotes =
-    File.ReadLines "./RELEASE_NOTES.md"
-    |> ReleaseNotesHelper.parseReleaseNotes
+    | "" -> versionFromReleaseNotes
+    | str -> str
 
 // Directories
 let toolsDir = __SOURCE_DIRECTORY__ @@ "tools"
@@ -152,7 +158,7 @@ Target "SignPackages" (fun _ ->
     if(canSign) then
         log "Signing information is available."
 
-        let assemblies = !! (outputNuGet @@ "*.nupkg")
+        let assemblies = !! (outputNuGet @@ "*.**upkg")
 
         let signPath =
             let globalTool = tryFindFileOnPath "SignClient.exe"
@@ -218,22 +224,13 @@ Target "CreateNuget" (fun _ ->
 )
 
 Target "PublishNuget" (fun _ ->
-    let projects = !! "./bin/nuget/*.nupkg" -- "./bin/nuget/*.symbols.nupkg"
+    let projects = !! "./bin/nuget/*.**upkg"
     let apiKey = getBuildParamOrDefault "nugetkey" ""
     let source = getBuildParamOrDefault "nugetpublishurl" ""
-    let symbolSource = getBuildParamOrDefault "symbolspublishurl" ""
+    let symbolSource = source
     let shouldPublishSymbolsPackages = not (symbolSource = "")
 
     if (not (source = "") && not (apiKey = "") && shouldPublishSymbolsPackages) then
-        let runSingleProject project =
-            DotNetCli.RunCommand
-                (fun p -> 
-                    { p with 
-                        TimeOut = TimeSpan.FromMinutes 10. })
-                (sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource)
-
-        projects |> Seq.iter (runSingleProject)
-    else if (not (source = "") && not (apiKey = "") && not shouldPublishSymbolsPackages) then
         let runSingleProject project =
             DotNetCli.RunCommand
                 (fun p -> 
@@ -242,6 +239,7 @@ Target "PublishNuget" (fun _ ->
                 (sprintf "nuget push %s --api-key %s --source %s" project apiKey source)
 
         projects |> Seq.iter (runSingleProject)
+
 )
 
 //--------------------------------------------------------------------------------

src/Petabridge.Tracing.ApplicationInsights.Demo/Petabridge.Tracing.ApplicationInsights.Demo.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.3.16" />
+    <PackageReference Include="Akka" Version="1.3.17" />
   </ItemGroup>
 
   <ItemGroup>

src/Petabridge.Tracing.ApplicationInsights.Tests/Petabridge.Tracing.ApplicationInsights.Tests.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />

src/Petabridge.Tracing.ApplicationInsights/Petabridge.Tracing.ApplicationInsights.csproj

@@ -13,7 +13,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.11.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.12.1" />
     <PackageReference Include="OpenTracing" Version="0.12.1" />
   </ItemGroup>
 

src/common.props

@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2018 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>0.1.2</VersionPrefix>
-    <PackageReleaseNotes>[Resolved: case insensitive HTTP headers](https://github.com/petabridge/Petabridge.Tracing.ApplicationInsights/issues/22)
-Updated all underlying dependencies.</PackageReleaseNotes>
+    <VersionPrefix>0.1.3</VersionPrefix>
+    <PackageReleaseNotes>Updated to latest Application Insights driver (2.12.1)
+Updated to latest Akka.NET version (1.3.17)</PackageReleaseNotes>
     <PackageIconUrl>
     </PackageIconUrl>
     <PackageIconUrl>https://petabridge.com/images/logo.png</PackageIconUrl>
@@ -17,4 +17,12 @@ Updated all underlying dependencies.</PackageReleaseNotes>
     <TestSdkVersion>15.7.2</TestSdkVersion>
     <NBenchVersion>1.2.2</NBenchVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
 </Project>