Skip to content

Commit 4bb702d

Browse files
committed
Report error if ProjectAssetsFile is not set, and update tests
1 parent 40e55d4 commit 4bb702d

13 files changed

+128
-76
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/CheckForTargetInAssetsFile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Microsoft.NET.Build.Tasks
1111
{
1212
public class CheckForTargetInAssetsFile : TaskBase
1313
{
14-
[Required]
1514
public string AssetsFilePath { get; set; }
1615

1716
[Required]

src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class FilterResolvedFiles : TaskBase
1919
private readonly List<ITaskItem> _assembliesToPublish = new List<ITaskItem>();
2020
private readonly List<ITaskItem> _packagesResolved = new List<ITaskItem>();
2121

22-
[Required]
2322
public string AssetsFilePath { get; set; }
2423

2524
[Required]

src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public class GenerateDepsFile : TaskBase
2323
[Required]
2424
public string ProjectPath { get; set; }
2525

26-
[Required]
2726
public string AssetsFilePath { get; set; }
2827

2928
[Required]

src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ namespace Microsoft.NET.Build.Tasks
2121
/// </summary>
2222
public class GenerateRuntimeConfigurationFiles : TaskBase
2323
{
24-
[Required]
2524
public string AssetsFilePath { get; set; }
2625

2726
[Required]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace Microsoft.NET.Build.Tasks
6+
{
7+
public sealed class LoadAssetsFile : TaskBase
8+
{
9+
/// <summary>
10+
/// The assets file to process
11+
/// </summary>
12+
public string ProjectAssetsFile
13+
{
14+
get; set;
15+
}
16+
17+
protected override void ExecuteCore()
18+
{
19+
var lockFile = new LockFileCache(BuildEngine4).GetLockFile(ProjectAssetsFile);
20+
}
21+
}
22+
}

src/Tasks/Microsoft.NET.Build.Tasks/LockFileCache.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public LockFileCache(IBuildEngine4 buildEngine)
2020

2121
public LockFile GetLockFile(string path)
2222
{
23+
if (string.IsNullOrEmpty(path))
24+
{
25+
throw new BuildErrorException(Strings.AssetsFileNotSet);
26+
}
2327
if (!Path.IsPathRooted(path))
2428
{
2529
throw new BuildErrorException(Strings.AssetsFilePathNotRooted, path);

src/Tasks/Microsoft.NET.Build.Tasks/ReportAssetsLogMessages.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public sealed class ReportAssetsLogMessages : TaskBase
3030
/// <summary>
3131
/// The assets file to process
3232
/// </summary>
33-
[Required]
3433
public string ProjectAssetsFile
3534
{
3635
get; set;

src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace Microsoft.NET.Build.Tasks
1313
{
1414
public class ResolvePackageAssets : TaskBase
1515
{
16-
[Required]
1716
public string ProjectAssetsFile { get; set; }
1817

1918
[Required]

src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public string ProjectPath
9393
/// <summary>
9494
/// The assets file to process
9595
/// </summary>
96-
[Required]
9796
public string ProjectAssetsFile
9897
{
9998
get; set;

src/Tasks/Microsoft.NET.Build.Tasks/ResolvePublishAssemblies.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class ResolvePublishAssemblies : TaskBase
2020
[Required]
2121
public string ProjectPath { get; set; }
2222

23-
[Required]
2423
public string AssetsFilePath { get; set; }
2524

2625
[Required]

0 commit comments

Comments
 (0)