Skip to content

17.14 - increase fsharpcore build version number #18718

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 17 commits into from
Jul 10, 2025
Merged

17.14 - increase fsharpcore build version number #18718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b5a80b4
Enable internal feed
KevinRansom Apr 25, 2025
9513755
msbuild-trusted
KevinRansom Apr 26, 2025
866b140
baseline
KevinRansom Apr 27, 2025
e363d79
Merged PR 49559: Final release/dev17.14 nuget patch
Apr 28, 2025
d7f44d1
rel/d17.14
KevinRansom Apr 30, 2025
c1a9d78
Merged PR 49644: Final #r nuget update rel/d17.14
Apr 30, 2025
317daea
17.14 - increase fsharpcode build version number
T-Gro Jun 26, 2025
9ccf061
Update eng/Versions.props
T-Gro Jun 27, 2025
732bbf2
maaybe
T-Gro Jun 30, 2025
dd2b22a
FSCoreShippedVersion keep 9.0.0.0
T-Gro Jul 1, 2025
563fc0e
Will this magix fix it?
T-Gro Jul 1, 2025
58148e4
Update XunitHelpers.fs
T-Gro Jul 1, 2025
8625b39
Update SourceBuildPrebuiltBaseline.xml
T-Gro Jul 3, 2025
c9f3a3b
Update NuGet.config
T-Gro Jul 9, 2025
b9ee75b
Update Versions.props
T-Gro Jul 9, 2025
dbc8459
Merge branch 'release/dev17.14' into sync/release-dev17.14-2025070912…
T-Gro Jul 9, 2025
4a338fa
Merge branch 'sync/release-dev17.14-20250709120231' into T-Gro-patch-…
T-Gro Jul 9, 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
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<FSCorePackageVersionValue>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCorePackageVersionValue>
<FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix>
<FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).0.0</FSCoreVersion>
<FSCoreShippedVersion>9.0.0.0</FSCoreShippedVersion>
<FSCoreShippedVersion>9.0.300.0</FSCoreShippedVersion>
<!-- -->
<!-- FSharp.Compiler.Service version -->
<FCSMajorVersion>43</FCSMajorVersion>
Expand Down Expand Up @@ -102,7 +102,7 @@
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
<MicrosoftBuildVersion>17.13.22</MicrosoftBuildVersion>
<MicrosoftBuildVersion>17.14.8</MicrosoftBuildVersion>
<!-- Roslyn packages -->
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
Expand Down Expand Up @@ -138,9 +138,9 @@
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
<!-- -->
<!-- Microsoft Build packages -->
<MicrosoftBuildFrameworkVersion>17.13.22</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.13.22</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.13.22</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
<!-- -->
<!-- Visual Studio Editor packages -->
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
Expand Down
12 changes: 12 additions & 0 deletions vsintegration/tests/Salsa/VsMocks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,6 +1375,8 @@ module internal VsMocks =
let vsTargetFrameworkAssemblies40 = vsTargetFrameworkAssembliesN 0x40000u
let vsTargetFrameworkAssemblies45 = vsTargetFrameworkAssembliesN 0x40005u
let vsTargetFrameworkAssemblies46 = vsTargetFrameworkAssembliesN 0x40006u
let vsTargetFrameworkAssemblies47 = vsTargetFrameworkAssembliesN 0x40007u
let vsTargetFrameworkAssemblies48 = vsTargetFrameworkAssembliesN 0x40008u

let vsFrameworkMultiTargeting =
{ new IVsFrameworkMultiTargeting with
Expand Down Expand Up @@ -1601,6 +1603,16 @@ module internal VsMocks =
sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies46, false)
sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
sp, ccn
let MakeMockServiceProviderAndConfigChangeNotifier47() =
let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService()
sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies47, false)
sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
sp, ccn
let MakeMockServiceProviderAndConfigChangeNotifier48() =
let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService()
sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies48, false)
sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
sp, ccn

// This is the mock thing that all tests, except the multitargeting tests call.
// By default, let it use the 4.0 assembly version.
Expand Down
2 changes: 2 additions & 0 deletions vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ type TheTests() =
File.AppendAllText(file, TheTests.FsprojTextWithProjectReferencesAndOtherFlags(compileItems, references, [], null, other, targetFramework))
let sp, cnn =
match targetFramework with
| "v4.8" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier48()
| "v4.7" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier47()
| "v4.6" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier46()
| "v4.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier45()
| "v4.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier40()
Expand Down
Loading