Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit eb34c1e

Browse files
shanashana
authored
Merge pull request #100 from github-for-unity/shana/fixing-auth
Release 0.15-alpha
2 parents d31be66 + d426731 commit eb34c1e

File tree

17 files changed

+43
-30
lines changed

17 files changed

+43
-30
lines changed

‎common/build.targets

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<!-- Build flags -->
4-
<PropertyGroup>
5-
<SolutionType Condition="'$(SolutionName)' == 'GitHub.Unity.OctokitDebugging'">OctokitDebugging</SolutionType>
6-
<BuildType Condition="Exists('$(SolutionDir)\script\src\MetricsService.cs')">Internal</BuildType>
7-
8-
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
9-
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
10-
<UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
11-
<UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
12-
<BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
13-
</PropertyGroup>
14-
153
<!-- Common assembly properties (versioning) -->
164
<ItemGroup>
175
<Compile Include="$(SolutionDir)common\SolutionInfo.cs">
@@ -24,7 +12,7 @@
2412

2513
<!-- Common includes and references -->
2614
<Choose>
27-
<When Condition="$(SolutionType) == 'OctokitDebugging'">
15+
<When Condition="'$(SolutionType)' == 'OctokitDebugging'">
2816
<ItemGroup>
2917
<ProjectReference Include="$(SolutionDir)..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
3018
<Project>{9862694d-e4fa-418b-8692-a0280feddf36}</Project>
@@ -42,16 +30,19 @@
4230
<HintPath>$(SolutionDir)lib\octokit.net\Octokit.dll</HintPath>
4331
</Reference>
4432
<Reference Include="System.Net.Http">
45-
<HintPath>$(SolutionDir)lib\system.net.http_35\System.Net.Http.dll</HintPath>
33+
<HintPath>$(SolutionDir)lib\dotnet-httpclient35\System.Net.Http.dll</HintPath>
4634
</Reference>
4735
</ItemGroup>
4836
</Otherwise>
4937
</Choose>
5038

5139
<Target Name="BeforeBuild">
5240
<PropertyGroup>
53-
<ErrorText>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</ErrorText>
41+
<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>
42+
<MissingOctokitProject>To build the OctokitDebugging solution you need to have https://github.com/github-for-unity/octokit.net checked out in {0}</MissingOctokitProject>
43+
<MissingHttpProject>To build the OctokitDebugging solution you need to have https://github.com/github-for-unity/dotnet-httpclient35 checked out in {0}</MissingHttpProject>
5444
</PropertyGroup>
55-
<Error Condition="'$(UnityDir)' == ''" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)'))" />
45+
<Error Condition="'$(UnityDir)' == ''" Text="$([System.String]::Format('$(UnityDLLsMissingErrorText)', '$(SolutionDir)'))" />
46+
<Error Condition="$(SolutionType) == 'OctokitDebugging' and !Exists('$(SolutionDir)..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj')" Text="$([System.String]::Format('$(MissingOctokitProject)', '$(SolutionDir)..\dotnet-httpclient35'))" />
5647
</Target>
5748
</Project>

‎common/properties.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<!-- Build flags -->
4+
<PropertyGroup>
5+
<SolutionType Condition="'$(SolutionName)' == 'GitHub.Unity.OctokitDebugging'">OctokitDebugging</SolutionType>
6+
<BuildType Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">Internal</BuildType>
7+
8+
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
9+
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
10+
<UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
11+
<UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
12+
<BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
13+
</PropertyGroup>
14+
</Project>

‎lib/dotnet-httpClient35/System.Net.Http.dll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:420bdc3fdd9b3022f1a9a800a4e42709565ee64c0c88534259a6ea29f04f44ac
3+
size 123904

‎lib/dotnet-httpClient35/System.Net.Http.dll.mdb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:88304fa5cbd985a284e69e1c01effd5dfb1cdfcd0b773925c2a77a88849e8d62
3+
size 46996

‎lib/dotnet-httpClient35/md5sums.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
e15a0894ef162ec53566fa9c8211e583 *System.Net.Http.dll
2+
161847a9a61eb3cdab7a7706e83265a1 *System.Net.Http.dll.mdb

‎lib/dotnet-httpClient35/version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.5.0.0 3.5.22000.2-gfu 43d89b670547006521c95fc150d9b79506c208ca

‎lib/octokit.net/Octokit.dll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b8505b576308d2e03e825f94c9e9877c2f264e0ed4ecd8660e11cdcc91833e7b
2+
oid sha256:5d7e1ac6cbe61853a11fd3acd9e9a9de263bcba30cbd9af9dca65df15166495c
33
size 741888

‎lib/octokit.net/Octokit.dll.mdb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:284a267af8d47b2025e235fab86efbf9d96a4e985885283a5a3a65f27ca32aba
2+
oid sha256:4a8e19686a5a3cbfb76d26e08e07aa6faccb6218da946227a86a57f359fed25d
33
size 283050

‎lib/octokit.net/md5sums.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ecb6930236469c41a36dee6d84fcab7a *Octokit.dll
2+
2a41d96c1ad9229d8ff2f46b8847ec6a *Octokit.dll.mdb

‎lib/octokit.net/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.23.0.1 0.23.0.1-gfu ec0882345e0a2ee4743b84e8471dfa6fa7219ca3
1+
0.23.0.1 0.23.0.2-gfu 9784094cdd6192887dc97180918565c036c6b62c

0 commit comments

Comments
 (0)