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

Commit 333df3d

Browse files
sambonfiresambonfire
authored
Merge pull request #1 from github-for-unity/961-fixes
[WIP] Fixes to 961
2 parents 423f38d + dd5218d commit 333df3d

File tree

14 files changed

+80
-33
lines changed

14 files changed

+80
-33
lines changed

‎appveyor.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '1.1.0.{build}'
21
environment:
32
GHFU_KEY:
43
secure: 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
@@ -41,10 +40,12 @@ install:
4140
4241
Set-Location $env:appveyor_build_folder
4342
44-
$version = Get-Content "$($env:appveyor_build_folder)\common\SolutionInfo.cs" | %{ $regex = "const string Version = `"([^`"]*)`""; if ($_ -match $regex) { $matches[1] } }
43+
$version = Get-Content "$($env:appveyor_build_folder)\common\SolutionInfo.cs" | %{ $regex = "const string GitHubForUnityVersion = `"([^`"]*)`""; if ($_ -match $regex) { $matches[1] } }
4544
4645
$env:package_version="$($version).$($env:APPVEYOR_BUILD_NUMBER)"
4746
47+
Update-AppveyorBuild -Version $env:package_version
48+
4849
$message = "Building "
4950
5051
if ($package) { $message += "and packaging "}

‎common/SolutionInfo.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
// this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics
35-
internal const string VersionForAssembly = "1.2.0";
36-
// Actual real version
37-
internal const string Version = "1.2.0";
34+
private const string GitHubForUnityVersion = "1.2.2";
35+
internal const string VersionForAssembly = GitHubForUnityVersion;
36+
37+
// If this is an alpha, beta or other pre-release, mark it as such as shown below
38+
internal const string Version = GitHubForUnityVersion; // GitHubForUnityVersion + "-beta1"
3839
}
3940
}

‎create-unitypackage.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh -eu
22
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33

4-
version=$(sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs)
4+
version=$(sed -En 's,.*GitHubForUnityVersion = "(.*)".*,\1,p' common/SolutionInfo.cs)
55
commitcount=$(git rev-list --count HEAD)
66
commit=$(git log -n1 --pretty=format:%h)
77
version="${version}.${commitcount}-${commit}"

‎package.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if not exist "%Unity%" (
4747
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb.meta
4848
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.xml
4949

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

5252
goto End
5353

‎package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb
5858
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb.meta
5959
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
6060

61-
Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
61+
Version=`sed -En 's,.*GitHubForUnityVersion = "(.*)".*,\1,p' common/SolutionInfo.cs`
6262
commitcount=`git rev-list --count HEAD`
6363
commit=`git log -n1 --pretty=format:%h`
6464
Version="${Version}.${commitcount}-${commit}"

‎src/GitHub.Api/Application/ApiClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,14 +469,14 @@ private GitHubUser GetValidatedGitHubUser()
469469
}
470470
}
471471

472-
class GitHubHostMeta
472+
public class GitHubHostMeta
473473
{
474474
public bool VerifiablePasswordAuthentication { get; set; }
475475
public string GithubServicesSha { get; set; }
476476
public string InstalledVersion { get; set; }
477477
}
478478

479-
class GitHubUser
479+
public class GitHubUser
480480
{
481481
public string Name { get; set; }
482482
public string Login { get; set; }

‎src/GitHub.Api/Git/Tasks/GitCheckoutTask.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public GitCheckoutTask(
4848
arguments += " \"" + file.ToNPath().ToString(SlashMode.Forward) + "\"";
4949
}
5050

51-
Message = "Checking out files at rev " + changeset.Substring(0, 7);
52-
}
51+
Message = "Checking out files at rev " + changeset.Substring(0, 7);
52+
}
5353

5454
public override string ProcessArguments { get { return arguments; } }
5555
public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
5656
public override string Message { get; set; } = "Checking out files...";
5757
}
58-
}
58+
}

‎src/GitHub.Api/Resources/.gitattributes‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
*.unity -text merge=unityyamlmerge diff
66
*.asset -text merge=unityyamlmerge diff
77
*.prefab -text merge=unityyamlmerge diff
8+
*.mat -text merge=unityyamlmerge diff
9+
*.anim -text merge=unityyamlmerge diff
10+
*.controller -text merge=unityyamlmerge diff
11+
*.overrideController -text merge=unityyamlmerge diff
12+
*.physicMaterial -text merge=unityyamlmerge diff
13+
*.physicsMaterial2D -text merge=unityyamlmerge diff
14+
*.playable -text merge=unityyamlmerge diff
15+
*.mask -text merge=unityyamlmerge diff
16+
*.brush -text merge=unityyamlmerge diff
17+
*.flare -text merge=unityyamlmerge diff
18+
*.fontsettings -text merge=unityyamlmerge diff
19+
*.guiskin -text merge=unityyamlmerge diff
20+
*.giparams -text merge=unityyamlmerge diff
21+
*.renderTexture -text merge=unityyamlmerge diff
22+
*.spriteatlas -text merge=unityyamlmerge diff
23+
*.terrainlayer -text merge=unityyamlmerge diff
24+
*.mixer -text merge=unityyamlmerge diff
25+
*.shadervariants -text merge=unityyamlmerge diff
826

927
# Image formats
1028
*.psd filter=lfs diff=lfs merge=lfs -text

‎src/GitHub.Api/Resources/.gitignore‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
/[Ll]ibrary/
2-
/[Tt]emp/
3-
/[Oo]bj/
4-
/[Bb]uild/
5-
/[Bb]uilds/
1+
[Ll]ibrary/
2+
[Tt]emp/
3+
[Oo]bj/
4+
[Bb]uild/
5+
[Bb]uilds/
6+
[Ll]ogs/
67

7-
/Assets/AssetStoreTools*
8+
# Uncomment this line if you wish to ignore the asset store tools plugin
9+
# [Aa]ssets/AssetStoreTools*
810

9-
# Visual Studio 2015 cache directory
10-
/.vs/
11+
# Visual Studio cache directory
12+
.vs/
13+
14+
# Gradle cache directory
15+
.gradle/
1116

1217
# Autogenerated VS/MD/Consulo solution and project files
1318
ExportedObj/
@@ -23,14 +28,21 @@ ExportedObj/
2328
*.booproj
2429
*.svd
2530
*.pdb
26-
31+
*.mdb
32+
*.opendb
33+
*.VC.db
2734

2835
# Unity3D generated meta files
2936
*.pidb.meta
37+
*.pdb.meta
38+
*.mdb.meta
3039

31-
# Unity3D Generated File On Crash Reports
40+
# Unity3D generated file on crash reports
3241
sysinfo.txt
3342

3443
# Builds
3544
*.apk
36-
*.unitypackage
45+
*.unitypackage
46+
47+
# Crashlytics generated file
48+
crashlytics-build.properties

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<Compile Include="Properties\AssemblyInfo.cs" />
9191
<Compile Include="Logging\UnityLogAdapter.cs" />
9292
<Compile Include="EntryPoint.cs" />
93+
<Compile Include="UI\ContextMenu.cs" />
94+
<Compile Include="UI\FileHistoryWindow.cs" />
9395
<Compile Include="UI\GitHubEnterpriseAuthenticationView.cs" />
9496
<Compile Include="UI\GitHubAuthenticationView.cs" />
9597
<Compile Include="UpdateCheck.cs" />

0 commit comments

Comments
 (0)