From 69dc7a4b23dbe52de919f03d2cbf269f44829506 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 20 Dec 2017 16:10:33 -0800
Subject: [PATCH] Revert package version to 1.0.0-preview1 and update build
 tools

---
 .travis.yml                                   |  5 +--
 build/repo.props                              |  1 +
 ...rosoft.AspNetCore.SignalR.Client.TS.csproj | 31 ++++++++++++-------
 client-ts/package-lock.json                   |  2 +-
 client-ts/package.json                        |  2 +-
 korebuild-lock.txt                            |  4 +--
 korebuild.json                                |  2 +-
 version.props                                 |  2 +-
 8 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c90a7cb24f..1656e98760 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1
     - SIGNALR_TESTS_VERBOSE: 1
-    - TRAVIS_NODE_VERSION: 8.0.0
+    - TRAVIS_NODE_VERSION: 8.9.3
 mono: none
 os:
   - linux
@@ -26,7 +26,8 @@ branches:
     - /^(.*\/)?ci-.*$/
     - /^rel\/.*/
 before_install:
+  - nvm install $TRAVIS_NODE_VERSION
   # Pull redis docker image so when test creates container it doesn't time out
-  - if test "$TRAVIS_OS_NAME" == "linux"; then nvm install $TRAVIS_NODE_VERSION; docker pull redis; fi
+  - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi
 script:
   - ./build.sh
diff --git a/build/repo.props b/build/repo.props
index a69db5bf9a..a360290f46 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,6 +8,7 @@
   <ItemGroup>
     <ProjectsToPack Include="$(RepositoryRoot)client-ts\Microsoft.AspNetCore.SignalR.Client.TS\*.csproj" />
   </ItemGroup>
+
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
diff --git a/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
index 191f8862b0..990d154730 100644
--- a/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
@@ -5,8 +5,11 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
   <PropertyGroup>
     <SignalRClientDistFolder>$(MSBuildThisFileDirectory)..\dist\</SignalRClientDistFolder>
+    <OutputFileName>aspnet-signalr-client-$(PackageVersion).tgz</OutputFileName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,26 +33,30 @@
     <RemoveDir Directories="$(SignalRClientDistFolder)" />
   </Target>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <Target Name="Pack">
     <Message Text="Creating TypeScript client Node module" Importance="High" />
-    <Exec Command="node -pe &quot;require('./package.json').version&quot;" ConsoleToMSBuild="true" WorkingDirectory="$(MSBuildThisFileDirectory)..">
-      <Output TaskParameter="ConsoleOutput" ItemName="ExecOutput" />
-    </Exec>
+
     <PropertyGroup>
-      <ModuleVersion>@(ExecOutput)</ModuleVersion>
-      <ModuleVersion Condition="'$(VersionSuffix)' != ''">$(ModuleVersion)-$(VersionSuffix)</ModuleVersion>
       <IsGitRepository Condition="EXISTS('$(MSBuildThisFileDirectory)..\..\.git\HEAD')">true</IsGitRepository>
       <IsGitRepository Condition="'$(IsGitRepository)'==''">false</IsGitRepository>
     </PropertyGroup>
-    <Exec Command="npm version $(ModuleVersion)" WorkingDirectory="$(MSBuildThisFileDirectory).." Condition="'$(VersionSuffix)' != ''" />
-    <Exec Command="npm pack" WorkingDirectory="$(MSBuildThisFileDirectory).." />
-    <Exec Command="git checkout HEAD -- &quot;$(MSBuildThisFileDirectory)../package.json&quot;" Condition="$(IsGitRepository) AND '$(VersionSuffix)' != ''" />
-    <Exec Command="git checkout HEAD -- &quot;$(MSBuildThisFileDirectory)../package-lock.json&quot;" Condition="$(IsGitRepository) AND '$(VersionSuffix)' != ''" />
+
+    <Exec Command="npm version $(PackageVersion) --allow-same-version" WorkingDirectory="$(MSBuildThisFileDirectory)..\" />
+    <Exec Command="npm pack" WorkingDirectory="$(MSBuildThisFileDirectory)..\" />
+    <Exec Command="git checkout HEAD -- &quot;$(MSBuildThisFileDirectory)../package.json&quot;" Condition="$(IsGitRepository)" />
+    <Exec Command="git checkout HEAD -- &quot;$(MSBuildThisFileDirectory)../package-lock.json&quot;" Condition="$(IsGitRepository)" />
+    <Move SourceFiles="$(MSBuildThisFileDirectory)..\$(OutputFileName)" DestinationFolder="$(PackageOutputPath)" />
+  </Target>
+
+  <!-- Provides information to the bill of materials about expected outputs. -->
+  <Target Name="GetNpmArtifactInfo" BeforeTargets="GetArtifactInfo" Returns="@(ArtifactInfo)">
     <ItemGroup>
-      <TSClient Include="$(MSBuildThisFileDirectory)../aspnet-signalr-client*.tgz" />
+      <ArtifactInfo Include="$(PackageOutputPath)$(OutputFileName)">
+        <ArtifactType>NpmPackage</ArtifactType>
+        <PackageId>@aspnet/signalr-client</PackageId>
+        <Version>$(PackageVersion)</Version>
+      </ArtifactInfo>
     </ItemGroup>
-    <Move SourceFiles="@(TSClient)" DestinationFolder="$(PackageOutputPath)" />
   </Target>
 </Project>
diff --git a/client-ts/package-lock.json b/client-ts/package-lock.json
index 2ea73c4c1c..abf6111b6f 100644
--- a/client-ts/package-lock.json
+++ b/client-ts/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@aspnet/signalr-client",
-  "version": "1.0.0",
+  "version": "1.0.0-preview1-t000",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/client-ts/package.json b/client-ts/package.json
index 62289d6820..518e16e2e4 100644
--- a/client-ts/package.json
+++ b/client-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aspnet/signalr-client",
-  "version": "1.0.0",
+  "version": "1.0.0-preview1-t000",
   "description": "ASP.NET Core SignalR",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index fe4a961da3..412ed41b40 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15620
-commithash:6432b49a2c00310416df39b6fe548ef4af9c6011
+version:2.1.0-preview1-15640
+commithash:d6afce1c3b1f25f1b9d3587c21475dad25af4ef5
diff --git a/korebuild.json b/korebuild.json
index 147edd8750..19b76654e1 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -4,7 +4,7 @@
   "toolsets": {
     "nodejs": {
       "required": true,
-      "minVersion": "6.9"
+      "minVersion": "8.0"
     }
   }
 }
diff --git a/version.props b/version.props
index 8542e1aae1..9c41ddb9fa 100644
--- a/version.props
+++ b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
     <VersionSuffix>preview1</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>