Skip to content

Commit b16f43b

Browse files
authored
Disable UpdateXlfOnBuild for VMR builds (#17585)
1 parent 8e11468 commit b16f43b

File tree

81 files changed

+730
-734
lines changed

Some content is hidden

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

81 files changed

+730
-734
lines changed

FSharpBuild.Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@
7070

7171
<!-- localization -->
7272
<PropertyGroup>
73-
<EnableXlfLocalization Condition="'$(EnableXlfLocalization)' == '' AND ('$(Configuration)' == 'Proto' OR '$(MonoPackaging)' == 'true')">false</EnableXlfLocalization>
74-
<UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
73+
<EnableXlfLocalization Condition="'$(EnableXlfLocalization)' == '' AND ('$(Configuration)' == 'Proto' OR '$(MonoPackaging)' == 'true')">false</EnableXlfLocalization>
7574
</PropertyGroup>
7675

7776
<!-- source build -->

azure-pipelines-PR.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,6 @@ stages:
553553
- checkout: self
554554
clean: true
555555
- script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
556-
env:
557-
SKIP_NETCURRENT_FSC_BUILD: true
558556
displayName: Build / Test
559557
- task: PublishTestResults@2
560558
displayName: Publish Test Results
@@ -597,7 +595,6 @@ stages:
597595
- script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
598596
env:
599597
COMPlus_DefaultStackSize: 1000000
600-
SKIP_NETCURRENT_FSC_BUILD: true
601598
displayName: Build / Test
602599
- task: PublishTestResults@2
603600
displayName: Publish Test Results

src/Compiler/FSharp.Compiler.Service.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
2020
For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally.
2121
22-
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.)
22+
OSX and Linux has problems with Xliff targets for net9, skipping via SKIP_NETCURRENT_FSC_BUILD until resolved ( The target "UpdateXlf" does not exist in the project.)
2323
-->
2424
<TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductDefaultTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
2525
<DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>

vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.cs.xlf

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.de.xlf

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.es.xlf

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.fr.xlf

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)