Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf1c70a0

Browse files
committed
Remove BUILDING_PROTO #ifdefs when building proto ensure that FX_ATLEAST_45 is not set
1 parent4952102 commitf1c70a0

File tree

2 files changed

+11
-25
lines changed

2 files changed

+11
-25
lines changed

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<PropertyGroupCondition="'$(TargetFramework)'=='net20'">
104104
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
105105
<DefineConstants>$(DefineConstants);FSHARP_CORE_2_0</DefineConstants>
106-
<DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
106+
<DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
107107
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
108108
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
109109
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
@@ -123,7 +123,7 @@
123123
<PropertyGroupCondition="'$(TargetFramework)'=='net40'">
124124
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
125125
<DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
126-
<DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
126+
<DefineConstantsCondition="'$(Configuration)'!='Proto'">$(DefineConstants);FX_ATLEAST_45</DefineConstants>
127127
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
128128
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
129129
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>

‎src/fsharp/ReferenceResolution.fs‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,13 @@ module internal MSBuildResolver =
9191
letprivateNet40="v4.0"
9292
[<Literal>]
9393
letprivateNet45="v4.5"
94-
#if BUILDING_PROTO
95-
#else
9694
[<Literal>]
9795
letprivateNet451="v4.5.1"
98-
#endif
9996

100-
#if BUILDING_PROTO
101-
letSupportedNetFrameworkVersions= set[ Net20; Net30; Net35; Net40; Net45;(*SL only*)"v5.0"]
102-
#else
10397
letSupportedNetFrameworkVersions= set[ Net20; Net30; Net35; Net40; Net45; Net451;(*SL only*)"v5.0"]
104-
#endif
105-
letGetPathToDotNetFramework(v)=
98+
10699
#if FX_ATLEAST_45
100+
letGetPathToDotNetFramework(v)=
107101
letv=
108102
match vwith
109103
| Net11-> Some TargetDotNetFrameworkVersion.Version11
@@ -112,10 +106,7 @@ module internal MSBuildResolver =
112106
| Net35-> Some TargetDotNetFrameworkVersion.Version35
113107
| Net40-> Some TargetDotNetFrameworkVersion.Version40
114108
| Net45-> Some TargetDotNetFrameworkVersion.Version45
115-
#if BUILDING_PROTO
116-
#else
117109
| Net451-> Some TargetDotNetFrameworkVersion.Version451
118-
#endif
119110
|_->assertfalse; None
120111
match vwith
121112
| Some v->
@@ -124,21 +115,19 @@ module internal MSBuildResolver =
124115
| x->[x]
125116
|_->[]
126117
#else
118+
letGetPathToDotNetFramework(_)=
127119
// FX_ATLEAST_45 is not defined for step when we build compiler with proto compiler.
128120
[]
129121
#endif
130122

131-
letDeriveTargetFrameworkDirectoriesFor40Plus(version)=
132123
#if FX_ATLEAST_45
124+
letDeriveTargetFrameworkDirectoriesFor40Plus(version)=
133125
// starting with .Net 4.0, the runtime dirs (WindowsFramework) are never used by MSBuild RAR
134126
letv=
135127
match versionwith
136128
| Net40-> Some TargetDotNetFrameworkVersion.Version40
137129
| Net45-> Some TargetDotNetFrameworkVersion.Version45
138-
#if BUILDING_PROTO
139-
#else
140130
| Net451-> Some TargetDotNetFrameworkVersion.Version451
141-
#endif
142131
|_->assertfalse; None// unknown version - some parts in the code are not synced
143132
match vwith
144133
| Some v->
@@ -147,21 +136,18 @@ module internal MSBuildResolver =
147136
| x->[x]
148137
| None->[]
149138
#else
139+
letDeriveTargetFrameworkDirectoriesFor40Plus(_)=
150140
// FX_ATLEAST_45 is not defined for step when we build compiler with proto compiler.
151141
[]
152142
#endif
153143

154144
/// Determine the default "frameworkVersion" (which is passed into MSBuild resolve).
155145
/// This code uses MSBuild to determine version of the highest installed framework.
156146
letHighestInstalledNetFrameworkVersionMajorMinor()=
157-
#if FX_ATLEAST_45
158-
#if BUILDING_PROTO
159-
#else
160-
if box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451))<>nullthen4, Net451
161-
else
162-
#endif
163-
if box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45))<>nullthen4, Net45
164-
else4, Net40// version is 4.0 assumed since this code is running.
147+
#if FX_ATLEAST_45
148+
if box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451))<>nullthen4, Net451
149+
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45))<>nullthen4, Net45
150+
else4, Net40// version is 4.0 assumed since this code is running.
165151
#else
166152
// FX_ATLEAST_45 is not defined is required for step when we build compiler with proto compiler and this branch should not be hit
167153
4, Net40

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp