diff --git a/build.cake b/build.cake
index 8f055180de..d6ab7e5f3f 100644
--- a/build.cake
+++ b/build.cake
@@ -91,13 +91,17 @@ Task("Pack")
         DotNetCorePack($"{path}/{name}/{name}.csproj", new DotNetCorePackSettings {
             Configuration = parameters.Configuration,
             VersionSuffix = parameters.VersionSuffix,
-            OutputDirectory = $"{parameters.Artifacts}/nuget"
+            OutputDirectory = $"{parameters.Artifacts}/nuget",
+            EnvironmentVariables = new Dictionary<string, string>
+            {
+                { "VERSION", parameters.Version }
+            }
         });
     }
 });
 
 Task("Push")
-    //.WithCriteria<Parameters>((context, parameters) => parameters.PushNuGet)
+    .WithCriteria<Parameters>((context, parameters) => parameters.PushNuGet)
     .Does<Parameters>(parameters => 
 {
     var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY");
diff --git a/parameters.cake b/parameters.cake
index ea679abc31..f182559175 100644
--- a/parameters.cake
+++ b/parameters.cake
@@ -4,6 +4,7 @@ public class Parameters
     public string Configuration { get; private set; }
     public string Artifacts { get; private set; }
     public string VersionSuffix { get; private set; }
+    public string Version { get; private set; } = "0.7.0";
     public string NuGetPushBranch { get; private set; }
     public string NuGetPushRepoName { get; private set; }
     public bool PushNuGet { get; private set; }
@@ -21,7 +22,7 @@ public class Parameters
         VersionSuffix = context.Argument("suffix", default(string));
         if (VersionSuffix == null)
         {
-            var build = context.EnvironmentVariable("Build.BuildNumber");
+            var build = context.EnvironmentVariable("BUILD_BUILDNUMBER");
             VersionSuffix = build != null ? $"-build{build}" : "";
         }