From c1da83637e6b328c7abbc37f3cd866a84a116d86 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Wed, 8 Aug 2018 07:55:02 -0700
Subject: [PATCH 1/2] fix jdk detection by detecting javac instead of tools.jar
 (#2751)

---
 build/repo.targets | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 01af2b6ca5..32d47b4db7 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -10,6 +10,14 @@
     </NPMPackage>
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(JAVA_HOME)' != ''">
+    <!-- Determine the path we need to search to find javac.exe -->
+    <JavacPath Condition="'$(OS)' == 'Windows_NT'">$(JAVA_HOME)\bin\javac.exe</JavacPath>
+    <JavacPath Condition="'$(OS)' != 'Windows_NT'">$(JAVA_HOME)/bin/javac</JavacPath>
+
+    <HasJdk Condition="Exists('$(JavacPath)')">true</HasJdk>
+  </PropertyGroup>
+
   <PropertyGroup>
     <RestoreDependsOn>$(RestoreDependsOn);RestoreNpm</RestoreDependsOn>
   </PropertyGroup>
@@ -35,7 +43,7 @@
     <Exec Command="npm run test:inner -- --no-color --configuration $(Configuration)" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
-  <Target Name="RunJavaTests" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')">
+  <Target Name="RunJavaTests" Condition="'$(HasJdk)' == 'true'">
     <Message Text="Running Java client tests" Importance="high" />
     <Exec Command="./gradlew test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
   </Target> 
@@ -66,7 +74,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GetJavaArtifactInfo" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')">
+  <Target Name="GetJavaArtifactInfo" Condition="'$(HasJdk)' == 'true'">
     <ItemGroup>
       <ArtifactInfo Include="$(BuildDir)\%(Jars.Identity)">
         <ArtifactType>JavaJar</ArtifactType>
@@ -96,7 +104,7 @@
     <Exec Command="npm run build" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
-  <Target Name="BuildJavaClient" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')" DependsOnTargets="GetJavaArtifactInfo">
+  <Target Name="BuildJavaClient" Condition="'$(HasJdk)' == 'true'" DependsOnTargets="GetJavaArtifactInfo">
     <Message Text="Building Java client" Importance="high" />
     <Exec Command="./gradlew compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
   </Target>
@@ -126,7 +134,7 @@
     <PomFile Include="signalr-client-$(JavaClientVersion).pom" />
   </ItemGroup>
 
-  <Target Name="PackJavaClient" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')">
+  <Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
     <Message Text="Packing Java client" Importance="high" />
     <Exec Command="./gradlew jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
     <Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" />

From b9f6fb97f2ebfe6f1800684cd573e034e9959b59 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Wed, 8 Aug 2018 09:29:09 -0700
Subject: [PATCH 2/2] fix merge conflict

---
 clients/ts/package-lock.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/clients/ts/package-lock.json b/clients/ts/package-lock.json
index a6aa5ea493..0a2c01265d 100644
--- a/clients/ts/package-lock.json
+++ b/clients/ts/package-lock.json
@@ -1,9 +1,6 @@
 {
   "name": "client-ts",
   "version": "0.0.0",
-<<<<<<< HEAD
-  "lockfileVersion": 1
-=======
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8952,5 +8949,4 @@
       }
     }
   }
->>>>>>> release/2.1
 }