Skip to content

Commit 78826fd

Browse files
authored
Fix for #11610 + bump SDK to 5.0.300 (#11633)
1 parent 36bdf17 commit 78826fd

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ variables:
5757
- name: VisualStudioDropName
5858
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
5959
- name: DotNetSdkVersion
60-
value: '5.0.100'
60+
value: '5.0.300'
6161
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
6262
- name: RunningAsPullRequest
6363
value: true

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"sdk": {
3-
"version": "5.0.100",
3+
"version": "5.0.300",
44
"rollForward": "minor"
55
},
66
"tools": {
7-
"dotnet": "5.0.100",
7+
"dotnet": "5.0.300",
88
"vs": {
99
"version": "16.8",
1010
"components": [

src/fsharp/CheckExpressions.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4422,7 +4422,8 @@ and TcStaticConstantParameter cenv (env: TcEnv) tpenv kind (StripParenTypes v) i
44224422
| SynConst.Single n when typeEquiv g g.float32_ty kind -> record(g.float32_ty); box (n: single)
44234423
| SynConst.Double n when typeEquiv g g.float_ty kind -> record(g.float_ty); box (n: double)
44244424
| SynConst.Char n when typeEquiv g g.char_ty kind -> record(g.char_ty); box (n: char)
4425-
| SynConst.String (s, _, _) when s <> null && typeEquiv g g.string_ty kind -> record(g.string_ty); box (s: string)
4425+
| SynConst.String (s, _, _)
4426+
| SynConst.SourceIdentifier (_, s, _) when s <> null && typeEquiv g g.string_ty kind -> record(g.string_ty); box (s: string)
44264427
| SynConst.Bool b when typeEquiv g g.bool_ty kind -> record(g.bool_ty); box (b: bool)
44274428
| _ -> fail()
44284429
v, tpenv

tests/fsharp/typeProviders/helloWorld/test.fsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,9 @@ module String =
760760
check "vlkrrevpojvr1"
761761
FSharp.HelloWorld.HelloWorldTypeWithStaticStringParameter<"10000">.StaticProperty1
762762
"You got a static property"
763+
check "vlkrrevpojvr1c"
764+
FSharp.HelloWorld.HelloWorldTypeWithStaticStringParameter<__SOURCE_DIRECTORY__>.StaticProperty1
765+
"You got a static property"
763766

764767
module Bool =
765768
check "vlkrrevpojvr1"

0 commit comments

Comments
 (0)