Merge pull request #5529 from piotrpMSFT/piotrpMSFT/merge/1.0.0-rc3

Merge 1.0.0-rc3
dotnet · Jan 31, 2017 · 41330f0 · 41330f0
2 parents 3eee54e + d2035ff
commit 41330f0
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -7,6 +7,6 @@
     <CLI_NuGet_Version>4.0.0-rtm-2241</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170120-3-249</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
-    <TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion>
+    <TemplateEngineVersion>1.0.0-beta1-20170126-102</TemplateEngineVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -57,11 +57,8 @@
       <Output TaskParameter="VersionMajor" PropertyName="VersionMajor" />
       <Output TaskParameter="VersionMinor" PropertyName="VersionMinor" />
       <Output TaskParameter="VersionPatch" PropertyName="VersionPatch" />
-      <Output TaskParameter="CommitCount" PropertyName="CommitCount" />
+      <Output TaskParameter="CommitCount" PropertyName="DefaultCommitCount" />
       <Output TaskParameter="ReleaseSuffix" PropertyName="ReleaseSuffix" />
-      <Output TaskParameter="VersionSuffix" PropertyName="VersionSuffix" />
-      <Output TaskParameter="SimpleVersion" PropertyName="SimpleVersion" />
-      <Output TaskParameter="NugetVersion" PropertyName="NugetVersion" />
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
       <Output TaskParameter="VersionBadgeMoniker" PropertyName="VersionBadgeMoniker" />
       <Output TaskParameter="Channel" PropertyName="Channel" />
@@ -73,6 +70,12 @@
     </GenerateNuGetPackagesArchiveVersion>
 
     <PropertyGroup>
+      <CommitCount Condition=" '$(CommitCount)' == '' ">$(DefaultCommitCount)</CommitCount>
+
+      <SimpleVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion>
+      <VersionSuffix>$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
+      <NugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix)</NugetVersion>
+
       <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
       <SdkVersion>$(NugetVersion)</SdkVersion>
 

diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -67,10 +67,25 @@
         <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" />
       </ItemGroup>
 
+      <PropertyGroup>
+        <NuGetConfigContent>
+          &lt;configuration&gt;
+            &lt;packageSources&gt;
+              &lt;add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /&gt;
+            &lt;/packageSources&gt;
+          &lt;/configuration&gt;
+        </NuGetConfigContent>
+        <LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
+      </PropertyGroup>
+
       <Delete Files="@(FilesToClean)" />
       <RemoveDir Directories="@(NuGetPackagesArchiveDirectory)" />
       <MakeDir Directories="@(NuGetPackagesArchiveDirectory)"/>
 
+      <WriteLinesToFile Condition=" 'CLI_LZMA_PACKAGE_SOURCE' != '' "
+                        File="$(LZMANuGetConfigFilePath)" 
+                        Lines="$(NuGetConfigContent)" />
+
       <DotNetNew ToolPath="$(Stage2Directory)"
                  TemplateType="Web"
                  WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />

diff --git 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
@@ -9,6 +9,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
   </ItemGroup>
 </Project>
diff --git 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 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
   </ItemGroup>
 </Project>
diff --git a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" />
     <PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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
@@ -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()