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

Commit 3b8c8c7

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge branch 'master' into fixes/integration-test-speed
# Conflicts: # src/IntegrationTests/Events/RepositoryWatcherTests.cs # src/IntegrationTests/Git/GitSetupTests.cs
2 parents 2ae4ecb + 85913ad commit 3b8c8c7

File tree

81 files changed

+764
-166
lines changed

Some content is hidden

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

81 files changed

+764
-166
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.zip filter=lfs diff=lfs merge=lfs -text
88
*.7z filter=lfs diff=lfs merge=lfs -text
99
*.gz filter=lfs diff=lfs merge=lfs -text
10+
*.exe filter=lfs diff=lfs merge=lfs -text
1011
*.meta -text
1112
*.asset -text
1213
*.unity -text

‎build.sh

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,35 @@ if [ $# -gt 0 ]; then
44
Configuration=$1
55
fi
66

7-
nuget restore
8-
xbuild GitHub.Unity.sln /property:Configuration=$Configuration
7+
Target="Build"
8+
if [ $# -gt 1 ]; then
9+
Target=$2
10+
fi
11+
12+
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
21+
fi
22+
fi
23+
24+
OS="Mac"
25+
if [ -e "/c/" ]; then
26+
OS="Windows"
27+
fi
28+
29+
if [ x"$OS" == x"Windows" ]; then
30+
common/nuget restore
31+
else
32+
nuget restore
33+
fi
34+
35+
xbuild GitHub.Unity.sln /property:Configuration=$Configuration /target:$Target
936

1037
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
1138
rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*

‎common/nuget.exe

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:5394c5b66eece6a2c53f8817b9efba2c33b41bf4f6dffd4ab8b15f7e74b64401
3+
size 4087000

‎lib/sfw.net/Debug/sfw.net.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:551ba5aa30ed990e3e9754d70ead24abcaf4ac001dceb6706221de7a48c8529a
3+
size 7680

‎lib/sfw.net/Debug/sfw.net.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:23235b5737c749c7121fd786a969fb414dfd3820088fb0776415a4fee6f5a503
3+
size 2017

‎lib/sfw.net/Release/sfw.net.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:5507d90f6a9477d0422a2d7f8d269c109a8b061c3e5a32a9c820cedab3679c75
3+
size 7168

‎lib/sfw.net/Release/sfw.net.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:731efe4fa6ad106a1388caed09c3b8b1252fb3695b6e863f94e469efa16e3f9c
3+
size 1819

‎lib/sfw.net/win/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.exp
2+
*.iobj
3+
*.ipdb
4+
*.ilk
5+
*.lib
6+
test-console.*

‎lib/sfw.net/win/x64/Debug/sfw.dll

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

‎lib/sfw.net/win/x64/Debug/sfw.net.dll

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

0 commit comments

Comments
 (0)