Skip to content

fix building in VS with PDB conversions #4548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettfo merged 1 commit into from
Mar 15, 2018
Merged

fix building in VS with PDB conversions #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions FSharp.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
<PropertyGroup>
<!-- default NuGet package restore location -->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
<!-- ensure there is a trailing slash -->
<NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
<NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (

set _dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
set NUGET_PACKAGES=%~dp0Packages
set NUGET_PACKAGES=%~dp0packages
set path=%~dp0Tools\dotnet20\;%path%

echo ----------- Done with package restore, starting dependency uptake check -------------
Expand Down
1 change: 1 addition & 0 deletions vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<IncludePkgdefInVSIXContainer>true</IncludePkgdefInVSIXContainer>
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
<DisableOutputPathCopying>true</DisableOutputPathCopying>
Copy link
Contributor

@dsyme dsyme Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need this on a few more projects

Copy link
Member Author

@brettfo brettfo Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point we shouldn't. The only projects picking up the path copying hack from FSharp.Directory.Build.targets are projects converted to the SDK where the copy hack is necessary, and this property pages project. All other projects in our repo directly write outputs to release\net40\bin, but because we ultimately depend on $(TargetFramework) from SDK projects to determine release\net40\bin vs. release\coreclr\bin, we have to copy files after the build has completed.

tl;dr - This is the only project file that can properly set $(OutputPath) and that pulls in FSharp.Directory.Build.targets which defaults to the copy hack.

Copy link
Contributor

@dsyme dsyme Mar 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, understood, thanks. I thought it was about the Copy File conflicts.

</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
Expand Down