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

Commit 5d50bc1

Browse files
shanashana
committed
Editor/GitHub -> GitHub/Editor
1 parent dcfbac8 commit 5d50bc1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+331
-202
lines changed

‎build.cmd

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,34 @@ if not %2.==. (
1212
)
1313

1414
if %Target%==Rebuild (
15-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.dll
16-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.mdb
17-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.pdb
18-
19-
if exist "..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub" (
20-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.dll
21-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.mdb
22-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.pdb
15+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.dll
16+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.mdb
17+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
18+
19+
if exist "..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor" (
20+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.dll
21+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.mdb
22+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.pdb
2323
)
2424
)
2525

2626
call common\nuget.exe restore GitHub.Unity.sln
27+
2728
echo xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
2829
call xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
2930

30-
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Editor\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Editor
31-
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Editor\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Editor
31+
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
32+
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
33+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
34+
35+
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
36+
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
3237

33-
del /Q unity\PackageProject\Assets\Editor\GitHub\deleteme*
34-
del /Q unity\PackageProject\Assets\Editor\GitHub\deleteme*
35-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.xml
38+
echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
39+
call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
3640

37-
if exist ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub (
38-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\deleteme*
39-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\deleteme*
40-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub\*.xml
41+
if exist ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor (
42+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
43+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
44+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.xml
4145
)

‎build.sh

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ if [ $# -gt 1 ]; then
1010
fi
1111

1212
if [ x"$Target" == x"Rebuild" ]; then
13-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.dll
14-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.mdb
15-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.pdb
16-
17-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub ]; then
18-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.dll
19-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.mdb
20-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.pdb
13+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.dll
14+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.mdb
15+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
16+
17+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
18+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.dll
19+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.mdb
20+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.pdb
2121
fi
2222
fi
2323

@@ -34,14 +34,16 @@ fi
3434

3535
xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true
3636

37-
cp -r unity/PackageProject/Assets/Editor/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Editor || true
37+
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
38+
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
39+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
3840

39-
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
40-
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
41-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.xml
41+
cp -r unity/PackageProject/Assets/GitHub ../github-unity-test/GitHubExtensionProject/Assets/ || true
42+
cp -r unity/PackageProject/Assets/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/ || true
4243

43-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub ]; then
44-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/deleteme*
45-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/deleteme*
46-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Editor/GitHub/*.xml
44+
45+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
46+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
47+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
48+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.xml
4749
fi

‎common/packaging.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\Editor\GitHub</PublishTo>
6-
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub</ExternalPublishTo>
5+
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\GitHub\Editor</PublishTo>
6+
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor</ExternalPublishTo>
77
</PropertyGroup>
88

99
<!-- After the build is done, we copy all the artifacts into two locations:

‎package.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ if not exist "%Unity%" (
4242
echo xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4343
call xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4444

45-
del /Q unity\PackageProject\Assets\Editor\GitHub\deleteme*
46-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.pdb
47-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.pdb.meta
48-
del /Q unity\PackageProject\Assets\Editor\GitHub\*.xml
45+
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
46+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
47+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb.meta
48+
del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
4949

5050
for /f tokens^=^2^ usebackq^ delims^=^" %%G in (`find "const string Version" common\SolutionInfo.cs`) do call :Package %%G
5151

‎package.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ if [ x"$OS" == x"Windows" ]; then
5050
else
5151
nuget restore GitHub.Unity.sln
5252
fi
53-
xbuild GitHub.Unity.sln /property:Configuration=$Configuration
5453

54+
xbuild GitHub.Unity.sln /property:Configuration=$Configuration
5555

56-
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
57-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.pdb
58-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.pdb.meta
59-
rm -f unity/PackageProject/Assets/Editor/GitHub/*.xml
56+
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
57+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
58+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb.meta
59+
rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
6060

6161
Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
6262
export GITHUB_UNITY_DISABLE=1
63-
"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Editor/GitHub github-for-unity-$Version-alpha.unitypackage -force-free -quit
63+
"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/GitHub/Editor github-for-unity-$Version-alpha.unitypackage -force-free -quit

‎src/GitHub.Api/Resources/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/[Bb]uilds/
66

77
/Assets/AssetStoreTools*
8-
/Assets/Editor/GitHub.meta
9-
/Assets/Editor/GitHub/
8+
/Assets/GitHub.meta
9+
/Assets/GitHub/
1010

1111
# Visual Studio 2015 cache directory
1212
/.vs/

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitHub.Unity</AssemblyName>
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<OutputPath>$(SolutionDir)\unity\TestProject\Assets\Editor\</OutputPath>
14+
<OutputPath>$(SolutionDir)\unity\TestProject\Assets\GitHub\Editor\</OutputPath>
1515
<IntermediateOutputPath>..\..\..\obj\</IntermediateOutputPath>
1616
</PropertyGroup>
1717
<Import Project="..\..\..\..\..\common\properties.props" />

‎unity/PackageProject/Assets/Editor.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎unity/PackageProject/Assets/Editor/GitHub.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎unity/PackageProject/Assets/Editor/GitHub/x64/sfw_x64.pdb.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)