Skip to content

Commit 254a51d

Browse files
authored
Update HotReload packages and remove workaround (#9768)
1 parent 1d06808 commit 254a51d

File tree

6 files changed

+8
-25
lines changed

6 files changed

+8
-25
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
8-
<MicrosoftDotNetHotReloadPackageVersion>10.0.100-rc.2.25466.104</MicrosoftDotNetHotReloadPackageVersion>
8+
<MicrosoftDotNetHotReloadPackageVersion>10.0.100-rc.2.25468.104</MicrosoftDotNetHotReloadPackageVersion>
99
</PropertyGroup>
1010

1111
<!--

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/Contracts/ISuppressDeltaApplication.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/DeltaApplier.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.VisualStudio.ProjectSystem.HotReload;
88

9-
internal sealed class DeltaApplier(HotReloadClient client, IHotReloadDebugStateProvider debugStateProvider, bool suppressDeltaApplication) : IDeltaApplierInternal, IStaticAssetApplier
9+
internal sealed class DeltaApplier(HotReloadClient client, IHotReloadDebugStateProvider debugStateProvider) : IDeltaApplierInternal, IStaticAssetApplier
1010
{
1111
public void Dispose()
1212
{
@@ -48,9 +48,9 @@ public async ValueTask<ApplyResult> ApplyUpdatesAsync(ImmutableArray<ManagedHotR
4848
var managedCodeUpdates = ImmutableArray.CreateRange(updates,
4949
update => new HotReloadManagedCodeUpdate(
5050
update.Module,
51-
suppressDeltaApplication ? [] : update.MetadataDelta,
52-
suppressDeltaApplication ? [] : update.ILDelta,
53-
suppressDeltaApplication ? [] : update.PdbDelta,
51+
update.MetadataDelta,
52+
update.ILDelta,
53+
update.PdbDelta,
5454
update.UpdatedTypes,
5555
update.RequiredCapabilities));
5656

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/HotReload/ProjectHotReloadSession.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ private async ValueTask<IDeltaApplier> GetOrCreateDeltaApplierAsync(Cancellation
129129
client = new DefaultHotReloadClient(clientLogger, agentLogger, GetStartupHookPath(targetFrameworkName.Version), enableStaticAssetUpdates: true);
130130
}
131131

132-
var suppressDeltaApplication = _callback is ISuppressDeltaApplication { SuppressDeltaApplication: true };
133-
applier = new DeltaApplier(client, _debugStateProvider, suppressDeltaApplication);
132+
applier = new DeltaApplier(client, _debugStateProvider);
134133
}
135134

136135
if (applier is IDeltaApplierInternal applierInternal)

src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI/net472/PublicAPI.Shipped.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,4 @@ Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAc
232232
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.SendReloadMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
233233
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.SendWaitMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
234234
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.StartServerAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
235-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.UpdateStaticAssetsAsync(System.Collections.Generic.IEnumerable<string!>! relativeUrls, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
236-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.ISuppressDeltaApplication
237-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.ISuppressDeltaApplication.SuppressDeltaApplication.get -> bool
235+
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.UpdateStaticAssetsAsync(System.Collections.Generic.IEnumerable<string!>! relativeUrls, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask

src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI/net9.0/PublicAPI.Shipped.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,4 @@ Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAc
226226
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.SendReloadMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
227227
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.SendWaitMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
228228
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.StartServerAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
229-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.UpdateStaticAssetsAsync(System.Collections.Generic.IEnumerable<string> relativeUrls, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
230-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.ISuppressDeltaApplication
231-
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.ISuppressDeltaApplication.SuppressDeltaApplication.get -> bool
229+
Microsoft.VisualStudio.ProjectSystem.VS.HotReload.AbstractBrowserRefreshServerAccessor.UpdateStaticAssetsAsync(System.Collections.Generic.IEnumerable<string> relativeUrls, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask

0 commit comments

Comments
 (0)