diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index 9391f07a44..87227cb71b 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -7,6 +7,6 @@
4.0.0-rtm-2241
1.0.0-alpha-20170120-3-249
15.0.0-preview-20170125-04
- 1.0.0-beta1-20170108-83
+ 1.0.0-beta1-20170126-102
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 84b8ac3fc2..2ef0f46926 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -57,11 +57,8 @@
-
+
-
-
-
@@ -73,6 +70,12 @@
+ $(DefaultCommitCount)
+
+ $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)
+ $(ReleaseSuffix)-$(CommitCount)
+ $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix)
+
$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg
$(NugetVersion)
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index 06cae3ffcd..0f219f9e02 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -67,10 +67,25 @@
+
+
+ <configuration>
+ <packageSources>
+ <add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" />
+ </packageSources>
+ </configuration>
+
+ $(NuGetPackagesArchiveProject)/Nuget.config
+
+
+
+
diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh
index 3b6b4133a6..b478a2a105 100755
--- a/scripts/dockerrun.sh
+++ b/scripts/dockerrun.sh
@@ -133,5 +133,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
-e CHECKSUM_STORAGE_ACCOUNT \
-e CHECKSUM_STORAGE_CONTAINER \
-e CLIBUILD_SKIP_TESTS \
+ -e CommitCount \
$DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@"
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj
index 35d10cc4c2..fe8e903d9c 100644
--- a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj
@@ -9,6 +9,6 @@
-
+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj
index 17ceafd29b..d47c2a3c40 100644
--- a/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj
@@ -6,9 +6,9 @@
-
+
-
+
diff --git a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
index 6c1ac726bd..5d64ddfc6a 100644
--- a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
@@ -20,7 +20,7 @@
-
+
diff --git a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs
index f89bca7cd9..c3599bab81 100644
--- a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs
+++ b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs
@@ -42,10 +42,6 @@ public void TemplateRestoresAndBuildsWithoutWarnings(
File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config"));
}
- string globalJsonPath = Path.Combine(rootPath, "global.json");
- Assert.True(File.Exists(globalJsonPath));
- Assert.Contains(Product.Version, File.ReadAllText(globalJsonPath));
-
new TestCommand("dotnet")
.WithWorkingDirectory(rootPath)
.Execute($"restore")
diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
index 9fe46af73d..43b7fbe37a 100644
--- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
+++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -82,7 +82,7 @@ public void ItCreatesASentinelFileUnderTheNuGetCacheFolder()
{
_nugetCacheFolder
.Should()
- .HaveFile($"{GetDotnetVersion()}.dotnetSentinel");
+ .HaveFile($"{GetDotnetVersion()}.dotnetSentinel");
}
[Fact]
@@ -116,7 +116,7 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder()
_nugetCacheFolder
.GetDirectory("microsoft.aspnetcore.mvc")
- .Should().HaveDirectories(new string[] { "1.0.2", "1.1.0" });
+ .Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" });
}
private string GetDotnetVersion()