Skip to content

Commit 55e97fa

Browse files
committed
Apply code review feedback
1 parent a05b984 commit 55e97fa

File tree

7 files changed

+26
-24
lines changed

7 files changed

+26
-24
lines changed

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void ItBuildsDependencyContextsFromProjectLockFiles(
5151
FrameworkConstants.CommonFrameworks.NetCoreApp10,
5252
runtime,
5353
Constants.DefaultPlatformLibrary,
54-
null,
54+
runtimeFrameworks: null,
5555
isSelfContained: !string.IsNullOrEmpty(runtime));
5656

5757
DependencyContext dependencyContext = new DependencyContextBuilder(mainProject, projectContext, includeRuntimeFileVersions: false)
@@ -255,7 +255,7 @@ private DependencyContext BuildDependencyContextWithReferenceAssemblies(bool use
255255
FrameworkConstants.CommonFrameworks.NetCoreApp10,
256256
runtime: null,
257257
platformLibraryName: Constants.DefaultPlatformLibrary,
258-
null,
258+
runtimeFrameworks: null,
259259
isSelfContained: false);
260260

261261
CompilationOptions compilationOptions =

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProjectContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public void ItComputesExcludeFromPublishList()
2020
LockFile lockFile = TestLockFiles.GetLockFile("dependencies.withgraphs");
2121
ProjectContext projectContext = lockFile.CreateProjectContext(
2222
FrameworkConstants.CommonFrameworks.NetStandard16,
23-
null,
23+
runtime: null,
2424
Constants.DefaultPlatformLibrary,
25-
null,
25+
runtimeFrameworks: null,
2626
isSelfContained: false);
2727

2828
IEnumerable<string> excludeFromPublishPackageIds = new[] { "Microsoft.Extensions.Logging.Abstractions" };

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAPublishAssembliesResolver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void ItResolvesAssembliesFromProjectLockFiles(string projectName, string
2626
FrameworkConstants.CommonFrameworks.NetCoreApp10,
2727
runtime,
2828
Constants.DefaultPlatformLibrary,
29-
null,
29+
runtimeFrameworks: null,
3030
isSelfContained: false);
3131

3232
IEnumerable<ResolvedFile> resolvedFiles = new PublishAssembliesResolver(new MockPackageResolver())
@@ -46,7 +46,7 @@ public void ItResolvesAssembliesFromProjectLockFilesWithStoreLayout(string proje
4646
FrameworkConstants.CommonFrameworks.NetCoreApp10,
4747
runtime,
4848
Constants.DefaultPlatformLibrary,
49-
null,
49+
runtimeFrameworks: null,
5050
isSelfContained: false);
5151

5252
IEnumerable<ResolvedFile> resolvedFiles = new PublishAssembliesResolver(new MockPackageResolver())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected override void ExecuteCore()
5959
NuGetUtils.ParseFrameworkName(TargetFramework),
6060
RuntimeIdentifier,
6161
PlatformLibraryName,
62-
null,
62+
runtimeFrameworks: null,
6363
IsSelfContained);
6464

6565
var packageClosure = new HashSet<PackageIdentity>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void AddFrameworks(RuntimeOptions runtimeOptions, ProjectContext project
104104
{
105105
runtimeOptions.tfm = TargetFramework;
106106

107-
if (projectContext.RuntimeFrameworks == null)
107+
if (projectContext.RuntimeFrameworks == null || projectContext.RuntimeFrameworks.Length == 0)
108108
{
109109
// If there are no RuntimeFrameworks (which would be set in the ResolveFrameworkReference task based
110110
// on FrameworkReference items), then use package resolved from MicrosoftNETPlatformLibrary for
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace Microsoft.NET.Build.Tasks
2+
{
3+
public class ReportUnknownFrameworkReferences : TaskBase
4+
{
5+
public string[] UnresolvedFrameworkReferences { get; set; }
6+
7+
protected override void ExecuteCore()
8+
{
9+
if (UnresolvedFrameworkReferences != null)
10+
{
11+
foreach (var unresolvedFrameworkReference in UnresolvedFrameworkReferences)
12+
{
13+
Log.LogError(Strings.UnknownFrameworkReference, unresolvedFrameworkReference);
14+
}
15+
}
16+
}
17+
}
18+
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,4 @@ public KnownFrameworkReference(ITaskItem item)
100100
public string TargetingPackVersion => _item.GetMetadata("TargetingPackVersion");
101101
}
102102
}
103-
104-
public class ReportUnknownFrameworkReferences : TaskBase
105-
{
106-
public string[] UnresolvedFrameworkReferences { get; set; }
107-
108-
protected override void ExecuteCore()
109-
{
110-
if (UnresolvedFrameworkReferences != null)
111-
{
112-
foreach (var unresolvedFrameworkReference in UnresolvedFrameworkReferences)
113-
{
114-
Log.LogError(Strings.UnknownFrameworkReference, unresolvedFrameworkReference);
115-
}
116-
}
117-
}
118-
}
119103
}

0 commit comments

Comments
 (0)