-
Notifications
You must be signed in to change notification settings - Fork 831
Microbuild support for F# codebase #1023
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.
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
Changes from all commits
e3572fa
a696831
45d1eed
de72f4e
2f89e4f
4d695e0
8511c0a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,8 +102,12 @@ For **Debug** this corresponds to these steps, which you can run individually fo | |
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 | ||
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 | ||
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 | ||
| msbuild VisualFSharp.sln | ||
| msbuild vsintegration/fsharp-vsintegration-src-build.proj | ||
| msbuild vsintegration/fsharp-vsintegration-project-templates-build.proj | ||
| msbuild vsintegration/fsharp-vsintegration-item-templates-build.proj | ||
| msbuild vsintegration/fsharp-vsintegration-deployment-build.proj | ||
| msbuild vsintegration\fsharp-vsintegration-unittests-build.proj | ||
| msbuild tests/fsharp/FSharp.Tests.fsproj | ||
| src\update.cmd debug -ngen | ||
| tests\BuildTestTools.cmd debug | ||
|
|
||
|
|
@@ -123,39 +127,15 @@ For **Release** this corresponds to these steps, which you can run individually | |
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release | ||
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release | ||
| msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release | ||
| msbuild VisualFSharp.sln /p:Configuration=Release | ||
| msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release | ||
| msbuild vsintegration/fsharp-vsintegration-src-build.proj /p:Configuration=Release | ||
| msbuild vsintegration/fsharp-vsintegration-project-templates-build.proj /p:Configuration=Release | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is the replacement for these instructions? Does a build now clobber the F# SDK and installed Visual F# IDE Tools on the machine? If so, for which VS version?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No replacement. This PR removes the special 9055 version redirection, and uses one unified assembly version. VS developers run the VSIX they want to debug, and VS will load all the correct assemblies at runtime. I'll update the md file to make this more clearer and send a PR out.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see you already overwrote it :)
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep, I put a new version of the info in, but I'm not sure if it's quite what you intended. Please take a look :) |
||
| msbuild vsintegration/fsharp-vsintegration-item-templates-build.proj /p:Configuration=Release | ||
| msbuild vsintegration/fsharp-vsintegration-deployment-build.proj /p:Configuration=Release | ||
| msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release | ||
| msbuild tests/fsharp/FSharp.Tests.fsproj /p:Configuration=Release | ||
| src\update.cmd release -ngen | ||
| tests\BuildTestTools.cmd release | ||
|
|
||
| ### 4. [Optional] Install the Visual F# IDE Tools and Clobber the F# SDK on the machine | ||
|
|
||
| **Note:** Step #2 below will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools | ||
| components installed into Visual Studio 2015. You can revert this step by disabling or uninstalling the addin. | ||
|
|
||
| **Note:** Step #3 below will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used | ||
| by Visual F# Interactive and the ``fsc.exe`` used by ``Microsoft.FSharp.targets``. Repairing Visual Studio 2015 is currently the | ||
| only way to revert this step. | ||
|
|
||
| **Note:** After you complete the install, the FSharp.Core referenced by your projects will not be updated. If you want to make | ||
| a project that references your updated FSharp.Core, you must explicitly change the ``TargetFSharpCoreVersion`` in the .fsproj | ||
| file to ``4.4.0.5099`` (or a corresponding portable version number with suffix ``5099``). | ||
|
|
||
| For **Debug**: | ||
|
|
||
| 1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall | ||
| 1. Run ``debug\net40\bin\EnableOpenSource.vsix`` | ||
| 1. Run ``vsintegration\update-vsintegration.cmd debug`` (clobbers the installed F# SDK) | ||
|
|
||
| For **Release**: | ||
|
|
||
| 1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall | ||
| 1. Run ``release\net40\bin\EnableOpenSource.vsix`` | ||
| 1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK) | ||
|
|
||
| Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive. | ||
|
|
||
|
|
||
| ### Notes on the build | ||
|
|
||
| 1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges. | ||
|
|
||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. --> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is not specific to MicroBuild is it? If not, then change it's name to just |
||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| <ItemGroup> | ||
| <ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="src/fsharp-typeproviders-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-deployment-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" /> | ||
| <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj" /> | ||
|
|
||
| <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj" /> | ||
| <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="Build"> | ||
| <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Build" BuildInParallel="true"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable47"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable7"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable78"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable259"/> | ||
| </Target> | ||
|
|
||
| <Target Name="Rebuild"> | ||
| <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Rebuild" BuildInParallel="true"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable47"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable7"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable78"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable259"/> | ||
| </Target> | ||
|
|
||
| <Target Name="Clean"> | ||
| <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Clean" BuildInParallel="true"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable47"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable7"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable78"/> | ||
| <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable259"/> | ||
| </Target> | ||
| </Project> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a mix of forward and backslashes here