Skip to content

Sync with the ultimate master #1147

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
Eugene Auduchinok (auduchinok) merged 2 commits into from
May 29, 2026
Merged

Sync with the ultimate master #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e315deb
net: update rd to 2026.2.0, fix RSRP-503532
May 15, 2026
0359b5e
misc rd: update to 2026.2.1
May 26, 2026
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
4 changes: 2 additions & 2 deletions ReSharper.FSharp/src/FSharp.Debugger/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<PackageLock Include="JetBrains.Annotations" Version="2025.2.0" />
<PackageLock Include="JetBrains.HabitatDetector" Version="1.5.0" />
<PackageLock Include="JetBrains.ICorDebug" Version="2.0.20251125.126" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.3" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.2.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.2.1" />
<PackageLock Include="JetBrains.SharpGen.Runtime" Version="2.0.20251125.126" />
<PackageLock Include="JetBrains.SharpGen.Runtime.COM" Version="2.0.20251125.126" />
<PackageLock Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
4 changes: 2 additions & 2 deletions ReSharper.FSharp/src/FSharp.Fantomas.Host/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<PackageLock Include="Fantomas.Core" Version="7.0.3" />
<PackageLock Include="Fantomas.FCS" Version="7.0.3" />
<PackageLock Include="FSharp.Core" Version="10.0.103" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.2.1" />
<PackageLock Include="JetBrains.NuGet.Versioning" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.3" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.2.1" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
<PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />
<PackageLock Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
Expand Down
4 changes: 2 additions & 2 deletions ReSharper.FSharp/src/FSharp.TypeProviders.Host/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<PackageLock Include="FSharp.Core" Version="10.0.103" />
<PackageLock Include="JetBrains.Annotations" Version="2025.2.0" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2026.1.0" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.3" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.2.1" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.2.1" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
<PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />
<PackageLock Include="System.Diagnostics.Debug" Version="4.3.0" />
Expand Down
4 changes: 2 additions & 2 deletions ReSharper.FSharp/src/FSharp/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<PackageLock Include="JetBrains.Build.Platform.DistributedCache" Version="1.1.20250717.260" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2026.1.0" />
<PackageLock Include="JetBrains.HabitatDetector" Version="1.5.0" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.2.1" />
<PackageLock Include="JetBrains.NuGet.Packaging" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.NuGet.Versioning" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.3" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.2.1" />
<PackageLock Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.16.1" />
<PackageLock Include="Newtonsoft.Json" Version="13.0.3" />
<PackageLock Include="NVelocity" Version="1.0.3" />
Expand Down
4 changes: 2 additions & 2 deletions ReSharper.FSharp/test/src/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<PackageLock Include="Fantomas.Core" Version="7.0.3" />
<PackageLock Include="FSharp.Core" Version="10.0.103" />
<PackageLock Include="JetBrains.FSharp.Compiler.Service" Version="2026.1.0" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.1.3" />
<PackageLock Include="JetBrains.Lifetimes" Version="2026.2.1" />
<PackageLock Include="JetBrains.NuGet.Frameworks" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.NuGet.Packaging" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.NuGet.Versioning" Version="7.0.20251126.165" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.1.3" />
<PackageLock Include="JetBrains.RdFramework" Version="2026.2.1" />
<PackageLock Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageLock Include="Microsoft.NETCore.Platforms" Version="3.1.0" />
<PackageLock Include="Microsoft.NETCore.Targets" Version="1.1.3" />
Expand Down
2 changes: 1 addition & 1 deletion rider-fsharp/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.jvmargs=-Xmx2000m

kotlin.stdlib.default.dependency=false
rdVersion=2026.1.3
rdVersion=2026.2.1
rdKotlinVersion=2.3.0
intellijPlatformGradlePluginVersion=2.11.0
grammarKitVersion=2022.3.2.1
Expand Down
Loading