Remove unused artifacts blobs directory (#17447)
This commit is contained in:
parent
d7ad055f7f
commit
5037974602
6 changed files with 0 additions and 30 deletions
|
@ -102,7 +102,6 @@
|
||||||
<BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
|
<BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
|
||||||
<OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
|
<OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
|
||||||
<IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>
|
<IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>
|
||||||
<LocalBlobStorageRoot>$(IntermediatePath)blobs/</LocalBlobStorageRoot>
|
|
||||||
<LocalNuGetPackagesRoot>$(IntermediatePath)nuget-packages/</LocalNuGetPackagesRoot>
|
<LocalNuGetPackagesRoot>$(IntermediatePath)nuget-packages/</LocalNuGetPackagesRoot>
|
||||||
<SourceBuiltBlobFeedDir>$(IntermediatePath)blob-feed/</SourceBuiltBlobFeedDir>
|
<SourceBuiltBlobFeedDir>$(IntermediatePath)blob-feed/</SourceBuiltBlobFeedDir>
|
||||||
<SourceBuiltPackagesPath>$(SourceBuiltBlobFeedDir)packages/</SourceBuiltPackagesPath>
|
<SourceBuiltPackagesPath>$(SourceBuiltBlobFeedDir)packages/</SourceBuiltPackagesPath>
|
||||||
|
@ -112,9 +111,6 @@
|
||||||
<PrebuiltSourceBuiltPackagesPath>$(PrereqsPackagesDir)previously-source-built/</PrebuiltSourceBuiltPackagesPath>
|
<PrebuiltSourceBuiltPackagesPath>$(PrereqsPackagesDir)previously-source-built/</PrebuiltSourceBuiltPackagesPath>
|
||||||
<PrebuiltSourceBuiltPackagesPath Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' != ''">$(CustomPrebuiltSourceBuiltPackagesPath)/</PrebuiltSourceBuiltPackagesPath>
|
<PrebuiltSourceBuiltPackagesPath Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' != ''">$(CustomPrebuiltSourceBuiltPackagesPath)/</PrebuiltSourceBuiltPackagesPath>
|
||||||
<SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
|
<SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
|
||||||
<SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Sdk/</SourceBuiltToolsetDir>
|
|
||||||
<SourceBuiltRuntimeDir>$(LocalBlobStorageRoot)Runtime/</SourceBuiltRuntimeDir>
|
|
||||||
<SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
|
|
||||||
<LoggingDir>$(BaseOutputPath)logs/</LoggingDir>
|
<LoggingDir>$(BaseOutputPath)logs/</LoggingDir>
|
||||||
<MSBuildDebugPathTargetDir>$(BaseOutputPath)msbuild-debug/</MSBuildDebugPathTargetDir>
|
<MSBuildDebugPathTargetDir>$(BaseOutputPath)msbuild-debug/</MSBuildDebugPathTargetDir>
|
||||||
<RoslynDebugPathTargetDir>$(BaseOutputPath)roslyn-debug/</RoslynDebugPathTargetDir>
|
<RoslynDebugPathTargetDir>$(BaseOutputPath)roslyn-debug/</RoslynDebugPathTargetDir>
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
<MakeDir Directories="$(SourceBuiltBlobFeedDir)" />
|
<MakeDir Directories="$(SourceBuiltBlobFeedDir)" />
|
||||||
<MakeDir Directories="$(SourceBuiltPackagesPath)" />
|
<MakeDir Directories="$(SourceBuiltPackagesPath)" />
|
||||||
<MakeDir Directories="$(SourceBuiltAssetsDir)" />
|
<MakeDir Directories="$(SourceBuiltAssetsDir)" />
|
||||||
<MakeDir Directories="$(LocalBlobStorageRoot)" />
|
|
||||||
<MakeDir Directories="$(MSBuildDebugPathTargetDir)" />
|
<MakeDir Directories="$(MSBuildDebugPathTargetDir)" />
|
||||||
<MakeDir Directories="$(RoslynDebugPathTargetDir)" />
|
<MakeDir Directories="$(RoslynDebugPathTargetDir)" />
|
||||||
<MakeDir Directories="$(AspNetRazorBuildServerLogDir)" />
|
<MakeDir Directories="$(AspNetRazorBuildServerLogDir)" />
|
||||||
|
|
|
@ -70,14 +70,6 @@ namespace Microsoft.DotNet.Build.Tasks
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ITaskItem[] ExtraProperties { get; set; }
|
public ITaskItem[] ExtraProperties { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 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 <pathToAsset>/<assetName> portion only, and the asset
|
|
||||||
/// must be in a <AdditionalAssetDir>/<assetVersion> folder.
|
|
||||||
/// </summary>
|
|
||||||
public string[] AdditionalAssetDirs { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Indicates which properties will be written into the Version props file.
|
/// Indicates which properties will be written into the Version props file.
|
||||||
/// If AllPackages (Default), all packages from previously built repos will be written.
|
/// 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()
|
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 packageElementsToWrite = latestPackages;
|
||||||
var additionalAssetElementsToWrite = additionalAssets;
|
|
||||||
|
|
||||||
// Then, if version flow type is "DependenciesOnly", filter those
|
// Then, if version flow type is "DependenciesOnly", filter those
|
||||||
// dependencies that do not appear in the version.details.xml file.
|
// dependencies that do not appear in the version.details.xml file.
|
||||||
|
@ -220,7 +202,6 @@ namespace Microsoft.DotNet.Build.Tasks
|
||||||
}
|
}
|
||||||
|
|
||||||
packageElementsToWrite = FilterNonDependencies(packageElementsToWrite, dependencies);
|
packageElementsToWrite = FilterNonDependencies(packageElementsToWrite, dependencies);
|
||||||
additionalAssetElementsToWrite = FilterNonDependencies(additionalAssetElementsToWrite, dependencies);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
|
Directory.CreateDirectory(Path.GetDirectoryName(OutputPath));
|
||||||
|
@ -233,7 +214,6 @@ namespace Microsoft.DotNet.Build.Tasks
|
||||||
|
|
||||||
WriteVersionEntries(sw, packageElementsToWrite, "packages");
|
WriteVersionEntries(sw, packageElementsToWrite, "packages");
|
||||||
WriteExtraProperties(sw);
|
WriteExtraProperties(sw);
|
||||||
WriteVersionEntries(sw, additionalAssetElementsToWrite, "additional assets");
|
|
||||||
|
|
||||||
sw.WriteLine(@" <PropertyGroup>");
|
sw.WriteLine(@" <PropertyGroup>");
|
||||||
sw.WriteLine($@" <{CreationTimePropertyName}>{DateTime.UtcNow.Ticks}</{CreationTimePropertyName}>");
|
sw.WriteLine($@" <{CreationTimePropertyName}>{DateTime.UtcNow.Ticks}</{CreationTimePropertyName}>");
|
||||||
|
|
|
@ -174,8 +174,6 @@
|
||||||
(https://github.com/dotnet/source-build/issues/3043). -->
|
(https://github.com/dotnet/source-build/issues/3043). -->
|
||||||
<_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg"
|
<_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg"
|
||||||
Exclude="$(PrebuiltSourceBuiltPackagesPath)System.Drawing.Common*.nupkg" />
|
Exclude="$(PrebuiltSourceBuiltPackagesPath)System.Drawing.Common*.nupkg" />
|
||||||
|
|
||||||
<_CurrentAdditionalAssetDirs Include="$(SourceBuiltToolsetDir)" Condition="Exists('$(SourceBuiltToolsetDir)')" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Error Condition="'$(PackageVersionPropsFlowType)' != 'AllPackages' and '$(PackageVersionPropsFlowType)' != 'DependenciesOnly'"
|
<Error Condition="'$(PackageVersionPropsFlowType)' != 'AllPackages' and '$(PackageVersionPropsFlowType)' != 'DependenciesOnly'"
|
||||||
|
@ -190,7 +188,6 @@
|
||||||
ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)"
|
ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)"
|
||||||
VersionPropsFlowType="$(PackageVersionPropsFlowType)"
|
VersionPropsFlowType="$(PackageVersionPropsFlowType)"
|
||||||
VersionDetails="$(_VersionDetailsXml)"
|
VersionDetails="$(_VersionDetailsXml)"
|
||||||
AdditionalAssetDirs="@(_CurrentAdditionalAssetDirs)"
|
|
||||||
OutputPath="$(CurrentSourceBuiltPackageVersionPropsPath)" />
|
OutputPath="$(CurrentSourceBuiltPackageVersionPropsPath)" />
|
||||||
|
|
||||||
<!-- Create previously source-built inputs info -->
|
<!-- Create previously source-built inputs info -->
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) --arch $(Platform)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) --arch $(Platform)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-nodejs</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) --no-build-nodejs</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PortableBuild=$(_portableRidOverridden) /p:TargetRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PortableBuild=$(_portableRidOverridden) /p:TargetRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
|
||||||
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
||||||
included by Arcade -->
|
included by Arcade -->
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
|
||||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)</BuildCommandArgs>
|
|
||||||
|
|
||||||
<!-- Propagate RID set in source-build to sdk repo -->
|
<!-- Propagate RID set in source-build to sdk repo -->
|
||||||
<_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
|
<_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue