Skip to content

Commit b5c2507

Browse files
committed
Merge branch 'hotfix/1.0.1'
2 parents 65c4f20 + 5897c86 commit b5c2507

8 files changed

Lines changed: 27 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/).
55

6+
-----------------------
7+
## [1.0.1] - 2019.04.09
8+
9+
NOTE: NuGet-only release to instead of not published v1.0.0.
10+
11+
### Changed
12+
- Deprecated all `Task`-related extension methods. They are considered out of the library scope.
13+
614
-----------------------
715
## [1.0.0] - 2019.02.23
816

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,9 @@ As stated abovethe library include 2 main parts:
492492
* Core tools (defined in `UnityFx.Async.dll` assembly, do not depend on Unity3d);
493493
* Unity3d-specific tools (defined as a collection of C# scripts if installed as an Asset Store package, require Unity3d to compile/execute).
494494

495-
Everything described before (unless specified otherwise) does not require Unity and can be used in any application. The Unity-specific stuff is located in 3 classes:
495+
Everything described before (unless specified otherwise) does not require Unity and can be used in any application. Essential Unity-specific stuff is located in classes:
496496
* `AsyncUtility`. Defines helper methods for accessing main thread in Unity, running coroutines without actually using a `MonoBehaviour` and waiting for native Unity asynchronous operations outside of coroutines.
497497
* `AsyncWww`. Defines web request related helpers.
498-
* `UnityExtensions`. Defines extensions for native Unity classes (like `AsyncOperation` and `UnityWebRequest`).
499498

500499
For example, one can throw a few lines of code to be executed on a main thread using:
501500
```csharp

src/UnityFx.Async.AssetStore/Assets/Plugins/UnityFx.Async/Scripts/Extensions/AsyncOperationExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public static IAsyncOperation<T> ToAsync<T>(this AssetBundleRequest op) where T
6060
/// Creates an <see cref="Task"/> wrapper for the Unity <see cref="AsyncOperation"/>.
6161
/// </summary>
6262
/// <param name="op">The source operation.</param>
63+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
6364
public static Task ToTask(this AsyncOperation op)
6465
{
6566
if (op.isDone)
@@ -78,6 +79,7 @@ public static Task ToTask(this AsyncOperation op)
7879
/// Creates an <see cref="Task{TResult}"/> wrapper for the Unity <see cref="ResourceRequest"/>.
7980
/// </summary>
8081
/// <param name="op">The source operation.</param>
82+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
8183
public static Task<T> ToTask<T>(this ResourceRequest op) where T : UnityEngine.Object
8284
{
8385
var result = new TaskCompletionSource<T>(op);
@@ -89,6 +91,7 @@ public static Task<T> ToTask<T>(this ResourceRequest op) where T : UnityEngine.O
8991
/// Creates an <see cref="Task{TResult}"/> wrapper for the Unity <see cref="AssetBundleRequest"/>.
9092
/// </summary>
9193
/// <param name="op">The source operation.</param>
94+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
9295
public static Task<T> ToTask<T>(this AssetBundleRequest op) where T : UnityEngine.Object
9396
{
9497
var result = new TaskCompletionSource<T>(op);
@@ -100,6 +103,7 @@ public static Task<T> ToTask<T>(this AssetBundleRequest op) where T : UnityEngin
100103
/// Returns the operation awaiter. This method is intended for compiler use only.
101104
/// </summary>
102105
/// <param name="op">The operation to await.</param>
106+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
103107
public static CompilerServices.AsyncOperationAwaiter GetAwaiter(this AsyncOperation op)
104108
{
105109
return new CompilerServices.AsyncOperationAwaiter(op);

src/UnityFx.Async.AssetStore/Assets/Plugins/UnityFx.Async/Scripts/Extensions/UnityWebRequestExtensions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public static IAsyncOperation<T> ToAsync<T>(this UnityWebRequest request) where
4545
/// Creates an <see cref="Task"/> wrapper for the specified <see cref="UnityWebRequest"/>.
4646
/// </summary>
4747
/// <param name="request">The source web request.</param>
48+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
4849
public static Task ToTask(this UnityWebRequest request)
4950
{
5051
var result = new TaskCompletionSource<object>(request);
@@ -56,6 +57,7 @@ public static Task ToTask(this UnityWebRequest request)
5657
/// Creates an <see cref="Task{TResult}"/> wrapper for the specified <see cref="UnityWebRequest"/>.
5758
/// </summary>
5859
/// <param name="request">The source web request.</param>
60+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
5961
public static Task<T> ToTask<T>(this UnityWebRequest request) where T : class
6062
{
6163
var result = new TaskCompletionSource<T>(request);
@@ -67,6 +69,7 @@ public static Task<T> ToTask<T>(this UnityWebRequest request) where T : class
6769
/// Returns the operation awaiter. This method is intended for compiler use only.
6870
/// </summary>
6971
/// <param name="op">The operation to await.</param>
72+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
7073
public static CompilerServices.UnityWebRequestAwaiter GetAwaiter(this UnityWebRequest op)
7174
{
7275
return new CompilerServices.UnityWebRequestAwaiter(op);

src/UnityFx.Async.AssetStore/Assets/Plugins/UnityFx.Async/Scripts/Extensions/WwwExtensions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public static IAsyncOperation<T> ToAsync<T>(this WWW request) where T : class
4646
/// Creates an <see cref="Task"/> wrapper for the specified <see cref="WWW"/>.
4747
/// </summary>
4848
/// <param name="request">The source web request.</param>
49+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
4950
public static Task ToTask(this WWW request)
5051
{
5152
var result = new TaskCompletionSource<object>(request);
@@ -57,6 +58,7 @@ public static Task ToTask(this WWW request)
5758
/// Creates an <see cref="Task{TResult}"/> wrapper for the specified <see cref="WWW"/>.
5859
/// </summary>
5960
/// <param name="request">The source web request.</param>
61+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
6062
public static Task<T> ToTask<T>(this WWW request) where T : class
6163
{
6264
var result = new TaskCompletionSource<T>(request);
@@ -68,6 +70,7 @@ public static Task<T> ToTask<T>(this WWW request) where T : class
6870
/// Returns the operation awaiter. This method is intended for compiler use only.
6971
/// </summary>
7072
/// <param name="op">The operation to await.</param>
73+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
7174
public static CompilerServices.WwwAwaiter GetAwaiter(this WWW op)
7275
{
7376
return new CompilerServices.WwwAwaiter(op);

src/UnityFx.Async.AssetStore/Assets/Plugins/UnityFx.Async/Scripts/Extensions/YieldInstructionExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public static class YieldInstructionExtensions
2020
/// Returns the operation awaiter. This method is intended for compiler use only.
2121
/// </summary>
2222
/// <param name="op">The operation to await.</param>
23+
[Obsolete("Task-related helpers are out of the library scope. Please use UnityFx.Tasks instead.")]
2324
public static CompilerServices.YieldInstructionAwaiter GetAwaiter(this YieldInstruction op)
2425
{
2526
return new CompilerServices.YieldInstructionAwaiter(op);

src/UnityFx.Async.AssetStore/UnityFx.Async.AssetStore.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net35;net46</TargetFrameworks>
5-
<Description>Asset Store code for UnityFx.Async.</Description>
5+
<Description>Asset Store scripts for UnityFx.Async.</Description>
66
<Company />
77
<Authors>Alexander Bogarsukov</Authors>
88
<Copyright>Alexander Bogarsukov</Copyright>
99
<RepositoryUrl>https://github.com/Arvtesh/UnityFx.Async</RepositoryUrl>
1010
<RepositoryType>Git</RepositoryType>
11-
<Version>0.7.0</Version>
12-
<AssemblyVersion>0.7.0.0</AssemblyVersion>
13-
<FileVersion>0.7.0.0</FileVersion>
14-
<InformationalVersion>0.7.0.0</InformationalVersion>
11+
<Version>1.0.0</Version>
12+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
13+
<FileVersion>1.0.0.0</FileVersion>
14+
<InformationalVersion>1.0.0.0</InformationalVersion>
1515
<NeutralLanguage>en-US</NeutralLanguage>
1616
<RootNamespace>UnityFx.Async</RootNamespace>
1717
<IsPackable>false</IsPackable>
18-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1918
<CodeAnalysisRuleSet>../CodingConventions/Cs/CsharpRules.ruleset</CodeAnalysisRuleSet>
2019
<LangVersion>4</LangVersion>
20+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2121
</PropertyGroup>
2222

2323
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">

src/UnityFx.Async/UnityFx.Async.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryType>Git</RepositoryType>
1111
<PackageVersion>1.0.0</PackageVersion>
1212
<PackageProjectUrl>https://github.com/Arvtesh/UnityFx.Async</PackageProjectUrl>
13-
<PackageLicenseUrl>https://github.com/Arvtesh/UnityFx.Async/blob/master/LICENSE.md</PackageLicenseUrl>
1413
<PackageTags>UnityFx;Async;Promise;AsyncOperation;Coroutine;Task;Unity3d</PackageTags>
1514
<PackageIconUrl></PackageIconUrl>
1615
<Version>1.0.0</Version>
@@ -23,6 +22,7 @@
2322
<CodeAnalysisRuleSet>../CodingConventions/Cs/CsharpRules.ruleset</CodeAnalysisRuleSet>
2423
<SignAssembly>true</SignAssembly>
2524
<AssemblyOriginatorKeyFile>UnityFx.Async.snk</AssemblyOriginatorKeyFile>
25+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2626
</PropertyGroup>
2727

2828
<ItemGroup>

0 commit comments

Comments
 (0)