Skip to content

Include FSharp pre-release packages in the SDK transport package #18701

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

Merged
merged 9 commits into from
Jun 24, 2025
Merged

Include FSharp pre-release packages in the SDK transport package #18701

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9129f5a
Include FSharp pre-release packages in the SDK transport package
mmitche Jun 18, 2025
8b792ac
Update src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
mmitche Jun 19, 2025
4ef4fdb
Update src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
mmitche Jun 19, 2025
46d8932
Update src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
mmitche Jun 19, 2025
7eb5f24
Prerelease->PreRelease
mmitche Jun 19, 2025
b3ba5a8
Add pre-release iteration to the end of the pre-release label
mmitche Jun 19, 2025
c2e6483
Add pre-release iteration to the end of the pre-release label
mmitche Jun 19, 2025
d5c39d1
Fixup package version value
mmitche Jun 23, 2025
9a4b6ed
Merge branch 'release/dev18.0' into include-prerelease
T-Gro Jun 24, 2025
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: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<!-- Version number computation -->
<PropertyGroup>
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- These have to be in sync with latest release branch -->
<!-- F# Version components -->
<FSMajorVersion>10</FSMajorVersion>
Expand Down Expand Up @@ -40,7 +41,7 @@
<FSharpCoreShippedPackageVersionValue>9.0.300</FSharpCoreShippedPackageVersionValue>
<!-- -->
<!-- The pattern for specifying the preview package -->
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration).*</FSharpCorePreviewPackageVersionValue>
<!-- -->
<!-- FSharp tools for Visual Studio version number -->
<FSToolsMajorVersion>14</FSToolsMajorVersion>
Expand Down
6 changes: 6 additions & 0 deletions src/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
<Pattern1>{{FSCorePackageVersionValue}}</Pattern1>
<Replacement1>$(FSCorePackageVersionValue)-$(VersionSuffix)</Replacement1>
</NoneSubstituteText>
<NoneSubstituteText Include="Microsoft.FSharp.Core.NetSdk.props" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)' != 'Proto'">
<TargetFileName>Microsoft.FSharp.Core.NetSdk.props</TargetFileName>
<SubDir>Prerelease\</SubDir>
<Pattern1>{{FSCorePackageVersionValue}}</Pattern1>
<Replacement1>$(FSCorePackageVersionValue)-$(_PreReleaseLabel).final</Replacement1>
</NoneSubstituteText>
<None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@

<!-- Force references among packages to use exact versions (see https://github.com/NuGet/Home/issues/7213) -->
<Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_BuiltPackages)" OutputDirectory="$(DependentPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" />

<Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_BuiltPackages)" OutputDirectory="$(DependentPackagesDir)Prerelease" AllowPreReleaseDependencies="true" ExactVersions="true" />

<!-- Rewrite the version ranges of per-build pre-release packages (see https://github.com/NuGet/Home/issues/7213) -->
<Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_BuiltPackages)" OutputDirectory="$(DependentPackagesDir)Shipping" ExactVersions="true"/>
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,14 @@

<file src="$artifactsPackagesDir$Dependency\Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
<file src="$artifactsPackagesDir$Dependency\Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
<file src="$artifactsPackagesDir$Dependency\Prerelease\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Prerelease" />

<file src="$artifactsPackagesDir$Dependency\Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
<file src="$artifactsPackagesDir$Dependency\Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg" target="contentFiles\Release" />
<file src="$artifactsPackagesDir$Dependency\Prerelease\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg" target="contentFiles\Prerelease" />

<file src="FSharp.Build\$configuration$\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Shipping" />
<file src="FSharp.Build\$configuration$\netstandard2.0\Release\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Release" />
<file src="FSharp.Build\$configuration$\netstandard2.0\PreRelease\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\PreRelease" />
</files>
</package>
7 changes: 1 addition & 6 deletions vsintegration/shims/shims.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@
<None Include="Microsoft.FSharp.Overrides.NetSdk.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.FSharp.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.Portable.FSharp.Shim.targets" CopyToOutputDirectory="PreserveNewest" />

<NoneSubstituteText Include="Microsoft.FSharp.ShimHelpers.props" CopyToOutputDirectory="PreserveNewest">
<TargetFileName>Microsoft.FSharp.ShimHelpers.props</TargetFileName>
<Pattern1>{{FSharpCorePreviewPackageVersionValue}}</Pattern1>
<Replacement1>$(FSharpCorePreviewPackageVersionValue)</Replacement1>
</NoneSubstituteText>
<None Include="Microsoft.FSharp.ShimHelpers.props" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
Loading