Skip to content

[RFC FS-1003] Nameof operator redux #6809

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
KevinRansom merged 132 commits into from
Jul 3, 2019
Merged

[RFC FS-1003] Nameof operator redux #6809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
d380a0e
substitute 'nameof(<long ident>)` with `Conts(<long ident as string l…
Jan 18, 2017
223d313
Implementing basic nameof and typenameof operators
Jan 18, 2017
529cc6f
Apply feedback
Jan 18, 2017
f3c4ba5
Revert "Apply feedback"
Jan 18, 2017
8fd0392
Revert "Implementing basic nameof and typenameof operators"
Jan 18, 2017
77c8f77
revert nameof and typenameof functions to FSharp.Core
vasily-kirichenko Jan 18, 2017
3070c1d
wip
vasily-kirichenko Jan 18, 2017
b3e712d
it works
vasily-kirichenko Jan 18, 2017
6c6e3b5
Merge remote-tracking branch 'origin/master' into nameof-operator
Jan 19, 2017
7832be5
refactoring
Jan 19, 2017
6581790
make it work on simple `Ident`s
Jan 19, 2017
0f5165f
use proper error message
Jan 19, 2017
22898ad
restrict using `nameof` operator as first class
Jan 19, 2017
e5033af
remove `typenameof` bits
Jan 19, 2017
1ad0a0e
nameof(typeof<_>) works
Jan 19, 2017
c9a64b2
Merge branch 'master' into nameof-operator
vasily-kirichenko Jan 28, 2017
5657759
fix QA tests
vasily-kirichenko Jan 28, 2017
b26994c
Merge branch 'master' into nameof-operator
vasily-kirichenko Feb 3, 2017
a732de0
remove nameof function form FSharp.Core
vasily-kirichenko Feb 3, 2017
b29fe57
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Feb 4, 2017
b7763a6
Revert "remove nameof function form FSharp.Core"
vasily-kirichenko Feb 4, 2017
906a934
Try to resolve the `nameof` operator argument to prevent passing anyt…
vasily-kirichenko Feb 4, 2017
a770e3c
nameof works on generic types
vasily-kirichenko Feb 4, 2017
067955a
fix error range in case of wrong `nameof`operator argument
vasily-kirichenko Feb 4, 2017
bfcc390
notify name resolution sink about nameof operator argument Item in or…
vasily-kirichenko Feb 5, 2017
6a92a80
fully type check `nameof` argument
vasily-kirichenko Feb 5, 2017
bcec600
try to type check arg again
vasily-kirichenko Feb 5, 2017
f64b3c5
Merge remote-tracking branch 'origin/master' into nameof-operator
Feb 6, 2017
0c1cad2
type check `nameof` argument more carefully
vasily-kirichenko Feb 6, 2017
15bf862
Merge remote-tracking branch 'vasily-kirichenko/nameof-operator' into…
vasily-kirichenko Feb 6, 2017
5b72f32
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Feb 15, 2017
ceb7731
Merge branch 'master' into nameof-operator
vasily-kirichenko Mar 1, 2017
588de2e
factor tcExpr to top level function
vasily-kirichenko Mar 1, 2017
f2ae00f
Merge remote-tracking branch 'origin/master' into nameof-operator
vasily-kirichenko Mar 8, 2017
d1b1389
add diagnostics
dsyme Mar 10, 2019
0f89711
add diagnostics
dsyme Mar 10, 2019
7da6aff
diagnostics
dsyme Mar 11, 2019
871489b
diagnostics
dsyme Mar 11, 2019
27d00a0
diagnostics
dsyme Mar 11, 2019
7d98d16
add diagnostics and possible fix for tp smoke tests
dsyme Mar 11, 2019
cc6e992
fix build
dsyme Mar 11, 2019
e13b385
fix build
dsyme Mar 11, 2019
ce0961e
more diagnostics
dsyme Mar 11, 2019
2bb15ce
integrate master
dsyme Mar 11, 2019
8b0d33b
merge with master
dsyme Mar 12, 2019
b1bf49d
update xlf
dsyme Mar 12, 2019
ad61659
fix build
dsyme Mar 12, 2019
90b46fb
revamp implementation for types and modules
dsyme Mar 12, 2019
21b4705
update tests
dsyme Mar 12, 2019
51e2012
try to fix flaky test
dsyme Mar 12, 2019
d482527
fix error numbers
dsyme Mar 12, 2019
26e05dd
fix build
dsyme Mar 12, 2019
8a7f046
update build from source
dsyme Mar 12, 2019
20bf0c5
Merge branch 'diag4' into nameof
dsyme Mar 12, 2019
93ccbbe
update error codes, FSComp.fs and XLF
dsyme Mar 13, 2019
4b91598
fix test
dsyme Mar 13, 2019
1f8f90c
integrate master
dsyme Mar 20, 2019
bf4b336
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Mar 21, 2019
8303215
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Mar 22, 2019
23d7a64
merge master
dsyme Mar 22, 2019
98a29ff
merge master
dsyme Mar 26, 2019
6e7e3c4
us proto build on mac and linux
dsyme Mar 27, 2019
21b46ca
us proto build on mac and linux
dsyme Mar 27, 2019
39ec26a
build right proto on unix
dsyme Mar 27, 2019
4b51197
build right proto on unix
dsyme Mar 27, 2019
8a91110
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
7cc99ca
fix build to really use proto
dsyme Mar 28, 2019
48f30d3
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
c15c030
fix build
dsyme Mar 28, 2019
2715844
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
9d61ee7
update tfms for type providers
dsyme Mar 28, 2019
55c0c2f
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
08d89c7
verbose build
dsyme Mar 28, 2019
dac0ac4
Merge branch 'proto' into nameof
dsyme Mar 28, 2019
a7a132c
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Mar 28, 2019
088951b
try to fix build
dsyme Mar 28, 2019
9c93ac1
don't rebuild proto
dsyme Mar 28, 2019
ddd0ac7
trim list
dsyme Mar 28, 2019
67717f8
disable proto compiler for fslex/fsyacc
dsyme Mar 28, 2019
2eb1528
fix build
dsyme Mar 28, 2019
713b40f
add buildtools props file instead
dsyme Mar 29, 2019
feebc99
add missing file
dsyme Mar 29, 2019
385c4d9
proto
dsyme Mar 29, 2019
9b4ff93
proto
dsyme Mar 29, 2019
40bb2de
simplify
dsyme Mar 29, 2019
2f96a63
more
dsyme Mar 29, 2019
266d695
more
dsyme Mar 29, 2019
0f3ddeb
more
dsyme Mar 29, 2019
7e7fbf0
proto
dsyme Mar 29, 2019
6b20514
try revert
dsyme Mar 29, 2019
8026ae4
Merge branch 'proto2' into nameof
dsyme Mar 29, 2019
bc129ba
Merge branch 'nameof' of https://github.com/dsyme/visualfsharp into n…
dsyme Mar 29, 2019
28cdc00
proto
dsyme Mar 29, 2019
4447207
try again
dsyme Mar 29, 2019
6563fa3
try again
dsyme Mar 29, 2019
f1056d7
disable node reuse
dsyme Mar 29, 2019
7f37ec8
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
ea11aae
fix tests
dsyme Mar 29, 2019
00b9852
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
3456f48
revert diagnostic
dsyme Mar 29, 2019
a74d30b
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
b3209da
revert some changes
dsyme Mar 29, 2019
57292eb
Merge branch 'proto' of https://github.com/dsyme/visualfsharp into proto
dsyme Mar 29, 2019
4ea4705
revert some changes
dsyme Mar 29, 2019
a2df739
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
023a773
Merge branch 'nameof' of https://github.com/dsyme/visualfsharp into n…
dsyme Mar 29, 2019
4f522a2
try again
dsyme Mar 29, 2019
a26b387
Merge branch 'proto' into nameof
dsyme Mar 29, 2019
233105b
merge proto
dsyme Mar 30, 2019
47179ce
fix merge
dsyme Mar 31, 2019
2ff75be
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 1, 2019
06168fd
merge master
dsyme Apr 16, 2019
2b045f5
Merge branch 'proto' into nameof
dsyme Apr 16, 2019
05d9b0f
merge master
dsyme May 22, 2019
ed457e4
Merge pull request #6827 from dotnet/merges/master-to-feature/nameof
May 23, 2019
c82afaa
Merge pull request #6840 from dotnet/merges/master-to-feature/nameof
May 24, 2019
c6234d1
Merge pull request #6858 from dotnet/merges/master-to-feature/nameof
May 25, 2019
896a6e3
code review
dsyme Jun 3, 2019
ebd6350
Merge branch 'feature/nameof' of http://github.com/Microsoft/visualfs…
dsyme Jun 3, 2019
feeeaf4
Merge remote-tracking branch 'upstream/release/fsharp47' into feature…
KevinRansom Jun 3, 2019
b99db08
fix test
KevinRansom Jun 3, 2019
6e23fd5
update surface area tests
KevinRansom Jun 4, 2019
d6e8fab
revert build
KevinRansom Jun 4, 2019
37b638e
Build proto compiler
KevinRansom Jun 4, 2019
664d124
Merge branch 'release/fsharp47' of http://github.com/Microsoft/visual…
dsyme Jun 4, 2019
15a5f73
Merge branch 'release/fsharp47' of http://github.com/Microsoft/visual…
dsyme Jun 15, 2019
a3287ce
merge
KevinRansom Jun 18, 2019
31bbe42
merge
KevinRansom Jun 18, 2019
5200435
tweaks
KevinRansom Jun 18, 2019
7c9bfe5
Merge branch 'release/fsharp47' into feature/nameof
KevinRansom Jun 18, 2019
e95cf67
restore
KevinRansom Jun 18, 2019
77121fd
Merge branch 'release/fsharp47' into feature/nameof
dsyme Jul 1, 2019
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
Prev Previous commit
Next Next commit
fix build
  • Loading branch information
@dsyme
dsyme committed Mar 28, 2019
commit 2eb152834ad0ae8710b699b2e6725bae696c0d94
2 changes: 1 addition & 1 deletion FSharpBuild.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</PropertyGroup>

<!-- SDK targets override -->
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableProtoCompiler)'!='true'">
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableProtoCompiler)'!='true' AND '$(BUILD_IN_FSHARP_REPOSITORY)'=='true'">
<FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
<FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
<FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
Expand Down
10 changes: 5 additions & 5 deletions src/buildtools/buildtools.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
</ItemGroup>

<Target Name="Build">
<MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration)" />
<MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration);DisableProtoCompiler=$9DisableProtoCompiler)" />
</Target>

<Target Name="Rebuild">
<MSBuild Projects="@(Projects)" Targets="Rebuild" Properties="Configuration=$(Configuration)" />
<MSBuild Projects="@(Projects)" Targets="Rebuild" Properties="Configuration=$(Configuration);DisableProtoCompiler=$9DisableProtoCompiler)" />
</Target>

<Target Name="Clean">
<MSBuild Projects="@(Projects)" Targets="Clean" Properties="Configuration=$(Configuration)" />
<MSBuild Projects="@(Projects)" Targets="Clean" Properties="Configuration=$(Configuration);DisableProtoCompiler=$9DisableProtoCompiler)" />
</Target>

<Target Name="Restore">
<MSBuild Projects="@(Projects)" Targets="Restore" Properties="Configuration=$(Configuration)" />
<MSBuild Projects="@(Projects)" Targets="Restore" Properties="Configuration=$(Configuration);DisableProtoCompiler=$9DisableProtoCompiler)" />
</Target>

<Target Name="Publish">
<MSBuild Projects="@(Projects)" Targets="Publish" Properties="Configuration=$(Configuration)" />
<MSBuild Projects="@(Projects)" Targets="Publish" Properties="Configuration=$(Configuration);DisableProtoCompiler=$9DisableProtoCompiler)" />
</Target>

</Project>