Skip to content
Open
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
14 changes: 14 additions & 0 deletions eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
eng/Versions.props / eng/Version.Details.props. Manually-pinned, single-use packages carry
their literal version here directly (no indirection through eng/Versions.props). -->
<Project>
<!-- Evaluate these after source-build has replaced the darc versions with the live runtime package version.
Defining the aliases in Versions.props freezes the pre-override value and can cause CPM downgrades or
prebuilt package usage. The floor only affects normal builds whose flowed version is below MSBuild's
minimum; source-build's live version wins when it is newer. -->
<PropertyGroup>
<SystemRuntimeCentralFloorVersion>10.0.9</SystemRuntimeCentralFloorVersion>
<SystemSecurityCryptographyXmlCentralVersion>$(SystemSecurityCryptographyXmlVersion)</SystemSecurityCryptographyXmlCentralVersion>
<SystemCollectionsImmutableCentralVersion>$(SystemCollectionsImmutableVersion)</SystemCollectionsImmutableCentralVersion>
<SystemReflectionMetadataCentralVersion>$(SystemReflectionMetadataVersion)</SystemReflectionMetadataCentralVersion>
<SystemSecurityCryptographyXmlCentralVersion Condition="'$(SystemSecurityCryptographyXmlVersion)' != '' and $([MSBuild]::VersionLessThan('$(SystemSecurityCryptographyXmlVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemSecurityCryptographyXmlCentralVersion>
<SystemCollectionsImmutableCentralVersion Condition="'$(SystemCollectionsImmutableVersion)' != '' and $([MSBuild]::VersionLessThan('$(SystemCollectionsImmutableVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemCollectionsImmutableCentralVersion>
<SystemReflectionMetadataCentralVersion Condition="'$(SystemReflectionMetadataVersion)' != '' and $([MSBuild]::VersionLessThan('$(SystemReflectionMetadataVersion)', '$(SystemRuntimeCentralFloorVersion)'))">$(SystemRuntimeCentralFloorVersion)</SystemReflectionMetadataCentralVersion>
</PropertyGroup>

<ItemGroup>
<!-- Optimization data (MIBC) — referenced via @(MIBCPackage) in Directory.Build.targets -->
<PackageVersion Include="optimization.windows_nt-x86.mibc.runtime" Version="$(optimizationwindows_ntx86MIBCRuntimeVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7cdb217445905f3342bbb0266a4497b9a014389a" BarId="326717" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="da377e2093fdde18a0d36429a2644638d07685f6" BarId="328805" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.11.0-1.26423.1">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PropertyGroup>
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
<FSharpPreReleaseIteration>1</FSharpPreReleaseIteration>
<FSharpPreReleaseIteration>2</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>rc$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<!-- F# Version components -->
<FSMajorVersion>11</FSMajorVersion>
Expand Down
Loading