Skip to content

Commit ad5b7a7

Browse files
vzarytovskiivzarytovskii
authored
Attempt to make FCS solution build without arcade and with the SDK specified in global.json (dotnet#14677)
1 parent 448da58 commit ad5b7a7

21 files changed

+187
-67
lines changed

‎.fantomasignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ vsintegration/*
1212
!vsintegration/tests/FSharp.Editor.Tests
1313
artifacts/
1414

15-
# Explicitly unformatted implementation files
16-
15+
# Explicitly unformatted implementation
1716
src/Compiler/Checking/AccessibilityLogic.fs
1817
src/Compiler/Checking/AttributeChecking.fs
1918
src/Compiler/Checking/AugmentWithHashCompare.fs

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ ossreadme*.txt
6868
*.fsproj.user
6969
*.vbproj.user
7070
*.sln.DotSettings.user
71+
*.props.user
7172
launchSettings.json
7273
*.log
7374
*.jrs

‎Directory.Build.props

+28-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,38 @@
11
<Project>
22

3-
<Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
4-
<Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
5-
6-
<!--
3+
<PropertyGroup>
4+
<RepoRoot Condition="'$(RepoRoot)' == ''">$(MSBuildThisFileDirectory)</RepoRoot>
5+
</PropertyGroup>
6+
<!--
77
When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
88
This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local
99
FSharp.Core project.
10-
-->
11-
<PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
12-
<FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
10+
We also disable arcade and reset certain artifacts and compiler paths to use default ones
11+
All settings below can be overriden via CLI switches if needed. -->
12+
13+
<PropertyGroup Condition="'$(SolutionName)' == 'FSharp.Compiler.Service' and '$(BUILDING_USING_DOTNET)' != 'false'">
14+
<BUILDING_USING_DOTNET Condition="'$(BUILDING_USING_DOTNET)' == ''">true</BUILDING_USING_DOTNET>
15+
</PropertyGroup>
16+
17+
<Import Project="$(RepoRoot)/Directory.Build.props.user" Condition = "Exists('$(RepoRoot)/Directory.Build.props.user')" />
18+
19+
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
20+
<DisableAutoSetFscCompilerPath>false</DisableAutoSetFscCompilerPath>
21+
<FSHARPCORE_USE_PACKAGE Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">true</FSHARPCORE_USE_PACKAGE>
22+
<DISABLE_ARCADE Condition="'$(DISABLE_ARCADE)' == ''">true</DISABLE_ARCADE>
23+
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts/</ArtifactsDir>
24+
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
25+
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
26+
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net7.0/fslex.dll</FsLexPath>
27+
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net7.0/fsyacc.dll</FsYaccPath>
28+
<OtherFlags>$(OtherFlags) --test:ParallelCheckingWithSignatureFilesOn</OtherFlags>
1329
</PropertyGroup>
1430

31+
<Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>
32+
33+
<Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
34+
<Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
35+
1536
<ItemGroup>
1637
<!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
1738
<None Include="README.md" Condition="Exists('README.md')" />

‎FSharp.Compiler.Service.sln

+54-3
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
2929
tests\benchmarks\FCSBenchmarks\SmokeTestAllBenchmarks.ps1 = tests\benchmarks\FCSBenchmarks\SmokeTestAllBenchmarks.ps1
3030
EndProjectSection
3131
EndProject
32-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.fsproj", "{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}"
32+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "HistoricalBenchmark", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.fsproj", "{35F5F1C5-AE4F-4B5A-8D94-1AF708724FD5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}"
34+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{C1950E28-1CB7-4DEC-BB3A-8A0443A17282}"
3535
EndProject
36-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HistoricalBenchmark.Runner", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.Runner\HistoricalBenchmark.Runner.fsproj", "{07CD957A-3C31-4F75-A735-16CE72E1BD71}"
36+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "HistoricalBenchmark.Runner", "tests\benchmarks\FCSBenchmarks\BenchmarkComparison\HistoricalBenchmark.Runner\HistoricalBenchmark.Runner.fsproj", "{07CD957A-3C31-4F75-A735-16CE72E1BD71}"
3737
EndProject
3838
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD4D4A7E-D519-4409-89DA-16DCA3EF80AA}"
3939
ProjectSection(SolutionItems) = preProject
4040
src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
41+
Directory.Build.props = Directory.Build.props
42+
Directory.Build.targets = Directory.Build.targets
43+
global.json = global.json
4144
EndProjectSection
4245
EndProject
46+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsc\fscProject\fsc.fsproj", "{A6995088-3C1D-42BC-B3DD-72B1EEAB23F4}"
47+
EndProject
48+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsi", "src\fsi\fsiProject\fsi.fsproj", "{9858ED8A-3889-4B89-BF31-3105B594CB45}"
49+
EndProject
50+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fslex", "buildtools\fslex\fslex.fsproj", "{E7D145CD-ACE4-492D-B9A1-1B4F8560BB3B}"
51+
EndProject
52+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsyacc", "buildtools\fsyacc\fsyacc.fsproj", "{D63BBEE6-DA15-44B6-95DC-CCC50737A441}"
53+
EndProject
54+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AssemblyCheck", "buildtools\AssemblyCheck\AssemblyCheck.fsproj", "{D7428217-FC36-4754-9AC1-85402C0940EF}"
55+
EndProject
56+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build", "src\FSharp.Build\FSharp.Build.fsproj", "{F7A87089-C02E-4EF1-B9AE-6C4EC6407BD1}"
57+
EndProject
58+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core", "src\FSharp.Core\FSharp.Core.fsproj", "{6A61305F-9C5A-4FC1-869A-2CFFBA45A328}"
59+
EndProject
60+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Interactive.Settings", "src\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{AF887C2E-640D-4CD6-A0BD-88AE1517797D}"
61+
EndProject
4362
Global
4463
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4564
Debug|Any CPU = Debug|Any CPU
@@ -86,6 +105,38 @@ Global
86105
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Debug|Any CPU.Build.0 = Debug|Any CPU
87106
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Release|Any CPU.ActiveCfg = Release|Any CPU
88107
{07CD957A-3C31-4F75-A735-16CE72E1BD71}.Release|Any CPU.Build.0 = Release|Any CPU
108+
{A6995088-3C1D-42BC-B3DD-72B1EEAB23F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109+
{A6995088-3C1D-42BC-B3DD-72B1EEAB23F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
110+
{A6995088-3C1D-42BC-B3DD-72B1EEAB23F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
111+
{A6995088-3C1D-42BC-B3DD-72B1EEAB23F4}.Release|Any CPU.Build.0 = Release|Any CPU
112+
{9858ED8A-3889-4B89-BF31-3105B594CB45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113+
{9858ED8A-3889-4B89-BF31-3105B594CB45}.Debug|Any CPU.Build.0 = Debug|Any CPU
114+
{9858ED8A-3889-4B89-BF31-3105B594CB45}.Release|Any CPU.ActiveCfg = Release|Any CPU
115+
{9858ED8A-3889-4B89-BF31-3105B594CB45}.Release|Any CPU.Build.0 = Release|Any CPU
116+
{E7D145CD-ACE4-492D-B9A1-1B4F8560BB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117+
{E7D145CD-ACE4-492D-B9A1-1B4F8560BB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
118+
{E7D145CD-ACE4-492D-B9A1-1B4F8560BB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
119+
{E7D145CD-ACE4-492D-B9A1-1B4F8560BB3B}.Release|Any CPU.Build.0 = Release|Any CPU
120+
{D63BBEE6-DA15-44B6-95DC-CCC50737A441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{D63BBEE6-DA15-44B6-95DC-CCC50737A441}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{D63BBEE6-DA15-44B6-95DC-CCC50737A441}.Release|Any CPU.ActiveCfg = Release|Any CPU
123+
{D63BBEE6-DA15-44B6-95DC-CCC50737A441}.Release|Any CPU.Build.0 = Release|Any CPU
124+
{D7428217-FC36-4754-9AC1-85402C0940EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125+
{D7428217-FC36-4754-9AC1-85402C0940EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
126+
{D7428217-FC36-4754-9AC1-85402C0940EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{D7428217-FC36-4754-9AC1-85402C0940EF}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{F7A87089-C02E-4EF1-B9AE-6C4EC6407BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129+
{F7A87089-C02E-4EF1-B9AE-6C4EC6407BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{F7A87089-C02E-4EF1-B9AE-6C4EC6407BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
131+
{F7A87089-C02E-4EF1-B9AE-6C4EC6407BD1}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{6A61305F-9C5A-4FC1-869A-2CFFBA45A328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{6A61305F-9C5A-4FC1-869A-2CFFBA45A328}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{6A61305F-9C5A-4FC1-869A-2CFFBA45A328}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{6A61305F-9C5A-4FC1-869A-2CFFBA45A328}.Release|Any CPU.Build.0 = Release|Any CPU
136+
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137+
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Debug|Any CPU.Build.0 = Debug|Any CPU
138+
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.Build.0 = Release|Any CPU
89140
EndGlobalSection
90141
GlobalSection(SolutionProperties) = preSolution
91142
HideSolutionNode = FALSE

‎FSharpBuild.Directory.Build.props

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

3-
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4-
<Import Project="eng\targets\Settings.props" />
3+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
4+
<Import Project="eng\targets\Settings.props" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
55

66
<PropertyGroup>
77
<BUILD_IN_FSHARP_REPOSITORY>true</BUILD_IN_FSHARP_REPOSITORY>
@@ -13,6 +13,10 @@
1313
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
1414
</PropertyGroup>
1515

16+
<PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
17+
<DisableAutoSetFscCompilerPath>false</DisableAutoSetFscCompilerPath>
18+
</PropertyGroup>
19+
1620
<PropertyGroup Condition="'$(Configuration)' == 'Proto'">
1721
<FSCoreVersion>$(FSCoreShippedVersion)</FSCoreVersion>
1822
</PropertyGroup>

‎FSharpBuild.Directory.Build.targets

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

3-
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4-
<Import Project="eng\targets\Imports.targets" />
5-
<Import Project="eng\targets\NGenBinaries.targets" />
6-
<Import Project="eng\targets\NuGet.targets" />
3+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
4+
<Import Project="eng\targets\Imports.targets" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
5+
<Import Project="eng\targets\NGenBinaries.targets" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
6+
<Import Project="eng\targets\NuGet.targets" Condition="'$(DISABLE_ARCADE)' != 'true'"/>
77
<Import Project="FSharp.Profiles.props" />
88

99
<PropertyGroup>

‎azure-pipelines.yml

+9-27
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ stages:
524524
# Run Build with Fsharp Experimental Features
525525
# Possible change: --times:$(Build.SourcesDirectory)/artifacts/log/Release/compiler_timing.csv
526526

527-
# Plain build Windows
527+
# Plain FCS build Windows
528528
- job: Plain_Build_Windows
529529
pool:
530530
name: $(DncEngPublicBuildPool)
@@ -535,8 +535,6 @@ stages:
535535
steps:
536536
- checkout: self
537537
clean: true
538-
- script: .\Build.cmd
539-
displayName: Initial build
540538
- script: dotnet --list-sdks
541539
displayName: Report dotnet SDK versions
542540
- task: UseDotNet@2
@@ -547,17 +545,13 @@ stages:
547545
includePreviewVersions: true
548546
workingDirectory: $(Build.SourcesDirectory)
549547
installationPath: $(Agent.ToolsDirectory)/dotnet
550-
- script: dotnet build .\FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
551-
env:
552-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
553-
displayName: Regular rebuild of FSharp.sln
554548
- script: dotnet build .\FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
555549
workingDirectory: $(Build.SourcesDirectory)
556-
env:
557-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
558550
displayName: Regular rebuild of FSharp.Compiler.Service.sln
551+
continueOnError: true
552+
condition: always()
559553

560-
# Plain build Linux
554+
# Plain FCS build Linux
561555
- job: Plain_Build_Linux
562556
pool:
563557
vmImage: $(UbuntuMachineQueueName)
@@ -567,8 +561,6 @@ stages:
567561
steps:
568562
- checkout: self
569563
clean: true
570-
- script: ./build.sh
571-
displayName: Initial build
572564
- script: dotnet --list-sdks
573565
displayName: Report dotnet SDK versions
574566
- task: UseDotNet@2
@@ -579,17 +571,13 @@ stages:
579571
includePreviewVersions: true
580572
workingDirectory: $(Build.SourcesDirectory)
581573
installationPath: $(Agent.ToolsDirectory)/dotnet
582-
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
583-
env:
584-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
585-
displayName: Regular rebuild of FSharp.sln
586574
- script: dotnet build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
587575
workingDirectory: $(Build.SourcesDirectory)
588-
env:
589-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
590576
displayName: Regular rebuild of FSharp.Compiler.Service.sln
577+
continueOnError: true
578+
condition: always()
591579

592-
# Plain build Mac
580+
# Plain FCS build Mac
593581
- job: Plain_Build_MacOS
594582
pool:
595583
vmImage: macos-11
@@ -599,8 +587,6 @@ stages:
599587
steps:
600588
- checkout: self
601589
clean: true
602-
- script: ./build.sh
603-
displayName: Initial build
604590
- script: dotnet --list-sdks
605591
displayName: Report dotnet SDK versions
606592
- task: UseDotNet@2
@@ -611,15 +597,11 @@ stages:
611597
includePreviewVersions: true
612598
workingDirectory: $(Build.SourcesDirectory)
613599
installationPath: $(Agent.ToolsDirectory)/dotnet
614-
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
615-
env:
616-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
617-
displayName: Regular rebuild of FSharp.sln
618600
- script: dotnet build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
619601
workingDirectory: $(Build.SourcesDirectory)
620-
env:
621-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
622602
displayName: Regular rebuild of FSharp.Compiler.Service.sln
603+
continueOnError: true
604+
condition: always()
623605

624606
# Test trimming on Windows
625607
- job: Build_And_Test_Trimming_Windows

‎buildtools/AssemblyCheck/AssemblyCheck.fsproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
</Content>
1515
</ItemGroup>
1616

17-
<ItemGroup>
17+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
1818
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\FSharp.Core\FSharp.Core.fsproj" />
1919
</ItemGroup>
2020

21+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
22+
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
23+
</ItemGroup>
24+
2125
</Project>

‎buildtools/buildtools.proj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
55
<DisableCompilerRedirection>true</DisableCompilerRedirection>
6+
<NoWarn>$(NoWarn);NU1504</NoWarn>
67
</PropertyGroup>
78

89
<ItemGroup>

‎buildtools/fslex/fslex.fsproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
<Compile Include="fslex.fs" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
24+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
2525
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\FSharp.Core\FSharp.Core.fsproj" />
2626
</ItemGroup>
2727

28+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
29+
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
30+
</ItemGroup>
31+
2832
</Project>

‎buildtools/fsyacc/fsyacc.fsproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
<Compile Include="fsyacc.fs" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
24+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
2525
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\FSharp.Core\FSharp.Core.fsproj" />
2626
</ItemGroup>
2727

28+
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">
29+
<PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
30+
</ItemGroup>
31+
2832
</Project>

‎eng/Versions.props

+9-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@
8282
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
8383
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
8484
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
85+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
86+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
87+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
88+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json;
89+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
90+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json;
91+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json;
92+
8593
</RestoreSources>
8694
<!-- System.* packages -->
8795
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
@@ -186,7 +194,7 @@
186194
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
187195
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
188196
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
189-
<MicrosoftNETTestSdkVersion>16.11.0</MicrosoftNETTestSdkVersion>
197+
<MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
190198
<NewtonsoftJsonVersion>13.0.2</NewtonsoftJsonVersion>
191199
<NUnitVersion>3.13.2</NUnitVersion>
192200
<NUnit3TestAdapterVersion>4.1.0</NUnit3TestAdapterVersion>

‎eng/test-determinism.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
3939
$stopWatch.Stop()
4040
Write-Host "Cleaning took $($stopWatch.Elapsed)"
4141

42-
$solution = Join-Path $rootDir "FSharp.Compiler.Service.sln"
42+
$solution = Join-Path $rootDir "Microsoft.FSharp.Compiler.sln"
4343

4444
if ($logFileName -eq "") {
4545
$logFileName = [IO.Path]::GetFileNameWithoutExtension($projectFilePath)
@@ -74,6 +74,7 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
7474
/p:BootstrapBuildPath=$bootstrapDir `
7575
/p:RunAnalyzers=false `
7676
/p:RunAnalyzersDuringBuild=false `
77+
/p:BUILDING_USING_DOTNET=false `
7778
/bl:$logFilePath
7879

7980
Stop-Processes

0 commit comments

Comments
 (0)