Skip to content

Commit 91e80c7

Browse files
KevinRansomvzarytovskii
KevinRansom
and
vzarytovskii
authored
To net70 (dotnet#13706)
* tonet70 * Added test back, removed a attributes mock, since we run on NET7 now; Fixed global.json; Removed arcade change * Update global.json * Update global.json * Bring back /bl Co-authored-by: Vlad Zarytovskii <[email protected]>
1 parent f73d774 commit 91e80c7

File tree

65 files changed

+387
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+387
-306
lines changed

‎.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// TODO: Shall we assume that it's already been built, or build it every time we debug?
1818
// "preLaunchTask": "Build (Debug)",
1919
// If you have changed target frameworks, make sure to update the program p
20-
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net6.0/fsi.dll",
20+
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net7.0/fsi.dll",
2121
"cwd": "${workspaceFolder}/src",
2222
"console": "integratedTerminal", // This is the default to be able to run in Codespaces.
2323
"internalConsoleOptions": "neverOpen",
@@ -42,7 +42,7 @@
4242
// TODO: Shall we assume that it's already been built, or build it every time we debug?
4343
// "preLaunchTask": "Build (Debug)",
4444
// If you have changed target frameworks, make sure to update the program path.
45-
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net6.0/fsc.dll",
45+
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net7.0/fsc.dll",
4646
"args": [
4747
"${input:argsPrompt}"
4848
],

‎FSharpBuild.Directory.Build.targets

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
<Import Project="eng\targets\NuGet.targets" />
77
<Import Project="FSharp.Profiles.props" />
88

9+
<PropertyGroup>
10+
<DefineConstants Condition="'$(Configuration)'=='release'">$(DefineConstants);Release</DefineConstants>
11+
<DefineConstants Condition="'$(Configuration)'=='debug'">$(DefineConstants);Debug</DefineConstants>
12+
</PropertyGroup>
13+
914
<ItemDefinitionGroup>
1015
<NoneSubstituteText>
1116
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -137,8 +142,8 @@
137142
</PropertyGroup>
138143

139144
<Target Name="PrefixRepoToReleaseNotes"
145+
AfterTargets="InitializeSourceControlInformationFromSourceControlManager"
140146
BeforeTargets="InitializeStandardNuspecProperties"
141-
DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager"
142147
Condition="'$(IsPackable)'=='true'">
143148

144149
<PropertyGroup>

‎FSharpTests.Directory.Build.props

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath>
2323
<FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
2424
<FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
25-
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net6.0\fsc.dll</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net7.0\fsc.dll</DotnetFscCompilerPath>
2626

2727
<FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath>
2828
<FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
2929
<FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
30-
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net6.0\fsi.dll</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net7.0\fsi.dll</DotnetFsiCompilerPath>
3131
</PropertyGroup>
3232

3333
<!-- SDK targets override -->
3434
<PropertyGroup>
3535
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
36-
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net6.0</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net7.0</_FSharpBuildTargetFramework>
3737
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
3838

3939
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
@@ -42,6 +42,7 @@
4242
<FSharpPropsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
4343
<FSharpTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
4444
<FSharpOverridesTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
45+
4546
</PropertyGroup>
4647

4748
</Project>

‎buildtools/AssemblyCheck/AssemblyCheck.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
88
</PropertyGroup>

‎buildtools/fslex/fslex.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

‎buildtools/fsyacc/fsyacc.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

‎eng/Build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ function Process-Arguments() {
181181

182182
function Update-Arguments() {
183183
if ($script:noVisualStudio) {
184-
$script:bootstrapTfm = "net6.0"
184+
$script:bootstrapTfm = "net7.0"
185185
$script:msbuildEngine = "dotnet"
186186
}
187187

188-
if ($bootstrapTfm -eq "net6.0") {
188+
if ($bootstrapTfm -eq "net7.0") {
189189
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
190190
$script:bootstrap = $True
191191
}
@@ -206,7 +206,7 @@ function BuildSolution([string] $solutionName) {
206206
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
207207
$toolsetBuildProj = InitializeToolset
208208
$quietRestore = !$ci
209-
$testTargetFrameworks = if ($testCoreClr) { "net6.0" } else { "" }
209+
$testTargetFrameworks = if ($testCoreClr) { "net7.0" } else { "" }
210210

211211
# Do not set the property to true explicitly, since that would override value projects might set.
212212
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
@@ -493,7 +493,7 @@ try {
493493
$script:BuildCategory = "Test"
494494
$script:BuildMessage = "Failure running tests"
495495
$desktopTargetFramework = "net472"
496-
$coreclrTargetFramework = "net6.0"
496+
$coreclrTargetFramework = "net7.0"
497497

498498
if ($testDesktop) {
499499
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true

‎eng/DumpPackageRoot/DumpPackageRoot.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Used as a diagnostic tool to view the state of the NuGet package cache as it existed immediately after a restore/build. -->
44

55
<PropertyGroup>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net7.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
9494
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
9595
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
96-
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
96+
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
9797
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
9898
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
9999
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>

‎eng/build-utils.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ function Make-BootstrapBuild() {
251251
}
252252
Exec-Console $dotnetExe $args
253253

254-
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\net6.0" -Destination "$dir\fslex" -Force -Recurse
255-
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\net6.0" -Destination "$dir\fsyacc" -Force -Recurse
256-
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\net6.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
254+
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\net7.0" -Destination "$dir\fslex" -Force -Recurse
255+
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\net7.0" -Destination "$dir\fsyacc" -Force -Recurse
256+
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\net7.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
257257

258258
# prepare compiler
259259
$protoProject = "`"$RepoRoot\proto.sln`""

‎eng/build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,16 @@ function BuildSolution {
261261
/p:Configuration=$bootstrap_config
262262

263263
mkdir -p "$bootstrap_dir"
264-
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net6.0 $bootstrap_dir/fslex
265-
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net6.0 $bootstrap_dir/fsyacc
264+
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net7.0 $bootstrap_dir/fslex
265+
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net7.0 $bootstrap_dir/fsyacc
266266
fi
267267
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
268268
BuildMessage="Error building bootstrap"
269269
MSBuild "$repo_root/Proto.sln" \
270270
/restore \
271271
/p:Configuration=$bootstrap_config
272272

273-
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net6.0 $bootstrap_dir/fsc
273+
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net7.0 $bootstrap_dir/fsc
274274
fi
275275
fi
276276

@@ -312,7 +312,7 @@ InitializeDotNetCli $restore
312312
BuildSolution
313313

314314
if [[ "$test_core_clr" == true ]]; then
315-
coreclrtestframework=net6.0
315+
coreclrtestframework=net7.0
316316
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
317317
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
318318
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
@@ -322,7 +322,7 @@ if [[ "$test_core_clr" == true ]]; then
322322
fi
323323

324324
if [[ "$test_compilercomponent_tests" == true ]]; then
325-
coreclrtestframework=net6.0
325+
coreclrtestframework=net7.0
326326
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
327327
fi
328328

‎eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ function MSBuild-Core {
490490
}
491491
}
492492

493-
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
493+
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci /bl "$@"
494494
}
495495

496496
ResolvePath "${BASH_SOURCE[0]}"

‎eng/test-determinism.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ try {
379379
$script:bootstrapTfm = "net472"
380380

381381
if ($script:msbuildEngine -eq "dotnet") {
382-
$script.bootstrapTfm = "net6.0"
382+
$script.bootstrapTfm = "net7.0"
383383
}
384384

385385
$bootstrapDir = Make-BootstrapBuild

‎fcs-samples/EditorService/EditorService.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>$(FcsTargetNetFxFramework);net6.0</TargetFrameworks>
4+
<TargetFrameworks>$(FcsTargetNetFxFramework);net7.0</TargetFrameworks>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>

‎global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-preview.7.22377.5",
3+
"version": "7.0.100-preview.6.22352.1",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "7.0.100-preview.7.22377.5",
8+
"dotnet": "7.0.100-preview.6.22352.1",
99
"vs": {
1010
"version": "17.0",
1111
"components": [
@@ -18,7 +18,7 @@
1818
"perl": "5.32.1.1"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1",
22-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
21+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
22+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2"
2323
}
2424
}

‎src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PreRelease>true</PreRelease>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net7.0</TargetFramework>
77
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
88
<IsPackable>true</IsPackable>
99
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>

‎src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec

+14-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$CommonMetadataElements$
55
<language>en-US</language>
66
<dependencies>
7-
<group targetFramework=".NET6.0" />
7+
<group targetFramework=".NET7.0" />
88
</dependencies>
99
<contentFiles>
1010
<files include="any\any\default.win32manifest" buildAction="Content" copyToOutput="true" flatten="false" />
@@ -26,16 +26,16 @@
2626
this approach gives a very small deployment. Which is kind of necessary.
2727
-->
2828
<!-- assemblies -->
29-
<file src="fsc\$Configuration$\net6.0\fsc.dll" target="lib\net6.0" />
30-
<file src="fsi\$Configuration$\net6.0\fsi.dll" target="lib\net6.0" />
31-
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\net6.0" />
32-
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\net6.0" />
33-
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\net6.0" />
34-
<file src="FSharp.Build\$Configuration$\netstandard2.0\FSharp.Build.dll" target="lib\net6.0" />
29+
<file src="fsc\$Configuration$\net7.0\fsc.dll" target="lib\net7.0" />
30+
<file src="fsi\$Configuration$\net7.0\fsi.dll" target="lib\net7.0" />
31+
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\net7.0" />
32+
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\net7.0" />
33+
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\net7.0" />
34+
<file src="FSharp.Build\$Configuration$\netstandard2.0\FSharp.Build.dll" target="lib\net7.0" />
3535
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
36-
target="lib\net6.0" />
36+
target="lib\net7.0" />
3737
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
38-
target="lib\net6.0" />
38+
target="lib\net7.0" />
3939

4040
<!-- additional files -->
4141
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\default.win32manifest" target="contentFiles\any\any" />
@@ -46,14 +46,14 @@
4646
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
4747

4848
<!-- resources -->
49-
<file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\net6.0" />
49+
<file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\net7.0" />
5050
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
51-
target="lib\net6.0" />
51+
target="lib\net7.0" />
5252
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
53-
target="lib\net6.0" />
54-
<file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net6.0" />
53+
target="lib\net7.0" />
54+
<file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net7.0" />
5555
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
56-
target="lib\net6.0" />
56+
target="lib\net7.0" />
5757
<file src="$artifactsPackagesDir$Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
5858
<file src="$artifactsPackagesDir$Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
5959
<file src="$artifactsPackagesDir$Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg"

‎src/fsc/fscProject/fsc.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Project Sdk="Microsoft.NET.Sdk">
44

55
<PropertyGroup Condition="'$(BUILD_PROTO)' != 'true'">
6-
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net6.0</TargetFrameworks>
7-
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net7.0</TargetFrameworks>
7+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net7.0</TargetFrameworks>
88
<PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
99
<Configurations>Debug;Release;Proto</Configurations>
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition="'$(BUILD_PROTO)' == 'true'">
1313
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472</TargetFrameworks>
14-
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0</TargetFrameworks>
14+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net7.0</TargetFrameworks>
1515
<PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
1616
</PropertyGroup>
1717

‎src/fsi/fsi.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Reference Include="WindowsBase" />
5151
</ItemGroup>
5252

53-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
53+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
5454
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
5555
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
5656
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />

0 commit comments

Comments
 (0)