Skip to content

Commit f1c4f5c

Browse files
authored
Merge pull request #16025 from dotnet/merges/main-to-release/dev17.8
Merge main to release/dev17.8
2 parents 803f0e7 + 3a28a4e commit f1c4f5c

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<EnablePreviewFeatures>true</EnablePreviewFeatures>
2222
</PropertyGroup>
2323

24+
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
25+
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
26+
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
27+
</PropertyGroup>
28+
2429
<ItemGroup>
2530
<Compile Include="..\service\FsUnit.fs">
2631
<Link>FsUnit.fs</Link>

tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
<UnitTestType>nunit</UnitTestType>
2020
</PropertyGroup>
2121

22+
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
23+
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
24+
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
25+
</PropertyGroup>
26+
2227
<ItemGroup>
2328
<Content Include="expected-help-output.bsl">
2429
<CopyToOutputDirectory>Never</CopyToOutputDirectory>

tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1515
</PropertyGroup>
1616

17+
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
18+
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
19+
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
20+
</PropertyGroup>
21+
1722
<ItemGroup>
1823
<Compile Include="..\scripts\scriptlib.fsx">
1924
<Link>scriptlib.fsx</Link>

0 commit comments

Comments
 (0)