Skip to content

Commit ea2d93a

Browse files
tmattmat
committed
Update to latest Hot Reload packages.
1 parent 182183d commit ea2d93a

File tree

9 files changed

+85
-12
lines changed

9 files changed

+85
-12
lines changed

‎Directory.Packages.props‎

Lines changed: 2 additions & 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-rtm.25514.103</MicrosoftDotNetHotReloadPackageVersion>
8+
<MicrosoftDotNetHotReloadPackageVersion>10.0.200-dev</MicrosoftDotNetHotReloadPackageVersion>
99
</PropertyGroup>
1010

1111
<!--
@@ -32,6 +32,7 @@
3232
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
3333
<PackageVersion Include="StreamJsonRpc" Version="2.23.32-alpha" />
3434
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
35+
<PackageVersion Include="Microsoft.DotNet.HotReload.Agent" Version="$(MicrosoftDotNetHotReloadPackageVersion)"/>
3536
<PackageVersion Include="Microsoft.DotNet.HotReload.Agent.Data" Version="$(MicrosoftDotNetHotReloadPackageVersion)"/>
3637
<PackageVersion Include="Microsoft.DotNet.HotReload.Agent.PipeRpc" Version="$(MicrosoftDotNetHotReloadPackageVersion)"/>
3738
<PackageVersion Include="Microsoft.DotNet.HotReload.Agent.Host" Version="$(MicrosoftDotNetHotReloadPackageVersion)"/>

