Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion azure-pipelines-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ stages:
steps:
- checkout: self
clean: true
- script: .\Build.cmd -c Release -pack
- script: .\Build.cmd -ci -c Release -pack
env:
NativeToolsOnMachine: true
- script: .\eng\common\dotnet.cmd fsi .\tests\AheadOfTime\NetPackage\VerifyNetPackage.fsx -- .\artifacts\packages\Release
Expand Down
11 changes: 5 additions & 6 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ This file should be imported by eng/Versions.props
<PropertyGroup>
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26369.1</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet-msbuild dependencies. Pinned at 18.10.0-1.26370.18 (see eng/Version.Details.xml):
later 18.10.0-1.26371.x builds dropped net10.0 assets and are incompatible with our net10.0 target. -->
<MicrosoftBuildPackageVersion>18.10.0-1.26370.18</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.10.0-1.26370.18</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet-msbuild dependencies -->
<MicrosoftBuildPackageVersion>18.11.0-1.26417.9</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.11.0-1.26417.9</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.11.0-1.26417.9</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.11.0-1.26417.9</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet-optimization dependencies -->
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26407.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26407.1</optimizationlinuxx64MIBCRuntimePackageVersion>
Expand Down
20 changes: 8 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,21 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7cdb217445905f3342bbb0266a4497b9a014389a" BarId="326717" />
<ProductDependencies>
<!-- Pinned at 18.10.0-1.26370.18: the 18.10.0-1.26371.x MSBuild builds dropped their net10.0
assets (they ship net11.0 + net472 only), which is incompatible with this repo's net10.0
product target framework - fsc/fsi fail to load Microsoft.Build.* at runtime. Unpin once
the product moves to net11.0 or MSBuild restores net10.0 assets. -->
<Dependency Name="Microsoft.Build" Version="18.10.0-1.26370.18" Pinned="true">
<Dependency Name="Microsoft.Build" Version="18.11.0-1.26417.9">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
<Sha>842fc358af70a4ef049ba4052dab78882af557ca</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="18.10.0-1.26370.18" Pinned="true">
<Dependency Name="Microsoft.Build.Framework" Version="18.11.0-1.26417.9">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
<Sha>842fc358af70a4ef049ba4052dab78882af557ca</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.10.0-1.26370.18" Pinned="true">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.11.0-1.26417.9">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
<Sha>842fc358af70a4ef049ba4052dab78882af557ca</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.10.0-1.26370.18" Pinned="true">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.11.0-1.26417.9">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
<Sha>842fc358af70a4ef049ba4052dab78882af557ca</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
<!-- System.* packages from dotnet/runtime flow via Version.Details.xml / Version.Details.props (darc). -->
<!-- fsc/fsi and FSharp.Build.UnitTests consume MSBuild 18.10, which pulls these dotnet/runtime packages
transitively at >= 10.0.9 — in product/PR builds AND in source-build (which builds live MSBuild 18.10
<!-- fsc/fsi and FSharp.Build.UnitTests consume MSBuild 18.11, which pulls these dotnet/runtime packages
transitively at >= 10.0.10 — in product/PR builds AND in source-build (which builds live MSBuild 18.11
too, hence the floor must apply there as well). CPM transitive pinning needs the *central* pin to meet
that floor, so define dedicated ...CentralVersion properties for eng/Packages.props. These do NOT touch
the darc-flowed $(System*Version) properties, which stay authoritative for FSharp.Compiler.Service's
shipped nuspec dependency metadata (FCS does not pull MSBuild, so it keeps the darc version). The floor
only raises when darc is below it; once darc flows >= 10.0.9 the darc version wins, so this never
only raises when darc is below it; once darc flows >= 10.0.10 the darc version wins, so this never
freezes or downgrades the flow. -->
<SystemSecurityCryptographyXmlCentralVersion>$(SystemSecurityCryptographyXmlVersion)</SystemSecurityCryptographyXmlCentralVersion>
<SystemCollectionsImmutableCentralVersion>$(SystemCollectionsImmutableVersion)</SystemCollectionsImmutableCentralVersion>
Expand All @@ -104,7 +104,7 @@

<PropertyGroup>
<!-- Minimum central version the MSBuild-pulled dotnet/runtime packages must meet (see comment above). -->
<SystemRuntimeCentralFloorVersion>10.0.9</SystemRuntimeCentralFloorVersion>
<SystemRuntimeCentralFloorVersion>10.0.10</SystemRuntimeCentralFloorVersion>
<SystemSecurityCryptographyXmlCentralVersion Condition="$([MSBuild]::VersionLessThan('$(SystemSecurityCryptographyXmlVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemSecurityCryptographyXmlCentralVersion>
<SystemCollectionsImmutableCentralVersion Condition="$([MSBuild]::VersionLessThan('$(SystemCollectionsImmutableVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemCollectionsImmutableCentralVersion>
<SystemReflectionMetadataCentralVersion Condition="$([MSBuild]::VersionLessThan('$(SystemReflectionMetadataVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemReflectionMetadataCentralVersion>
Expand Down
Loading