Merge branch 'release/0.6.0'

Arvtesh · Nov 5, 2017 · 905dcf9 · 905dcf9
2 parents 0912bad + 094568f
commit 905dcf9
Show file tree

Hide file tree

Showing 81 changed files with 249 additions and 1,055 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -20,8 +20,18 @@ artifacts:
   - path: .\Bin\net46
     name: UnityFx.Async-net46
 
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '$(GitVersion_MajorMinorPatch)'
+  package_version: '$(GitVersion_SemVer)'
+  assembly_version: '$(GitVersion_AssemblySemVer)'
+  file_version: '$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)'
+  informational_version: '$(GitVersion_InformationalVersion)'
+
 deploy:
   - provider: GitHub
+    tag: v$(GitVersion_MajorMinorPatch)
     auth_token:
       secure: aTd8m7PLWUlE3iacD7bx9oWPW/CK0+BTE7/nhgB2EXk8iZ3FJ/TJX5kKLIYP76nN
     force_update: false

diff --git a/AssetStore/UnityPackage35/Assets/UnityFx/README.txt.meta b/AssetStore/UnityPackage35/Assets/UnityFx/README.txt.meta
diff --git a/AssetStore/UnityPackage35/Assets/UnityFx/UnityFx.Async.dll b/AssetStore/UnityPackage35/Assets/UnityFx/UnityFx.Async.dll
diff --git a/AssetStore/UnityPackage35/Assets/UnityFx/UnityFx.Async.xml b/AssetStore/UnityPackage35/Assets/UnityFx/UnityFx.Async.xml
diff --git a/AssetStore/UnityPackage46/Assets/UnityFx/UnityFx.Async.dll b/AssetStore/UnityPackage46/Assets/UnityFx/UnityFx.Async.dll
diff --git a/AssetStore/UnityPackage46/Assets/UnityFx/UnityFx.Async.xml b/AssetStore/UnityPackage46/Assets/UnityFx/UnityFx.Async.xml
diff --git a/Build.ps1 b/Build.ps1
@@ -1 +1 @@
-.\Source\Build.ps1 Release
+.\src\Build.ps1 Release
diff --git a/BuildDocs.ps1 b/BuildDocs.ps1
@@ -1,2 +1,2 @@
-.\Source\Build.ps1 Release
-.\Source\BuildDocs.ps1
+.\src\Build.ps1 Release
+.\src\BuildDocs.ps1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.\Source\Build.ps1 Release
		.\src\Build.ps1 Release