Merge 6b1e951b64 into 98538ef7c7

.github/dependabot.yaml

@@ -5,10 +5,6 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly" # Check for updates to GitHub Actions every week
-    groups:
-      dependencies:
-        patterns:
-          - "*"
     cooldown:
       default-days: 14 # Wait 14 days before creating another PR for the same dependency. This will prevent vulnerability on the package impact.
     ignore:

.github/workflows/build-release.yaml

@@ -101,7 +101,6 @@ jobs:
     needs: [update-packagejson, build-dotnet, build-unity]
     permissions:
       contents: write
-      id-token: write # required for NuGet Trusted Publish
     uses: Cysharp/Actions/.github/workflows/create-release.yaml@main
     with:
       commit-id: ${{ needs.update-packagejson.outputs.sha }}

.gitignore

@@ -100,19 +100,7 @@ publish
 *.Publish.xml
 
 # NuGet Packages Directory
-*.nupkg
+packages
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-# packages # upm pacakge will use Packages
-# **/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-# !**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
 
 # Windows Azure Build Output
 csx

Directory.Build.props

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)opensource.snk</AssemblyOriginatorKeyFile>
-
     <!-- NuGet Package Information -->
-    <IsPackable>false</IsPackable>
     <PackageVersion>$(Version)</PackageVersion>
     <Company>Cysharp</Company>
     <Authors>Cysharp</Authors>
@@ -20,8 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)LICENSE" />
+		<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>

src/UniTask.NetCore/UniTask.NetCore.csproj

@@ -10,9 +10,11 @@
 		<NoWarn>$(NoWarn);CS1591</NoWarn>
 
 		<!-- NuGet Packaging -->
-    <IsPackable>true</IsPackable>
 		<Id>UniTask</Id>
 		<Description>Provides an efficient async/await integration to Unity and .NET Core.</Description>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>opensource.snk</AssemblyOriginatorKeyFile>
+		<IsPackable>true</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>

src/UniTask.NetCoreSandbox/UniTask.NetCoreSandbox.csproj

@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>NetCoreSandbox</RootNamespace>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,6 +16,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\UniTask.NetCore\UniTask.NetCore.csproj" />
+
+
       <ProjectReference Include="..\UniTask.Analyzer\UniTask.Analyzer.csproj">
           <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
           <OutputItemType>Analyzer</OutputItemType>

src/UniTask.NetCoreTests/UniTask.NetCoreTests.csproj

@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
     <RootNamespace>NetCoreTests</RootNamespace>
   </PropertyGroup>
 

src/UniTask/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs

@@ -10,11 +10,6 @@ using UnityEditor.IMGUI.Controls;
 using Cysharp.Threading.Tasks.Internal;
 using System.Text;
 using System.Text.RegularExpressions;
-#if UNITY_6000_2_OR_NEWER
-using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
-using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
-using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
-#endif
 
 namespace Cysharp.Threading.Tasks.Editor
 {
@@ -184,3 +179,4 @@ namespace Cysharp.Threading.Tasks.Editor
     }
 
 }
+

src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Run.cs

@@ -66,12 +66,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     action();
                 }
                 finally
@@ -81,6 +80,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 action();
             }
 
@@ -94,12 +94,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     action(state);
                 }
                 finally
@@ -109,6 +108,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 action(state);
             }
 
@@ -122,12 +122,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     await action();
                 }
                 finally
@@ -137,6 +136,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 await action();
             }
 
@@ -150,12 +150,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     await action(state);
                 }
                 finally
@@ -165,6 +164,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 await action(state);
             }
 
@@ -178,12 +178,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return func();
                 }
                 finally
@@ -194,6 +193,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 return func();
             }
         }
@@ -205,23 +205,22 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return await func();
                 }
                 finally
                 {
-                    cancellationToken.ThrowIfCancellationRequested();
                     await UniTask.Yield();
                     cancellationToken.ThrowIfCancellationRequested();
                 }
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 var result = await func();
                 cancellationToken.ThrowIfCancellationRequested();
                 return result;
@@ -235,12 +234,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return func(state);
                 }
                 finally
@@ -251,6 +249,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 return func(state);
             }
         }
@@ -262,23 +261,22 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return await func(state);
                 }
                 finally
                 {
-                    cancellationToken.ThrowIfCancellationRequested();
                     await UniTask.Yield();
                     cancellationToken.ThrowIfCancellationRequested();
                 }
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 var result = await func(state);
                 cancellationToken.ThrowIfCancellationRequested();
                 return result;

src/UniTask/Assets/Plugins/UniTask/package.json

@@ -2,7 +2,7 @@
     "name": "com.cysharp.unitask",
     "displayName": "UniTask",
     "author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
-    "version": "2.5.11",
+    "version": "2.5.10",
     "unity": "2018.4",
     "description": "Provides an efficient async/await integration to Unity.",
     "keywords": [ "async/await", "async", "Task", "UniTask" ],