Skip to content

Commit b50c05d

Browse files
committed
Fix upm testing, make yamato happy
1 parent 41e8740 commit b50c05d

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ trim_trailing_whitespace=true
1010
indent_style=tab
1111
indent_size=tab
1212

13-
[*.{config,csproj,json,nuspec,props,resxtargets,targets,sh,cmd}]
13+
[*.{config,csproj,json,nuspec,props,resxtargets,targets,sh,cmd,md}]
1414
indent_style=space
1515
indent_size=2
1616
tab_width=2

scripts/Test-Upm.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ if ($Trace) {
1313

1414
. $PSScriptRoot\helpers.ps1 | out-null
1515

16-
$upmDir = Join-Path $rootDirectory 'build\upm'
16+
$srcdir = Join-Path $rootDirectory 'src'
1717

18-
Get-ChildItem -Directory $upmDir | % {
18+
Get-ChildItem -Directory $srcdir | % {
1919
Write-Output "Testing $($_.Name)"
2020

21-
$packageDir = Join-Path $upmDir $_.Name
21+
$packageDir = Join-Path $srcdir $_.Name
2222
Invoke-Command -Fatal { & upm-ci package test --package-path $packageDir -u $UnityVersion }
2323
}

src/com.unity.editor.tasks/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
<!-- Do not change the line immediately below this comment, the build system will replace it with the actual version and date. -->
4+
5+
## [VERSION] - DATE
6+
37
## [1.1.10] - 2019-11-30
48

59
- Add symbols for nuget packages

src/com.unity.editor.tasks/Editor/Base/TaskBase.cs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public interface ITask<TResult> : ITask
195195
/// <summary>
196196
/// Handler called when a task fails.
197197
/// </summary>
198-
198+
199199
new ITask<TResult> Catch(Action<Exception> handler);
200200

201201
/// <summary>
@@ -1020,9 +1020,9 @@ public ITask Finally(Action<bool, Exception, TResult> continuation, string name
10201020
/// <summary>
10211021
/// Empty implementation of the base <see cref="TaskBase.Run" /> method that
10221022
/// returns the correct result type, so that implementations of this can follow
1023-
/// the correct pattern:
1024-
///
1025-
/// <![CDATA[
1023+
/// the correct pattern (see example)
1024+
/// </summary>
1025+
/// <example><code lang="cs"><![CDATA[
10261026
/// protected override TResult RunWithReturn(bool success)
10271027
/// {
10281028
/// var result = base.RunWithReturn(success);
@@ -1045,8 +1045,7 @@ public ITask Finally(Action<bool, Exception, TResult> continuation, string name
10451045
/// }
10461046
/// return result;
10471047
/// }
1048-
/// ]]>
1049-
/// </summary>
1048+
/// ]]></code></example>
10501049
/// <param name="success"></param>
10511050
/// <returns></returns>
10521051
protected virtual TResult RunWithReturn(bool success)
@@ -1159,9 +1158,9 @@ public override TResult RunSynchronously()
11591158
/// <summary>
11601159
/// Empty implementation of the base <see cref="TaskBase.Run" /> method that
11611160
/// returns the correct result type, so that implementations of this can follow
1162-
/// the correct pattern:
1163-
///
1164-
/// <![CDATA[
1161+
/// the correct pattern (see example)
1162+
/// </summary>
1163+
/// <example><code lang="cs"><![CDATA[
11651164
/// protected override TResult RunWithData(bool success, T previousResult)
11661165
/// {
11671166
/// var result = base.RunWithData(success, previousResult);
@@ -1184,8 +1183,7 @@ public override TResult RunSynchronously()
11841183
/// }
11851184
/// return result;
11861185
/// }
1187-
/// ]]>
1188-
/// </summary>
1186+
/// ]]></code></example>
11891187
/// <param name="success"></param>
11901188
/// <param name="previousResult"></param>
11911189
/// <returns></returns>
@@ -1210,12 +1208,12 @@ public abstract class DataTaskBase<TData, TResult> : TaskBase<TResult>, ITask<TD
12101208
public event Action<TData> OnData;
12111209

12121210
/// <summary>
1213-
///
1211+
///
12141212
/// </summary>
12151213
/// <param name="taskManager"></param>
12161214
protected DataTaskBase(ITaskManager taskManager) : base(taskManager) {}
12171215
/// <summary>
1218-
///
1216+
///
12191217
/// </summary>
12201218
/// <param name="taskManager"></param>
12211219
/// <param name="token"></param>
@@ -1243,12 +1241,12 @@ public abstract class DataTaskBase<T, TData, TResult> : TaskBase<T, TResult>, IT
12431241
public event Action<TData> OnData;
12441242

12451243
/// <summary>
1246-
///
1244+
///
12471245
/// </summary>
12481246
/// <param name="taskManager"></param>
12491247
protected DataTaskBase(ITaskManager taskManager) : base(taskManager) {}
12501248
/// <summary>
1251-
///
1249+
///
12521250
/// </summary>
12531251
/// <param name="taskManager"></param>
12541252
/// <param name="token"></param>
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
package.json
2-
package.json.meta
31
LICENSE.meta

0 commit comments

Comments
 (0)