Skip to content
代码片段 群组 项目
未验证 提交 54ff3797 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

Don't reference test asset projects in Build.props (#39336)

- test projects should include any necessary references
  - should further reduce build ordering problems
  - also, removes mention of a few non-existent folders
- but, special case a _few_ test asset projects
  - reference three used in test classes in relevant test projects
  - reference five that are otherwise unreferenced in Build.props
- move `src\Components\Web.JS\node_modules` mention to correct part of Build.props

nit:
- sort "not meant to be built" project list
上级 ca6c2b27
No related branches found
No related tags found
无相关合并请求
...@@ -16,25 +16,25 @@ ...@@ -16,25 +16,25 @@
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. --> <!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="$(RepoRoot)src\Middleware\WebSockets\samples\**\*.csproj" /> <ProjectToExclude Include="$(RepoRoot)src\Middleware\WebSockets\samples\**\*.csproj" />
<!-- These projects are meant to be executed by tests. --> <!-- These projects are meant to be referenced only by tests. -->
<ProjectToExclude Include=" <ProjectToExclude Include="$(RepoRoot)src\**\testassets\**\*.*proj"
$(RepoRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj; Exclude="$(RepoRoot)src\Components\WebAssembly\testassets\WasmLinkerTest\*.*proj;
$(RepoRoot)src\Tools\Tests.Common\TestProjects\**\*.csproj; $(RepoRoot)src\Components\WebView\Samples\PhotinoPlatform\testassets\PhotinoTestApp\*.*proj;
$(RepoRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj; $(RepoRoot)src\Http\Routing\test\testassets\RoutingSandbox\*.*proj;
$(RepoRoot)src\Razor\test\testassets\**\*.*proj; $(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Client\*.*proj;
$(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj; $(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Server\*.*proj;
$(RepoRoot)src\Components\WebAssembly\Sdk\testassets\**\*.csproj; " />
" />
<!-- These projects are not meant to be built in this repo. In the Installers case, must explicitly opt in. --> <!-- These projects are not meant to be built in this repo. In the Installers case, must explicitly opt in. -->
<!-- On the other hand, the main spa-templates project is just another project in this repo. --> <!-- On the other hand, the main spa-templates project is just another project in this repo. -->
<ProjectToExclude Include=" <ProjectToExclude Include="
$(RepoRoot)src\submodules\googletest\**\*.*proj; $(RepoRoot)src\submodules\googletest\**\*.*proj;
$(RepoRoot)src\submodules\MessagePack-CSharp\**\*.*proj; $(RepoRoot)src\submodules\MessagePack-CSharp\**\*.*proj;
$(RepoRoot)src\submodules\spa-templates\src\content\**\*.csproj;
$(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
$(RepoRoot)src\Installers\**\*.*proj; $(RepoRoot)src\Installers\**\*.*proj;
$(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.*proj; $(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.*proj;
$(RepoRoot)src\submodules\spa-templates\src\content\**\*.csproj; $(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
" /> " />
<!-- Exclude the benchmarks because they use <PackageReference>. --> <!-- Exclude the benchmarks because they use <PackageReference>. -->
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
...@@ -17,13 +16,20 @@ ...@@ -17,13 +16,20 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" /> <ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
<ProjectReference Include="$(RepoRoot)src\Hosting\test\testassets\BasicLinkedApp\BasicLinkedApp.csproj"
Private="false"
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="$(RepoRoot)src\Hosting\test\testassets\IStartupInjectionAssemblyName\IStartupInjectionAssemblyName.csproj" <ProjectReference Include="$(RepoRoot)src\Hosting\test\testassets\IStartupInjectionAssemblyName\IStartupInjectionAssemblyName.csproj"
Private="false" Private="false"
ReferenceOutputAssembly="false" ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" /> SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="$(RepoRoot)src\Hosting\test\testassets\Microsoft.AspNetCore.Hosting.TestSites\Microsoft.AspNetCore.Hosting.TestSites.csproj"
Private="false"
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
<Reference Include="Microsoft.AspNetCore.Hosting" /> <Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.Extensions.Logging.Console" /> <Reference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>HttpSys.NonHelixTests</TestGroupName> <TestGroupName>HttpSys.NonHelixTests</TestGroupName>
...@@ -25,6 +24,9 @@ ...@@ -25,6 +24,9 @@
<ItemGroup> <ItemGroup>
<Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" /> <Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
<ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" /> <ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
<ProjectReference Include="$(RepoRoot)src\Servers\HttpSys\test\testassets\DelegationSite\DelegationSite.csproj"
Private="false"
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
</ItemGroup> </ItemGroup>
</Project> </Project>
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册