‎ProjectSystem.sln‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31514.227
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11114.144 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{AC8DB8AE-AC9F-4503-83C6-255B66C318C6}"
77
ProjectSection(SolutionItems) = preProject
@@ -81,6 +81,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2BEDB9
8181
src\Common\BannedSymbols.txt = src\Common\BannedSymbols.txt
8282
EndProjectSection
8383
EndProject
84+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Watch.BrowserRefresh", "src\Microsoft.AspNetCore.Watch.BrowserRefresh\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", "{C45E9403-8251-B5D1-CF02-6E8367F7218E}"
85+
EndProject
86+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.DotNetDeltaApplier", "src\Microsoft.Extensions.DotNetDeltaApplier\Microsoft.Extensions.DotNetDeltaApplier.csproj", "{51C57440-D5AB-889E-510A-CF81B0DA5333}"
87+
EndProject
8488
Global
8589
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8690
Debug|Any CPU = Debug|Any CPU
@@ -142,6 +146,14 @@ Global
142146
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Debug|Any CPU.Build.0 = Debug|Any CPU
143147
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Release|Any CPU.ActiveCfg = Release|Any CPU
144148
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75}.Release|Any CPU.Build.0 = Release|Any CPU
149+
{C45E9403-8251-B5D1-CF02-6E8367F7218E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{C45E9403-8251-B5D1-CF02-6E8367F7218E}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{C45E9403-8251-B5D1-CF02-6E8367F7218E}.Release|Any CPU.ActiveCfg = Release|Any CPU
152+
{C45E9403-8251-B5D1-CF02-6E8367F7218E}.Release|Any CPU.Build.0 = Release|Any CPU
153+
{51C57440-D5AB-889E-510A-CF81B0DA5333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154+
{51C57440-D5AB-889E-510A-CF81B0DA5333}.Debug|Any CPU.Build.0 = Debug|Any CPU
155+
{51C57440-D5AB-889E-510A-CF81B0DA5333}.Release|Any CPU.ActiveCfg = Release|Any CPU
156+
{51C57440-D5AB-889E-510A-CF81B0DA5333}.Release|Any CPU.Build.0 = Release|Any CPU
145157
EndGlobalSection
146158
GlobalSection(SolutionProperties) = preSolution
147159
HideSolutionNode = FALSE
@@ -162,6 +174,8 @@ Global
162174
{02578366-DFA9-4827-93F7-08E2AE5CE6A4} = {7349958E-C619-481F-BB2A-8A4CA2E349D9}
163175
{A0B3F2BD-C92A-4037-A9F0-4EC484267E75} = {7349958E-C619-481F-BB2A-8A4CA2E349D9}
164176
{2BEDB95B-AAC2-4F6D-92EA-61F07E77887E} = {1FF0293B-6808-4BB1-8370-1FE222986654}
177+
{C45E9403-8251-B5D1-CF02-6E8367F7218E} = {1FF0293B-6808-4BB1-8370-1FE222986654}
178+
{51C57440-D5AB-889E-510A-CF81B0DA5333} = {1FF0293B-6808-4BB1-8370-1FE222986654}
165179
EndGlobalSection
166180
GlobalSection(ExtensibilityGlobals) = postSolution
167181
SolutionGuid = {6B652C28-D1FD-4885-A0CA-4704C54E78E7}

‎src/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,4 @@
1212
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
1313
</PropertyGroup>
1414

15-
<ItemGroup>
16-
<Compile Include="..\Common\GlobalAssemblyInfo.cs" Condition="'$(Language)' == 'C#'" />
17-
<Compile Include="..\Common\GlobalAssemblyInfo.vb" Condition="'$(Language)' == 'VB'" />
18-
</ItemGroup>
19-
2015
</Project>

‎src/Microsoft.AspNetCore.Watch.BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<!--
4+
This assembly may be loaded .NET 6.0+ web server.
5+
When updating the TFM also update minimal supported version in VisualStudioBrowserRefreshServer.
6+
-->
7+
<TargetFramework>net6.0</TargetFramework>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.DotNet.HotReload.Web.Middleware" PrivateAssets="all" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Using Remove="@(Using)"/>
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<Compile Update="@(Compile)">
24+
<Link Condition="'%(NuGetPackageId)' != ''">%(NuGetPackageId)\%(Link)</Link>
25+
</Compile>
26+
</ItemGroup>
27+
</Project>

‎src/Microsoft.Extensions.DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<!--
4+
dotnet-watch may inject this assembly to .NET 6.0+ app.
5+
6+
When updating these also update ProjectHotReloadSession.
7+
-->
8+
<TargetFrameworks>net6.0;net10.0</TargetFrameworks>
9+
10+
<!-- Suppress warning: Microsoft.Bcl.AsyncInterfaces 9.0.0 doesn't support net6.0 and has not been tested with it. -->
11+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.DotNet.HotReload.Agent" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.Data" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.Host" PrivateAssets="all" />
18+
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.PipeRpc" PrivateAssets="all" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Using Remove="@(Using)"/>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<Compile Update="@(Compile)">
27+
<Link Condition="'%(NuGetPackageId)' != ''">%(NuGetPackageId)\%(Link)</Link>
28+
</Compile>
29+
</ItemGroup>
30+
</Project>

‎src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26+
<Compile Include="..\Common\GlobalAssemblyInfo.vb" />
27+
2628
<Compile Include="..\Common\ManagedCodeMarkers.vb">
2729
<Link>ManagedCodeMarkers.vb</Link>
2830
</Compile>

‎src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34+
<Compile Include="..\Common\GlobalAssemblyInfo.vb" />
35+
3436
<EmbeddedResource Update="AddImportsDialogs\AddImports.resx">
3537
<SubType>Designer</SubType>
3638
</EmbeddedResource>

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
</ItemGroup>
5151

5252
<ItemGroup>
53+
<Compile Include="..\Common\GlobalAssemblyInfo.cs" />
54+
5355
<Compile Update="ProjectSystem\VS\LanguageServices\CSharp\CSharpCodeDomProvider.cs">
5456
<SubType>Component</SubType>
5557
</Compile>

‎src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@
5151
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
5252
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.Data" PrivateAssets="all" />
5353
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.PipeRpc" PrivateAssets="all" />
54-
<PackageReference Include="Microsoft.DotNet.HotReload.Agent.Host" PrivateAssets="all" ExcludeAssets="all" GeneratePathProperty="true" />
5554
<PackageReference Include="Microsoft.DotNet.HotReload.Client" PrivateAssets="all" />
56-
<PackageReference Include="Microsoft.DotNet.HotReload.Web.Middleware" PrivateAssets="all" ExcludeAssets="all" GeneratePathProperty="true" />
5755

5856
<!-- Needed to break assembly conflict on StreamJsonRpc between microsoft.visualstudio.projectsystem.query and microsoft.visualstudio.languageservices -->
5957
<PackageReference Include="Microsoft.VisualStudio.RpcContracts" />
@@ -75,7 +73,7 @@
7573
Assemblies that facilitate Hot Reload within the application process.
7674
When updating TFMs here also update ProjectHotReloadSession.GetStartupHookPath and VisualStudioBrowserRefreshServer.MiddlewareTargetFramework.
7775
-->
78-
<ItemGroup>
76+
<!--<ItemGroup>
7977
<Content Include="$(PkgMicrosoft_DotNet_HotReload_Web_Middleware)\lib\net6.0\Microsoft.AspNetCore.Watch.BrowserRefresh.dll">
8078
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8179
<Visible>false</Visible>
@@ -94,10 +92,12 @@
9492
<TargetPath>HotReload\net10.0\Microsoft.Extensions.DotNetDeltaApplier.dll</TargetPath>
9593
<Pack>false</Pack>
9694
</Content>
97-
</ItemGroup>
95+
</ItemGroup>-->
9896

9997
<!-- Dependencies -->
10098
<ItemGroup>
99+
<Compile Include="..\Common\GlobalAssemblyInfo.cs" />
100+
101101
<!-- Analyzer Reference -->
102102
<Compile Update="ProjectSystem\Rules\Dependencies\AnalyzerReference.xaml.cs">
103103
<DependentUpon>AnalyzerReference.xaml</DependentUpon>

0 commit comments

Comments
 (0)