Merge pull request #599 from github-for-unity/features/octorun-js

Octorun Js

Author: shana

GitHub.Unity.OctokitDebugging.sln

@@ -14,31 +14,6 @@
   </ItemGroup>
 
   <!-- Common includes and references -->
-  <Choose>
-    <When Condition="'$(SolutionType)' == 'OctokitDebugging'">
-      <ItemGroup>
-        <ProjectReference Include="$(SolutionDir)..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
-          <Project>{9862694d-e4fa-418b-8692-a0280feddf36}</Project>
-          <Name>System.Net.Http-net_3_5</Name>
-        </ProjectReference>
-        <ProjectReference Include="$(SolutionDir)..\octokit.net\Octokit\Octokit-35.csproj">
-          <Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
-          <Name>Octokit-35</Name>
-        </ProjectReference>
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Octokit">
-          <HintPath>$(SolutionDir)lib\octokit.net\Octokit.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Net.Http">
-          <HintPath>$(SolutionDir)lib\dotnet-httpclient35\DotNetHttp35.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
   <Target Name="BeforeBuild">
     <PropertyGroup>
       <UnityDLLsMissingErrorText>Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder</UnityDLLsMissingErrorText>

common/build.targets

@@ -2,15 +2,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Build flags -->
   <PropertyGroup>
-    <SolutionType Condition="'$(SolutionName)' == 'GitHub.Unity.OctokitDebugging'">OctokitDebugging</SolutionType>
     <BuildType Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">Internal</BuildType>
 
     <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
     <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
     <UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files\Unity\Editor\Data\Managed\</UnityDir>
     <UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
     <UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
-    <BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
+    <BuildConfig Condition=" '$(Configuration)' == 'dev'">Debug</BuildConfig>
+    <BuildConfig Condition=" '$(Configuration)' != 'dev'">$(Configuration)</BuildConfig>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">