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

Commit 4bb9fc3

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge branch 'master' into fixes/code-analysis
2 parents 975357b + e0dfedb commit 4bb9fc3

File tree

96 files changed

+5969
-4753
lines changed

Some content is hidden

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

96 files changed

+5969
-4753
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 GitHub
3+
Copyright (c) 2016-2018 GitHub
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ test:
5656
categories:
5757
except:
5858
- DoNotRunOnAppVeyor
59-
- TimeSensitive
6059
artifacts:
6160
- path: unity\PackageProject
6261
type: zip
6362
name: github-for-unity-packageproject
6463
- path: build\*.log
64+
on_failure:
65+
- ps: Get-ChildItem build\*.log | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

‎common/SolutionInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.23.0";
34+
internal const string Version = "0.27.0";
3535
}
3636
}

‎docs/contributing/how-to-test.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
Unit and Integration tests for Unity can be found under `src/tests/`.
3+
4+
## Testing requirements
5+
Tests currently run with NUnit 2.6.4.
6+
7+
## Running tests
8+
Tests can be run after building the Unity project. To run the tests execute `test.cmd` on Windows or `test.sh` on Mac.
9+
10+
We use [Appveyor](https://ci.appveyor.com/project/github-windows/unity/build/tests) as the CI for this project to run tests, but it is also necessary to run tests locally when making code changes.

‎lib/sfw/linux/libsfw.so

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6dd264b46e46ced0562e626bd1495b46970bb69a7fb1add5159fdd2cba25c521
2+
oid sha256:58b22b85b527a7ae2df8aeea6a961a65d40198f3c92be0ae6bc48ef2c1eb17c5
33
size 638138

‎lib/sfw/linux/version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
362b801

‎lib/sfw/mac/libsfw.bundle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:71909bd094c6bd7331193df564a0da297bc8a81b4c3e0fa868e6de4fdbb1cbb4
3-
size 55408
2+
oid sha256:499af15a02a7c9090694f9e7e9dd6d8abd01c5bb1a5e925547cfa42da7aec78c
3+
size 54180

‎lib/sfw/mac/version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
362b801

‎lib/sfw/win/version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
362b801

‎lib/sfw/win/x64/sfw_x64.dll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:522e301894b038284bff103eaaadac86d4f778a956abe030bb34f24e15aba160
2+
oid sha256:4f8d586e00ddbe3cfa0cd2446bdd416a65e6c12ef31e7f451af14867b880c0dc
33
size 182784

0 commit comments

Comments
 (0)