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

Commit 1b3720c

Browse files
committed
Merge branch 'fixes/tls12' into releases/0.26
2 parents f3516a8 + 9de6b3d commit 1b3720c

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

common/properties.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files\Unity\Editor\Data\Managed\</UnityDir>
1111
<UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
1212
<UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
13-
<BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
13+
<BuildConfig Condition=" '$(Configuration)' == 'dev'">Debug</BuildConfig>
14+
<BuildConfig Condition=" '$(Configuration)' != 'dev'">$(Configuration)</BuildConfig>
1415
</PropertyGroup>
1516
</Project>

package.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ if not exist "%Unity%" (
3939
cd ..
4040

4141
call common\nuget.exe restore GitHub.Unity.sln
42+
echo xbuild GitHub.Unity.sln /target:OctoRun /property:Configuration=%Configuration%
43+
call xbuild GitHub.Unity.sln /target:OctoRun /property:Configuration=%Configuration%
44+
4245
echo xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4346
call xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4447

package.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ else
5151
nuget restore GitHub.Unity.sln
5252
fi
5353

54+
xbuild GitHub.Unity.sln /target:OctoRun /property:Configuration=$Configuration
5455
xbuild GitHub.Unity.sln /property:Configuration=$Configuration
5556

5657
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*

0 commit comments

Comments
 (0)