mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move layout folder

Browse source
This commit is contained in:
Daniel Plaisted 2018-10-29 12:26:31 -07:00
parent b155e4e8bf
commit ce468ec79e
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/redist/targets/BundledComponents.targets
View file

@ -1,4 +1,8 @@
<Project> <Project>
<PropertyGroup>
<RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
</PropertyGroup>
<Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo"> <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo">
<PropertyGroup> <PropertyGroup>
<CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl> <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
@ -177,17 +181,17 @@
</Target> </Target>
<Target Name="CleanPublishDir"> <Target Name="CleanLayoutPath">
<!-- Remove everything from the publish directory so we don't have left over items from previous builds --> <!-- Remove everything from the publish directory so we don't have left over items from previous builds -->
<RemoveDir Directories="$(PublishDir)" /> <RemoveDir Directories="$(RedistLayoutPath)" />
<MakeDir Directories="$(PublishDir)" /> <MakeDir Directories="$(RedistLayoutPath)" />
</Target> </Target>
<Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanPublishDir" <Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanLayoutPath"
AfterTargets="Build"> AfterTargets="Build">
<ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)" <ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
DestinationDirectory="$(PublishDir)/%(BundledLayoutComponent.RelativeLayoutPath)" /> DestinationDirectory="$(RedistLayoutPath)/%(BundledLayoutComponent.RelativeLayoutPath)" />
</Target> </Target>
</Project> </Project>

3
test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
View file

@ -55,8 +55,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
else else
{ {
string configuration = new DirectoryInfo(AppContext.BaseDirectory).Parent.Name; 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, "dotnet", "dotnet" + dotnetExtension);
DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "netcoreapp3.0", "publish", "dotnet" + dotnetExtension);
} }
} }
} }