fixed versioning issues; bumped to rc3; moved linker step to build script

Author: thefringeninja

Dockerfile

@@ -42,16 +42,9 @@ RUN TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \
   TRAVIS_BRANCH=$TRAVIS_BRANCH \
   dotnet run --project build/build.csproj
 
-FROM build as publish
-
-WORKDIR /src/SqlStreamStore.HAL.DevServer
-
-RUN dotnet add package ILLink.Tasks --version=0.1.5-preview-1841731 --source=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
-RUN dotnet publish --configuration=Release --output=/publish --runtime=alpine.3.7-x64 /p:ShowLinkerSizeComparison=true
-
 FROM microsoft/dotnet:2.1.5-runtime-deps-alpine3.7 AS runtime
 
 WORKDIR /app
-COPY --from=publish /publish ./
+COPY --from=build /publish ./
 
 ENTRYPOINT ["/app/SqlStreamStore.HAL.DevServer"]

NuGet.Config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="sql-stream-store" value="https://www.myget.org/F/sqlstreamstore/api/v3/index.json" />
+    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
 </configuration>
 

build/Program.cs

@@ -9,20 +9,22 @@
 static class Program
 {
     private const string ArtifactsDir = "artifacts";
+    private const string PublishDir = "publish";
 
     private const string Clean = nameof(Clean);
     private const string GenerateDocumentation = nameof(GenerateDocumentation);
     private const string Build = nameof(Build);
     private const string RunTests = nameof(RunTests);
     private const string Pack = nameof(Pack);
     private const string Publish = nameof(Publish);
+    private const string Push = nameof(Push);
 
     public static void Main(string[] args)
     {
         var buildNumber = GetBuildNumber();
         var branch = GetBranch();
         var commitHash = GetCommitHash();
-        var buildMetadata = $"build.{buildNumber}.{branch}.{commitHash}";
+        var buildMetadata = $"{branch}.{commitHash}";
         var apiKey = Environment.GetEnvironmentVariable("MYGET_API_KEY");
 
         Target(Clean, () =>
@@ -31,6 +33,11 @@ public static void Main(string[] args)
             {
                 Directory.Delete(ArtifactsDir, true);
             }
+            if (Directory.Exists(PublishDir))
+            {
+                Directory.Delete(PublishDir, true);
+            }
+
         });
 
         Target(
@@ -71,7 +78,7 @@ public static void Main(string[] args)
             DependsOn(GenerateDocumentation),
             () => Run(
                 "dotnet",
-                $"build src/SqlStreamStore.HAL.sln -c Release /p:BuildMetadata={buildMetadata}"));
+                $"build src/SqlStreamStore.HAL.sln -c Release /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata}"));
 
         Target(
             RunTests,
@@ -81,14 +88,21 @@ public static void Main(string[] args)
                 $"test src/SqlStreamStore.HAL.Tests -c Release -r ../../{ArtifactsDir} --verbosity normal --no-build -l trx;LogFileName=SqlStreamStore.HAL.Tests.xml"));
 
         Target(
-            Pack,
+            Publish,
             DependsOn(Build),
             () => Run(
                 "dotnet",
-                $"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} --no-build"));
+                $"publish --configuration=Release --output=../../{PublishDir} --runtime=alpine.3.7-x64 /p:ShowLinkerSizeComparison=true /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata} src/SqlStreamStore.HAL.DevServer "));
+        
+        Target(
+            Pack,
+            DependsOn(Publish),
+            () => Run(
+                "dotnet",
+                $"pack src/SqlStreamStore.HAL -c Release -o ../../{ArtifactsDir} /p:BuildNumber={buildNumber} /p:BuildMetadata={buildMetadata} --no-build"));
 
         Target(
-            Publish,
+            Push,
             DependsOn(Pack),
             () =>
             {
@@ -109,7 +123,7 @@ public static void Main(string[] args)
                 }
             });
 
-        Target("default", DependsOn(Clean, RunTests, Publish));
+        Target("default", DependsOn(Clean, RunTests, Push));
 
         RunTargets(args);
     }
@@ -127,5 +141,5 @@ private static string GetCommitHash()
            ?? "none";
 
     private static string GetBuildNumber()
-        => (Environment.GetEnvironmentVariable("TRAVIS_BUILD_NUMBER") ?? "0").PadLeft(5, '0');
+        => (Environment.GetEnvironmentVariable("TRAVIS_BUILD_NUMBER") ?? "0");
 }

src/Directory.Build.props

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
+    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
+    <BuildMetadata Condition="'$(BuildMetadata)' == ''">local</BuildMetadata>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>rc2</VersionSuffix>
+    <VersionSuffix>rc3.$(BuildNumber)</VersionSuffix>
     <InformationalVersion>$(VersionPrefix)-$(VersionSuffix)+$(BuildMetadata)</InformationalVersion>
     <Authors>João P. Bragança</Authors>
     <PackageProjectUrl>https://github.com/SqlStreamStore/SqlStreamStore.HAL</PackageProjectUrl>

src/SqlStreamStore.HAL.DevServer/SqlStreamStore.HAL.DevServer.csproj

@@ -8,6 +8,7 @@
     <CrossGenDuringPublish>false</CrossGenDuringPublish>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1841731" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />