From c965e817261e484b9b623398a6b685a8a5bdd06a Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Fri, 1 Sep 2017 14:13:35 +0200
Subject: [PATCH 1/3] Move extension installation location to
 Assets/Plugins/GitHub

---
 README.md                                     |  2 +-
 build.cmd                                     | 38 +++++++++----------
 build.sh                                      | 34 ++++++++---------
 common/packaging.targets                      |  4 +-
 package.cmd                                   |  8 ++--
 package.sh                                    | 10 ++---
 src/GitHub.Api/Resources/.gitignore           |  4 +-
 .../Editor/GitHub.Unity/GitHub.Unity.csproj   |  2 +-
 unity/PackageProject/.gitignore               |  8 ++--
 unity/PackageProject/Assets/Plugins.meta      |  9 +++++
 .../Assets/{ => Plugins}/GitHub.meta          |  0
 .../Assets/{ => Plugins}/GitHub/Editor.meta   |  0
 .../GitHub/Editor/AsyncBridge.Net35.dll.meta  |  0
 .../GitHub/Editor/CREDITS.txt.meta            |  0
 .../{ => Plugins}/GitHub/Editor/EULA.txt.meta |  0
 .../GitHub/Editor/GitHub.Api.dll.mdb.meta     |  0
 .../GitHub/Editor/GitHub.Api.dll.meta         |  0
 .../GitHub/Editor/GitHub.Logging.dll.mdb.meta |  0
 .../GitHub/Editor/GitHub.Logging.dll.meta     |  0
 .../Editor/ICSharpCode.SharpZipLib.dll.meta   |  0
 .../GitHub/Editor/Mono.Posix.dll.meta         |  0
 .../GitHub/Editor/Mono.Security.dll.meta      |  0
 .../GitHub/Editor/Octokit.dll.meta            |  0
 .../GitHub/Editor/PlatformResources.meta      |  0
 .../GitHub/Editor/PlatformResources/mac.meta  |  0
 .../PlatformResources/mac/git-lfs.zip.meta    |  0
 .../Editor/PlatformResources/windows.meta     |  0
 .../windows/git-lfs.zip.meta                  |  0
 .../PlatformResources/windows/git.zip.meta    |  0
 .../Editor/Rackspace.Threading.dll.meta       |  0
 .../ReadOnlyCollectionsInterfaces.dll.meta    |  0
 .../GitHub/Editor/System.Net.Http.dll.meta    |  0
 .../GitHub/Editor/System.Threading.dll.meta   |  0
 .../GitHub/Editor/sfw.net.dll.meta            |  0
 .../{ => Plugins}/GitHub/Editor/x64.meta      |  0
 .../{ => Plugins}/GitHub/Editor/x86.meta      |  0
 36 files changed, 64 insertions(+), 55 deletions(-)
 create mode 100644 unity/PackageProject/Assets/Plugins.meta
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/AsyncBridge.Net35.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/CREDITS.txt.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/EULA.txt.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/GitHub.Api.dll.mdb.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/GitHub.Api.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/GitHub.Logging.dll.mdb.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/GitHub.Logging.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/Mono.Posix.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/Mono.Security.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/Octokit.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources/mac.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources/mac/git-lfs.zip.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources/windows.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources/windows/git-lfs.zip.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/PlatformResources/windows/git.zip.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/Rackspace.Threading.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/System.Net.Http.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/System.Threading.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/sfw.net.dll.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/x64.meta (100%)
 rename unity/PackageProject/Assets/{ => Plugins}/GitHub/Editor/x86.meta (100%)

diff --git a/README.md b/README.md
index 70912fa86..2e8d129dd 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Notices
 
-From version 0.19 onwards, the location of the plugin has moved to `Assets/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
+From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
 
 ![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
 
diff --git a/build.cmd b/build.cmd
index f0e84b7c3..af6f8fab7 100644
--- a/build.cmd
+++ b/build.cmd
@@ -12,14 +12,14 @@ if not %2.==. (
 )
 
 if %Target%==Rebuild (
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.dll
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.mdb
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
-
-	if exist "..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor" (
-		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.dll
-		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.mdb
-		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.pdb
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.dll
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.mdb
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb
+
+	if exist "..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor" (
+		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.dll
+		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.mdb
+		del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.pdb
 	)
 )
 
@@ -28,18 +28,18 @@ call common\nuget.exe restore GitHub.Unity.sln
 echo xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
 call xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
 
-del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
-del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
-del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
+del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
+del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
+del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.xml
 
-echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
-call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
+echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Plugins\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
+call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Plugins\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
 
-echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
-call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
+echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\Plugins\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
+call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\Plugins\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
 
-if exist ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor (
-	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
-	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
-	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.xml
+if exist ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor (
+	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\deleteme*
+	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\deleteme*
+	del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.xml
 )
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 88ecf8afd..fd10a474d 100755
--- a/build.sh
+++ b/build.sh
@@ -10,14 +10,14 @@ if [ $# -gt 1 ]; then
 fi
 
 if [ x"$Target" == x"Rebuild" ]; then
-	rm -f unity/PackageProject/Assets/GitHub/Editor/*.dll
-	rm -f unity/PackageProject/Assets/GitHub/Editor/*.mdb
-	rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
-
-	if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
-		rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.dll
-		rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.mdb
-		rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.pdb
+	rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.dll
+	rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.mdb
+	rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb
+
+	if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor ]; then
+		rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.dll
+		rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.mdb
+		rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.pdb
 	fi
 fi
 
@@ -34,16 +34,16 @@ fi
 
 xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true
 
-rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
-rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
-rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
 
-cp -r unity/PackageProject/Assets/GitHub ../github-unity-test/GitHubExtensionProject/Assets/ || true
-cp -r unity/PackageProject/Assets/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/ || true
+cp -r unity/PackageProject/Assets/Plugins/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Plugins/ || true
+cp -r unity/PackageProject/Assets/Plugins/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/Plugins/ || true
 
 
-if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
-	rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
-	rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
-	rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.xml
+if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor ]; then
+	rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/deleteme*
+	rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/deleteme*
+	rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.xml
 fi
\ No newline at end of file
diff --git a/common/packaging.targets b/common/packaging.targets
index 445c770d0..77f866e20 100644
--- a/common/packaging.targets
+++ b/common/packaging.targets
@@ -2,8 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\GitHub\Editor</PublishTo>
-    <ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor</ExternalPublishTo>
+    <PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\Plugins\GitHub\Editor</PublishTo>
+    <ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor</ExternalPublishTo>
   </PropertyGroup>
 
   <!-- After the build is done, we copy all the artifacts into two locations:
diff --git a/package.cmd b/package.cmd
index 476035c9a..e25ddbd41 100644
--- a/package.cmd
+++ b/package.cmd
@@ -42,10 +42,10 @@ if not exist "%Unity%" (
 	echo xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
 	call xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
 	
-	del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb.meta
-	del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb.meta
+	del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.xml
 	
 	for /f tokens^=^2^ usebackq^ delims^=^" %%G in (`find "const string Version" common\SolutionInfo.cs`) do call :Package %%G
 	
diff --git a/package.sh b/package.sh
index 70915f89a..7820c09c1 100755
--- a/package.sh
+++ b/package.sh
@@ -53,11 +53,11 @@ fi
 
 xbuild GitHub.Unity.sln /property:Configuration=$Configuration
 
-rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
-rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
-rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb.meta
-rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb.meta
+rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
 
 Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
 export GITHUB_UNITY_DISABLE=1
-"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/GitHub/Editor github-for-unity-$Version-alpha.unitypackage -force-free -quit
+"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Plugins/GitHub/Editor github-for-unity-$Version-alpha.unitypackage -force-free -quit
diff --git a/src/GitHub.Api/Resources/.gitignore b/src/GitHub.Api/Resources/.gitignore
index fae5936b3..78d2dcbbf 100644
--- a/src/GitHub.Api/Resources/.gitignore
+++ b/src/GitHub.Api/Resources/.gitignore
@@ -5,8 +5,8 @@
 /[Bb]uilds/
 
 /Assets/AssetStoreTools*
-/Assets/GitHub.meta
-/Assets/GitHub/
+/Assets/Plugins/GitHub.meta
+/Assets/Plugins/GitHub/
 
 # Visual Studio 2015 cache directory
 /.vs/
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
index 0e38277c2..70a1955c4 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>GitHub.Unity</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <OutputPath>$(SolutionDir)\unity\TestProject\Assets\GitHub\Editor\</OutputPath>
+    <OutputPath>$(SolutionDir)\unity\TestProject\Assets\Plugins\GitHub\Editor\</OutputPath>
     <IntermediateOutputPath>..\..\..\obj\</IntermediateOutputPath>
   </PropertyGroup>
   <Import Project="..\..\..\..\..\common\properties.props" />
diff --git a/unity/PackageProject/.gitignore b/unity/PackageProject/.gitignore
index 3d8d37ee2..9fac08e77 100644
--- a/unity/PackageProject/.gitignore
+++ b/unity/PackageProject/.gitignore
@@ -13,7 +13,7 @@ ProjectVersion.txt
 Library/
 
 // These files come from lib/
-Assets/GitHub/Editor/libsfw.bundle.meta
-Assets/GitHub/Editor/libsfw.so.meta
-Assets/GitHub/Editor/x64/
-Assets/GitHub/Editor/x86/
\ No newline at end of file
+Assets/Plugins/GitHub/Editor/libsfw.bundle.meta
+Assets/Plugins/GitHub/Editor/libsfw.so.meta
+Assets/Plugins/GitHub/Editor/x64/
+Assets/Plugins/GitHub/Editor/x86/
\ No newline at end of file
diff --git a/unity/PackageProject/Assets/Plugins.meta b/unity/PackageProject/Assets/Plugins.meta
new file mode 100644
index 000000000..8237f8f04
--- /dev/null
+++ b/unity/PackageProject/Assets/Plugins.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 720712be6e31c444f88f57bb85bf5fa5
+folderAsset: yes
+timeCreated: 1504268238
+licenseType: Pro
+DefaultImporter:
+  userData:
+  assetBundleName:
+  assetBundleVariant:
diff --git a/unity/PackageProject/Assets/GitHub.meta b/unity/PackageProject/Assets/Plugins/GitHub.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub.meta
rename to unity/PackageProject/Assets/Plugins/GitHub.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/AsyncBridge.Net35.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/AsyncBridge.Net35.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/CREDITS.txt.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/CREDITS.txt.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/CREDITS.txt.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/CREDITS.txt.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/EULA.txt.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/EULA.txt.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/EULA.txt.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/EULA.txt.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/GitHub.Api.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/GitHub.Api.dll.mdb.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/GitHub.Api.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/GitHub.Api.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/GitHub.Logging.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/GitHub.Logging.dll.mdb.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/GitHub.Logging.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/GitHub.Logging.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/Mono.Posix.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/Mono.Posix.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/Mono.Security.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Security.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/Mono.Security.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Security.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/Octokit.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Octokit.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/Octokit.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/Octokit.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources/mac.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/mac.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources/mac.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/mac.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources/mac/git-lfs.zip.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/mac/git-lfs.zip.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources/mac/git-lfs.zip.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/mac/git-lfs.zip.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows/git-lfs.zip.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows/git-lfs.zip.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows/git-lfs.zip.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows/git-lfs.zip.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows/git.zip.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows/git.zip.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/PlatformResources/windows/git.zip.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/PlatformResources/windows/git.zip.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/Rackspace.Threading.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Rackspace.Threading.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/Rackspace.Threading.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/Rackspace.Threading.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/System.Net.Http.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Net.Http.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/System.Net.Http.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Net.Http.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/System.Threading.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/System.Threading.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/sfw.net.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/sfw.net.dll.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/x64.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/x64.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/x64.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/x64.meta
diff --git a/unity/PackageProject/Assets/GitHub/Editor/x86.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/x86.meta
similarity index 100%
rename from unity/PackageProject/Assets/GitHub/Editor/x86.meta
rename to unity/PackageProject/Assets/Plugins/GitHub/Editor/x86.meta

From cc678f645d35f6210a0e1cafd8654fdeab8a5636 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Fri, 1 Sep 2017 14:47:18 +0200
Subject: [PATCH 2/3] Tag the package name with the commit count and commit
 hash

---
 common/SolutionInfo.cs | 2 +-
 package.sh             | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/SolutionInfo.cs b/common/SolutionInfo.cs
index af679d16b..7b5b7ddec 100644
--- a/common/SolutionInfo.cs
+++ b/common/SolutionInfo.cs
@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.19.0.0";
+        internal const string Version = "0.19.0";
     }
 }
diff --git a/package.sh b/package.sh
index 7820c09c1..4a2779830 100755
--- a/package.sh
+++ b/package.sh
@@ -59,5 +59,9 @@ rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb.meta
 rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
 
 Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
+commitcount=`git rev-list  --count HEAD`
+commit=`git log -n1 --pretty=format:%h`
+Version="${Version}-${commitcount}-${commit}"
+Version=$Version
 export GITHUB_UNITY_DISABLE=1
-"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Plugins/GitHub/Editor github-for-unity-$Version-alpha.unitypackage -force-free -quit
+"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Plugins/GitHub/Editor github-for-unity-$Version.unitypackage -force-free -quit

From 30e4af5f18439decddcbb85d9f039aa37dcd0f5b Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Fri, 1 Sep 2017 15:22:22 +0200
Subject: [PATCH 3/3] Make the commit count the last part of the version number

---
 package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.sh b/package.sh
index 4a2779830..ca09bd5e5 100755
--- a/package.sh
+++ b/package.sh
@@ -61,7 +61,7 @@ rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
 Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
 commitcount=`git rev-list  --count HEAD`
 commit=`git log -n1 --pretty=format:%h`
-Version="${Version}-${commitcount}-${commit}"
+Version="${Version}.${commitcount}-${commit}"
 Version=$Version
 export GITHUB_UNITY_DISABLE=1
 "$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Plugins/GitHub/Editor github-for-unity-$Version.unitypackage -force-free -quit