Skip to content

Commit 027f2a4

Browse files
tmattmat
authored
Finalize packages for reuse of the agent in VS/ASP.NET (#46216)
1 parent 3cd7c65 commit 027f2a4

14 files changed

+84
-12
lines changed

‎sdk.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.HotReload.
516516
EndProject
517517
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.HotReload.Agent.PipeRpc", "src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj", "{FA3C7F91-42A2-45AD-897C-F646B081016C}"
518518
EndProject
519+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.HotReload.Agent.Data.Package", "src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj", "{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}"
520+
EndProject
521+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.HotReload.Agent.Data", "src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.shproj", "{0762B436-F4B0-4008-9097-BB5FF6BD84AF}"
522+
EndProject
519523
Global
520524
GlobalSection(SolutionConfigurationPlatforms) = preSolution
521525
Debug|Any CPU = Debug|Any CPU
@@ -978,6 +982,10 @@ Global
978982
{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
979983
{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
980984
{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.Build.0 = Release|Any CPU
985+
{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
986+
{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.Build.0 = Debug|Any CPU
987+
{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.ActiveCfg = Release|Any CPU
988+
{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.Build.0 = Release|Any CPU
981989
EndGlobalSection
982990
GlobalSection(SolutionProperties) = preSolution
983991
HideSolutionNode = FALSE
@@ -1159,19 +1167,26 @@ Global
11591167
{2FF79F82-60C1-349A-4726-7783D5A6D5DF} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11601168
{692B71D8-9C31-D1EE-6C1B-570A12B18E39} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11611169
{FA3C7F91-42A2-45AD-897C-F646B081016C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
1170+
{3DF5A9B8-6F90-4CFB-4518-0E97982B6748} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
1171+
{0762B436-F4B0-4008-9097-BB5FF6BD84AF} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11621172
EndGlobalSection
11631173
GlobalSection(ExtensibilityGlobals) = postSolution
11641174
SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}
11651175
EndGlobalSection
11661176
GlobalSection(SharedMSBuildProjectFiles) = preSolution
11671177
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
1178+
src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{0762b436-f4b0-4008-9097-bb5ff6bd84af}*SharedItemsImports = 13
11681179
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
1180+
src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5
11691181
src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5
11701182
src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5
11711183
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*SharedItemsImports = 5
1184+
src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{2ff79f82-60c1-349a-4726-7783d5a6d5df}*SharedItemsImports = 5
11721185
src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{418b10bd-ca42-49f3-8f4a-d8cc90c8a17d}*SharedItemsImports = 13
11731186
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5
1187+
src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5
11741188
src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5
1189+
src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{692b71d8-9c31-d1ee-6c1b-570a12b18e39}*SharedItemsImports = 5
11751190
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{94c8526e-dcc2-442f-9868-3dd0ba2688be}*SharedItemsImports = 13
11761191
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
11771192
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems" Label="Shared" />
3+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
34
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
45
<PropertyGroup>
56
<!--
@@ -9,8 +10,14 @@
910
<TargetFramework>netstandard2.1</TargetFramework>
1011
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1112

12-
<IsPackable>false</IsPackable>
1313
<Nullable>enable</Nullable>
14+
15+
<!-- NuGet -->
16+
<IsPackable>true</IsPackable>
17+
<PackageId>Microsoft.DotNet.HotReload.Agent.Host</PackageId>
18+
<PackageDescription>
19+
Package containing Hot Reload agent host.
20+
</PackageDescription>
1421
</PropertyGroup>
1522

1623
<ItemGroup>

‎src/BuiltInTools/HotReloadAgent/AgentEnvironmentVariables.cs renamed to ‎src/BuiltInTools/HotReloadAgent.Data/AgentEnvironmentVariables.cs

File renamed without changes.

‎src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.cs renamed to ‎src/BuiltInTools/HotReloadAgent.Data/AgentMessageSeverity.cs

File renamed without changes.

‎src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<!--
4+
Intentionally pinned. Supports Visual Studio in-proc agent client.
5+
-->
6+
<TargetFramework>netstandard2.0</TargetFramework>
7+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8+
<DebugType>none</DebugType>
9+
<GenerateDependencyFile>false</GenerateDependencyFile>
10+
<Nullable>enable</Nullable>
11+
<LangVersion>preview</LangVersion>
12+
13+
<!-- NuGet -->
14+
<IsPackable>true</IsPackable>
15+
<IsSourcePackage>true</IsSourcePackage>
16+
<PackageId>Microsoft.DotNet.HotReload.Agent.Data</PackageId>
17+
<IncludeBuildOutput>false</IncludeBuildOutput>
18+
<PackageDescription>
19+
Package containing sources of Hot Reload agent data types.
20+
</PackageDescription>
21+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
22+
<NoWarn>$(NoWarn);NU5128</NoWarn>
23+
</PropertyGroup>
24+
25+
<!-- Make sure the shared source files do not require any global usings -->
26+
<ItemGroup>
27+
<Using Remove="@(Using)" />
28+
</ItemGroup>
29+
</Project>

‎src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>{0762B436-F4B0-4008-9097-BB5FF6BD84AF}</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>Microsoft.DotNet.HotReload</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)**\*.cs" />
13+
</ItemGroup>
14+
</Project>

‎src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>0762B436-F4B0-4008-9097-BB5FF6BD84AF</ProjectGuid>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
9+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
10+
<PropertyGroup />
11+
<Import Project="Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
12+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
13+
</Project>

‎src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs renamed to ‎src/BuiltInTools/HotReloadAgent.Data/ResponseLoggingLevel.cs

File renamed without changes.

‎src/BuiltInTools/HotReloadAgent/StaticAssetUpdate.cs renamed to ‎src/BuiltInTools/HotReloadAgent.Data/StaticAssetUpdate.cs

File renamed without changes.

‎src/BuiltInTools/HotReloadAgent/UpdateDelta.cs renamed to ‎src/BuiltInTools/HotReloadAgent.Data/UpdateDelta.cs

File renamed without changes.

‎src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,5 @@
3434
<ItemGroup>
3535
<Using Remove="@(Using)" />
3636
</ItemGroup>
37-
<ItemGroup>
38-
<Compile Include="..\HotReloadAgent\AgentMessageSeverity.cs" Link="AgentContracts\AgentMessageSeverity.cs" />
39-
<Compile Include="..\HotReloadAgent\ResponseLoggingLevel.cs" Link="AgentContracts\ResponseLoggingLevel.cs" />
40-
<Compile Include="..\HotReloadAgent\UpdateDelta.cs" Link="AgentContracts\UpdateDelta.cs" />
41-
</ItemGroup>
37+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
4238
</Project>

‎src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
<ItemGroup>
2828
<Using Remove="@(Using)" />
2929
</ItemGroup>
30+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
3031
</Project>

‎src/BuiltInTools/dotnet-watch.slnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj",
1010
"src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.Package.csproj",
1111
"src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.shproj",
12+
"src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj",
13+
"src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.shproj",
1214
"src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj",
1315
"src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj",
1416
"src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj",

‎src/BuiltInTools/dotnet-watch/dotnet-watch.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\AspireService\Microsoft.WebTools.AspireService.projitems" Label="Shared" />
33
<Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
4+
<Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
45
<Import Project="$(RepoRoot)\src\Layout\redist\targets\PublishDotnetWatch.targets" />
56

67
<PropertyGroup>
@@ -39,12 +40,6 @@
3940
<PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
4041

4142
<Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Common" />
42-
43-
<Compile Include="..\HotReloadAgent\AgentEnvironmentVariables.cs" LinkBase="AgentContracts"/>
44-
<Compile Include="..\HotReloadAgent\AgentMessageSeverity.cs" LinkBase="AgentContracts" />
45-
<Compile Include="..\HotReloadAgent\ResponseLoggingLevel.cs" LinkBase="AgentContracts" />
46-
<Compile Include="..\HotReloadAgent\UpdateDelta.cs" LinkBase="AgentContracts" />
47-
<Compile Include="..\HotReloadAgent\StaticAssetUpdate.cs" LinkBase="AgentContracts" />
4843
</ItemGroup>
4944

5045
<ItemGroup>

0 commit comments

Comments
 (0)