Skip to content

Commit ce481c6

Browse files
jkotalikjkotalik
authored
Make JavaScriptServices use ProjectReference (#5953)
1 parent 7f17d09 commit ce481c6

File tree

215 files changed

+114
-2408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+114
-2408
lines changed

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.ViewFeatures" AllMetapackage="true" AppMetapackage="true" Category="ship" />
105105
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Category="ship" />
106106
<PackageArtifact Include="Microsoft.AspNetCore.Mvc" AllMetapackage="true" AppMetapackage="true" Category="ship" />
107-
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
108107
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
109108
<PackageArtifact Include="Microsoft.AspNetCore.Owin" AllMetapackage="true" AppMetapackage="true" Category="ship" />
110109
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1111
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1212
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
13-
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
1413
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1514
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
1615
<RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />

‎build/repo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
6262
<ProjectToExclude Include="
6363
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
64+
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
6465
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
6566
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
6667
" />

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
5050
<ShippedRepository Include="EntityFrameworkCore" />
5151
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
52-
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5352
<ShippedRepository Include="JsonPatch" />
5453
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5554
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />

‎eng/Baseline.Designer.props

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,15 @@
645645
<BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[2.1.1, )" />
646646
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
647647
</ItemGroup>
648+
<!-- Package: Microsoft.AspNetCore.NodeServices-->
649+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.NodeServices' ">
650+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
651+
</PropertyGroup>
652+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.NodeServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
653+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
654+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[2.1.1, )" />
655+
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
656+
</ItemGroup>
648657
<!-- Package: Microsoft.AspNetCore.Owin-->
649658
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' ">
650659
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -865,6 +874,25 @@
865874
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
866875
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
867876
</ItemGroup>
877+
<!-- Package: Microsoft.AspNetCore.SpaServices.Extensions-->
878+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' ">
879+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
880+
</PropertyGroup>
881+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
882+
<BaselinePackageReference Include="Microsoft.AspNetCore.SpaServices" Version="[2.1.1, )" />
883+
<BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.1.1, )" />
884+
<BaselinePackageReference Include="Microsoft.AspNetCore.WebSockets" Version="[2.1.1, )" />
885+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[2.1.1, )" />
886+
</ItemGroup>
887+
<!-- Package: Microsoft.AspNetCore.SpaServices-->
888+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' ">
889+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
890+
</PropertyGroup>
891+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
892+
<BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[2.1.1, )" />
893+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="[2.1.1, )" />
894+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="[2.1.1, )" />
895+
</ItemGroup>
868896
<!-- Package: Microsoft.AspNetCore.StaticFiles-->
869897
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.StaticFiles' ">
870898
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
7373
<Package Id="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.3" />
7474
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
7575
<Package Id="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
76+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="2.1.1" />
7677
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
7778
<Package Id="Microsoft.AspNetCore.Razor" Version="2.1.2" />
7879
<Package Id="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
@@ -93,6 +94,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
9394
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
9495
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
9596
<Package Id="Microsoft.AspNetCore.Session" Version="2.1.1" />
97+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
98+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
9699
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
97100
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
98101
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />

‎eng/ProjectReferences.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,9 @@
114114
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
115115
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestCommon" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
116116
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestDiagnosticListener" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
117+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
118+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices.Sockets" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices.Sockets\src\Microsoft.AspNetCore.NodeServices.Sockets.csproj" />
119+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
120+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
117121
</ItemGroup>
118122
</Project>

‎src/JavaScriptServices/.gitignore

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

‎src/JavaScriptServices/Directory.Build.props

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

‎src/JavaScriptServices/Directory.Build.targets

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

0 commit comments

Comments
 (0)