Skip to content

Commit 894a70f

Browse files
authored
Fix F# nested type definition error & disable x86. (#4972)
Fix FSharp test issue on net10.0 (Nested type definitions are not allowed) and disable F# F# Compiler Service test for x86 runs.
1 parent b50a03d commit 894a70f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/performance/sdk_scenarios.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ScenarioDirectoryName>emptyfsconsoletemplate</ScenarioDirectoryName>
3838
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3939
</SDKWorkItem>
40-
<SDKWorkItem Include="F# Compiler Service">
40+
<SDKWorkItem Include="F# Compiler Service" Condition="$(Architecture) != 'x86'"> <!-- Don't run on x86 as we are hitting OOM exceptions on Viper machines https://github.com/dotnet/performance/issues/4971 -->
4141
<ScenarioDirectoryName>fsharpcompilerservice</ScenarioDirectoryName>
4242
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
4343
</SDKWorkItem>

src/scenarios/fsharpcompilerservice/src/DependencyManager/DependencyProvider.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ type IDependencyManagerProvider =
141141
timeout: int ->
142142
IResolveDependenciesResult
143143

144-
type ReflectionDependencyManagerProvider
144+
type ReflectionDependencyManagerProvider
145145
(
146146
theType: Type,
147147
nameProperty: PropertyInfo,
@@ -154,7 +154,7 @@ type IDependencyManagerProvider =
154154
clearResultCache: MethodInfo option,
155155
outputDir: string option,
156156
useResultsCache: bool
157-
) =
157+
) =
158158

159159
let instance =
160160
if not(isNull (theType.GetConstructor([|typeof<string option>; typeof<bool>|]))) then

0 commit comments

Comments
 (0)