diff --git a/src/core-sdk-tasks/CollatePackageDownloads.cs b/src/core-sdk-tasks/CollatePackageDownloads.cs
index 1e0c8ab9e..9e31720fe 100644
--- a/src/core-sdk-tasks/CollatePackageDownloads.cs
+++ b/src/core-sdk-tasks/CollatePackageDownloads.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
diff --git a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs
index 028f1aa32..1e5c9d33e 100644
--- a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs
+++ b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs
index 195ac196b..d4f324ce3 100644
--- a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs
+++ b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/src/core-sdk-tasks/GetRuntimePackRids.cs b/src/core-sdk-tasks/GetRuntimePackRids.cs
index fa7b9b483..f03128599 100644
--- a/src/core-sdk-tasks/GetRuntimePackRids.cs
+++ b/src/core-sdk-tasks/GetRuntimePackRids.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index d28d0aee1..0c1a3a4fc 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -19,27 +19,28 @@
Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/>
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index 73402bced..b107e442c 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -105,6 +105,22 @@
-
+
+
+ $(VersionPrefix)-baseline$(_BuildNumberLabels)
+ $(Version)
+ $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion)
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs
index cdede126c..778c07ea7 100644
--- a/test/EndToEnd/ValidateInsertedManifests.cs
+++ b/test/EndToEnd/ValidateInsertedManifests.cs
@@ -27,14 +27,17 @@ namespace EndToEnd.Tests
{
foreach (var manifestDir in manifestVersionDir.EnumerateDirectories())
{
- var manifestId = manifestDir.Name;
+ var manifestId = manifestVersionDir.Name;
string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName;
- File.Exists(manifestFile).Should().BeTrue();
- using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
- Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
- readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
+ if (!string.Equals(manifestId, "workloadsets"))
+ {
+ new FileInfo(manifestFile).Exists.Should().BeTrue();
+ using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
+ Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
+ readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
+ }
}
}