Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to fix xlifftasks problem in CI #17588

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Try to fix xlifftasks problem in CI #17588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c83457
Try to fix xlifftasks problem in CI
ViktorHofer Aug 22, 2024
3ba3f0f
Update azure-pipelines-PR.yml
ViktorHofer Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions azure-pipelines-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,6 @@ stages:
- checkout: self
clean: true
- script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
env:
SKIP_NETCURRENT_FSC_BUILD: true
displayName: Build / Test
- task: PublishTestResults@2
displayName: Publish Test Results
Expand Down Expand Up @@ -597,7 +595,6 @@ stages:
- script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
env:
COMPlus_DefaultStackSize: 1000000
SKIP_NETCURRENT_FSC_BUILD: true
displayName: Build / Test
- task: PublishTestResults@2
displayName: Publish Test Results
Expand Down
13 changes: 5 additions & 8 deletions src/Compiler/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">
Expand All @@ -14,14 +14,11 @@
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<CheckNulls>true</CheckNulls>
<!-- Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations.
Therefore we want to use the latest BCL APIs from NetCurrent.
We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally.

On CI, OSX has problems with Xliff targets for net9, skipping via SKIP_NETCURRENT_FSC_BUILD until resolved ( The target "UpdateXlf" does not exist in the project.)
-->
<TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductDefaultTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
<!-- Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations.
Therefore we want to use the latest BCL APIs from NetCurrent.
We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally. -->
<TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(Configuration)' != 'Proto'">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
<DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
<OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
<!-- 1182: Unused variables -->
Expand Down
Loading