-
Notifications
You must be signed in to change notification settings - Fork 842
Preview package #6761
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
Merged
Merged
Preview package #6761
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
36b6494
Allow targetting of preview FSharp.Core. Parameterize dsharp.core ve…
KevinRansom cc7e332
Parameterise app.config generation
KevinRansom 11a5e67
parameterize banner text
KevinRansom 92d75d8
Do app.config right
KevinRansom fc53a49
fcs
KevinRansom 132595c
fcs tests
KevinRansom 1aef952
add discriminator
KevinRansom 608c0e9
Update FSharp.Compiler.Service.ProjectCrackerTool.fsproj
KevinRansom 83ead13
remove dead file
KevinRansom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,58 @@ | ||
| <Project> | ||
| <!-- empty to prevent directory crawling --> | ||
|
|
||
| <Target Name="CopyAndSubstituteTextFiles" | ||
| Inputs="@(CopyAndSubstituteText)" | ||
| Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')" | ||
| BeforeTargets="BeforeBuild"> | ||
|
|
||
| <PropertyGroup> | ||
| <__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath> | ||
| <__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName> | ||
|
|
||
| <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText> | ||
| <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText> | ||
| <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText> | ||
| </PropertyGroup> | ||
|
|
||
| <MakeDir | ||
| Directories="$(IntermediateOutputPath)" | ||
| Condition="!Exists('$(IntermediateOutputPath)')" /> | ||
| <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" /> | ||
|
|
||
| <!-- Make sure it will get cleaned --> | ||
| <ItemGroup > | ||
| <None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" /> | ||
| <None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" /> | ||
| <FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="_GenerateBuildPropertiesFile" | ||
| Outputs="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" | ||
| BeforeTargets="BeforeBuild" | ||
| Condition="'$(Language)'=='F#'"> | ||
|
|
||
| <ItemGroup> | ||
| <_BuildPropertyLines Remove="@(_BuildPropertyLines)" /> | ||
| <_BuildPropertyLines Include="// <auto-generated >" /> | ||
| <_BuildPropertyLines Include="// <Generated by the FSharp WriteCodeFragment class./>" /> | ||
| <_BuildPropertyLines Include="// </auto-generated/>" /> | ||
| <_BuildPropertyLines Include="//" /> | ||
| <_BuildPropertyLines Include="module internal FSharp.BuildProperties" /> | ||
| <_BuildPropertyLines Include="let fsProductVersion = "$(FSPRODUCTVERSION)"" /> | ||
| <_BuildPropertyLines Include="let fsLanguageVersion = "$(FSLANGUAGEVERSION)"" /> | ||
| </ItemGroup> | ||
|
|
||
| <MakeDir | ||
| Directories="$(IntermediateOutputPath)$(ProjectName)" | ||
| Condition="!Exists('$(IntermediateOutputPath)$(ProjectName)')" /> | ||
| <WriteLinesToFile File="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" /> | ||
|
|
||
| <!-- Make sure it will get cleaned --> | ||
| <ItemGroup> | ||
| <FileWrites Include="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" /> | ||
| <CompileBefore Include="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| # FSharp.Build resource strings | ||
| toolpathUnknown,"ToolPath is unknown; specify the path to the tool." | ||
| toolpathUnknown,"ToolPath is unknown; specify the path to the tool." | ||
| fSharpBannerVersion,"%s for F# %s" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Might want to change this to:
<note>Contains version numbers. E.g., '10.4.3 for F# 4.6'</note>so the translators know what's happening.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.
I like that … good idea.
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.
I tried it, and the note I had added got overwritten.