Skip to content

Commit

Permalink
Merge branch 'release/0.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Arvtesh committed Feb 10, 2018
2 parents 905dcf9 + 3bf93f8 commit b8c5792
Show file tree
Hide file tree
Showing 179 changed files with 12,670 additions and 114,542 deletions.
25 changes: 20 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@ branches:
only:
- master
- develop
- /release\/.+/
- /hotfix\/.+/

skip_commits:
files:
- '**/*.md'

install:
- cmd: git submodule -q update --init

build_script:
- ps: .\build.ps1

test: off

artifacts:
- path: .\Bin\net35
- path: .\bin\net35
name: UnityFx.Async-net35
- path: .\Bin\net46
- path: .\bin\net46
name: UnityFx.Async-net46
- path: .\bin\netstandard1.3
name: UnityFx.Async-netstandard1.3
- path: .\bin\netstandard2.0
name: UnityFx.Async-netstandard2.0
- path: .\bin\*.nupkg

dotnet_csproj:
patch: true
file: '**\*.csproj'
version: '$(GitVersion_MajorMinorPatch)'
package_version: '$(GitVersion_SemVer)'
package_version: '$(GitVersion_NuGetVersionV2)'
assembly_version: '$(GitVersion_AssemblySemVer)'
file_version: '$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)'
informational_version: '$(GitVersion_InformationalVersion)'
Expand All @@ -37,3 +45,10 @@ deploy:
force_update: false
on:
branch: master

- provider: NuGet
api_key:
secure: iJt9p5F/FKKj2Y+neRJ1SG7W2P6aUhZBU8Z6j1x+7rLD3PGe5gH7VEZ/drxrNIzc
artifact: /.*\.nupkg/
on:
branch: /master|(release\/.+)|(hotfix\/.+)/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/CodingConventions"]
path = src/CodingConventions
url = https://github.com/Arvtesh/CodingConventions
9 changes: 0 additions & 9 deletions AssetStore/UnityPackage35/Assets/AssetStoreTools.meta

This file was deleted.

9 changes: 0 additions & 9 deletions AssetStore/UnityPackage35/Assets/AssetStoreTools/Editor.meta

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

9 changes: 0 additions & 9 deletions AssetStore/UnityPackage35/Assets/UnityFx.meta

This file was deleted.

18 changes: 0 additions & 18 deletions AssetStore/UnityPackage35/Assets/UnityFx/README.txt

This file was deleted.

8 changes: 0 additions & 8 deletions AssetStore/UnityPackage35/Assets/UnityFx/README.txt.meta

This file was deleted.

9 changes: 0 additions & 9 deletions AssetStore/UnityPackage35/Assets/UnityFx/Samples.meta

This file was deleted.

This file was deleted.

This file was deleted.

66 changes: 0 additions & 66 deletions AssetStore/UnityPackage35/Assets/UnityFx/Samples/TestBehaviour.cs

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Loading

0 comments on commit b8c5792

Please sign in to comment.