diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
index 5099a68b1..2cddad346 100644
--- a/src/SourceBuild/content/Directory.Build.props
+++ b/src/SourceBuild/content/Directory.Build.props
@@ -102,7 +102,6 @@
$(BaseOutputPath)obj/
$(BaseOutputPath)$(Platform)/$(Configuration)/
$(BaseIntermediatePath)$(Platform)/$(Configuration)/
- $(IntermediatePath)blobs/
$(IntermediatePath)nuget-packages/
$(IntermediatePath)blob-feed/
$(SourceBuiltBlobFeedDir)packages/
@@ -112,9 +111,6 @@
$(PrereqsPackagesDir)previously-source-built/
$(CustomPrebuiltSourceBuiltPackagesPath)/
$(OutputPath)
- $(LocalBlobStorageRoot)Sdk/
- $(LocalBlobStorageRoot)Runtime/
- $(LocalBlobStorageRoot)aspnetcore/Runtime/
$(BaseOutputPath)logs/
$(BaseOutputPath)msbuild-debug/
$(BaseOutputPath)roslyn-debug/
diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj
index d98b189da..c132475da 100644
--- a/src/SourceBuild/content/build.proj
+++ b/src/SourceBuild/content/build.proj
@@ -20,7 +20,6 @@
-
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs
index c3b97b2b0..618dd0dd5 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs
@@ -70,14 +70,6 @@ namespace Microsoft.DotNet.Build.Tasks
///
public ITaskItem[] ExtraProperties { get; set; }
- ///
- /// Additional assets to be added to the build output props.
- /// i.e. /bin/obj/x64/Release/blobs/Toolset/3.0.100
- /// This parameter is the / portion only, and the asset
- /// must be in a / folder.
- ///
- public string[] AdditionalAssetDirs { get; set; }
-
///
/// Indicates which properties will be written into the Version props file.
/// If AllPackages (Default), all packages from previously built repos will be written.
@@ -196,17 +188,7 @@ namespace Microsoft.DotNet.Build.Tasks
Version = identity.Version.ToString()
});
- var additionalAssets = (AdditionalAssetDirs ?? new string[0])
- .Where(Directory.Exists)
- .Where(dir => Directory.GetDirectories(dir).Count() > 0)
- .Select(dir => new VersionEntry()
- {
- Name = new DirectoryInfo(dir).Name,
- Version = new DirectoryInfo(Directory.EnumerateDirectories(dir).OrderBy(s => s).Last()).Name
- });
-
var packageElementsToWrite = latestPackages;
- var additionalAssetElementsToWrite = additionalAssets;
// Then, if version flow type is "DependenciesOnly", filter those
// dependencies that do not appear in the version.details.xml file.
@@ -220,7 +202,6 @@ namespace Microsoft.DotNet.Build.Tasks
}
packageElementsToWrite = FilterNonDependencies(packageElementsToWrite, dependencies);
- additionalAssetElementsToWrite = FilterNonDependencies(additionalAssetElementsToWrite, dependencies);
}
Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
@@ -233,7 +214,6 @@ namespace Microsoft.DotNet.Build.Tasks
WriteVersionEntries(sw, packageElementsToWrite, "packages");
WriteExtraProperties(sw);
- WriteVersionEntries(sw, additionalAssetElementsToWrite, "additional assets");
sw.WriteLine(@" ");
sw.WriteLine($@" <{CreationTimePropertyName}>{DateTime.UtcNow.Ticks}{CreationTimePropertyName}>");
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index d77295d2a..1f2bc3249 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -174,8 +174,6 @@
(https://github.com/dotnet/source-build/issues/3043). -->
<_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg"
Exclude="$(PrebuiltSourceBuiltPackagesPath)System.Drawing.Common*.nupkg" />
-
- <_CurrentAdditionalAssetDirs Include="$(SourceBuiltToolsetDir)" Condition="Exists('$(SourceBuiltToolsetDir)')" />
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index e3f4b1664..7a9eac22c 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -15,7 +15,6 @@
$(BuildCommandArgs) --arch $(Platform)
$(BuildCommandArgs) --no-build-repo-tasks
$(BuildCommandArgs) --no-build-nodejs
- $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)
$(BuildCommandArgs) /p:PortableBuild=$(_portableRidOverridden) /p:TargetRuntimeIdentifier=$(OverrideTargetRid)
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 79b1ef060..77dc11bf5 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -5,7 +5,6 @@
$(StandardSourceBuildArgs)
$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)
$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk
- $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)
<_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))