Skip to content

Commit 3b56f75

Browse files
T-Gromthalmancarlossanlopdotnet-maestro[bot]KevinRansom
authored
[automated] Merge branch 'main' => 'release/dev17.14' (#18410)
* Use correct TFM for source build when OfficialBuildId isn't set (#18397) * Update dependencies coming from maintenance-packages (#18329) * Update dependencies coming from maintenance-packages * Remove temp feed * Sort * Push for real the changes this time * Update to latest in nuget.org * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250320.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25163.3 -> To Version 9.0.0-alpha.1.25170.3 * Bring back conditions * missing space --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> --------- Co-authored-by: Matt Thalman <mthalman@microsoft.com> Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
2 parents 127fd83 + d4a9f13 commit 3b56f75

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

eng/Versions.props

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,29 @@
7171
<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
7272
<!-- PR builds should explicitly specify a version number -->
7373
</PropertyGroup>
74+
<!-- Dependencies from maintenance-packages, source-build specific -->
75+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
76+
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
77+
<SystemMemoryVersion>4.6.2</SystemMemoryVersion>
78+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
79+
</PropertyGroup>
80+
<!-- Dependencies from maintenance-packages, everything else -->
81+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
82+
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
83+
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
84+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
85+
</PropertyGroup>
7486
<PropertyGroup>
7587
<!-- System.* packages -->
7688
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
7789
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
7890
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
79-
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
8091
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
8192
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
8293
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
8394
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackageVersionVersion)</SystemDiagnosticsDiagnosticSourceVersion>
84-
<SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">4.5.5</SystemMemoryVersion>
85-
<SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">4.6.0</SystemMemoryVersion>
8695
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
8796
<SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion>
88-
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
8997
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
9098
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9199
<!-- Versions for package groups -->

src/Compiler/FSharp.Compiler.Service.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
2424
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.)
2525
-->
26-
<TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductDefaultTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
26+
<TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductTargetFramework);$(TargetFrameworks)</TargetFrameworks>
2727
<DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
2828
<OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
2929

src/FSharp.Build/Microsoft.FSharp.NetSdk.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
9494
<Import Project="Microsoft.FSharp.Core.NetSdk.props" /> <!-- Sets initial value of FSharp.Core -->
9595

9696
<PropertyGroup>
97-
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
97+
<ValueTupleImplicitPackageVersion>4.6.1</ValueTupleImplicitPackageVersion>
9898
</PropertyGroup>
9999

100100
<ItemGroup>

0 commit comments

Comments
 (0)