From d88a7ce33799effc85917fe3b2e5df815f333f13 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 17 Jul 2018 16:40:52 +0000 Subject: [PATCH] The SDK-version directory under the SDK directory should match the advertised SDK version. --- build/OutputDirectories.props | 3 +-- src/redist/redist.csproj | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index b0b3d146d..374414c42 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -12,8 +12,7 @@ $([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)')) $(BaseOutputDirectory)/dotnet $(BaseOutputDirectory)/dotnetWithBackwardsCompatibleRuntimes - - $(OutputDirectory)/sdk/$(ToolsetVersion) + $(OutputDirectory)/sdk/$(SdkVersion) $(BaseOutputDirectory)/symbols $(SdkOutputDirectory)/Roslyn $(SdkOutputDirectory)/FSharp diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index ee0e506b6..ac8ccb4de 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -54,7 +54,7 @@ + DestinationFiles="@(Toolset->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />