Move layout folder
This commit is contained in:
parent
b155e4e8bf
commit
ce468ec79e
2 changed files with 10 additions and 7 deletions
|
@ -1,4 +1,8 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo">
|
||||
<PropertyGroup>
|
||||
<CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
|
||||
|
@ -177,17 +181,17 @@
|
|||
|
||||
</Target>
|
||||
|
||||
<Target Name="CleanPublishDir">
|
||||
<Target Name="CleanLayoutPath">
|
||||
<!-- Remove everything from the publish directory so we don't have left over items from previous builds -->
|
||||
<RemoveDir Directories="$(PublishDir)" />
|
||||
<MakeDir Directories="$(PublishDir)" />
|
||||
<RemoveDir Directories="$(RedistLayoutPath)" />
|
||||
<MakeDir Directories="$(RedistLayoutPath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanPublishDir"
|
||||
<Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanLayoutPath"
|
||||
AfterTargets="Build">
|
||||
|
||||
<ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
|
||||
DestinationDirectory="$(PublishDir)/%(BundledLayoutComponent.RelativeLayoutPath)" />
|
||||
DestinationDirectory="$(RedistLayoutPath)/%(BundledLayoutComponent.RelativeLayoutPath)" />
|
||||
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
@ -55,8 +55,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
|||
else
|
||||
{
|
||||
string configuration = new DirectoryInfo(AppContext.BaseDirectory).Parent.Name;
|
||||
// TODO: Don't put in framework-specific folder (so we don't need to sync TFM here)
|
||||
DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "netcoreapp3.0", "publish", "dotnet" + dotnetExtension);
|
||||
DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "dotnet", "dotnet" + dotnetExtension);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue