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

The SDK-version directory under the SDK directory should match the advertised SDK version.

Browse source
This commit is contained in:
jbeisner 2018-07-17 16:40:52 +00:00
parent 56d34499f4
commit d88a7ce337
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/OutputDirectories.props
View file

@ -12,8 +12,7 @@
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)'))</BaseIntermediateOutputPath>
<OutputDirectory>$(BaseOutputDirectory)/dotnet</OutputDirectory>
<Stage2WithBackwardsCompatibleRuntimesOutputDirectory>$(BaseOutputDirectory)/dotnetWithBackwardsCompatibleRuntimes</Stage2WithBackwardsCompatibleRuntimesOutputDirectory>
<!-- licavalc: we will need to change this depending on how we expose toolset version in the SDK. Right now, keeping the toolset version -->
<SdkOutputDirectory>$(OutputDirectory)/sdk/$(ToolsetVersion)</SdkOutputDirectory>
<SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
<SymbolsDirectory>$(BaseOutputDirectory)/symbols</SymbolsDirectory>
<RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
<FSharpDirectory>$(SdkOutputDirectory)/FSharp</FSharpDirectory>

2
src/redist/redist.csproj
View file

@ -54,7 +54,7 @@
</ItemGroup>
<Copy SourceFiles="@(Toolset)"
DestinationFiles="@(Toolset->'$(OutputDirectory)/sdk/$(ToolsetVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
DestinationFiles="@(Toolset->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="PublishDotnetTools"