mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup known-good source-build projects (#15527)

Browse source
This commit is contained in:
Michael Simons 2023-02-16 10:48:46 -06:00 committed by GitHub
parent dcbb0bffd2
commit 0a561dc0d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 54 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/SourceBuild/content/Directory.Build.props
View file

@ -173,12 +173,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- known-good (repos/known-good.proj) conditionally includes submodules based on the platform,
so this will not always correspond to the same repos - see that file for details.
We need an "empty" project after the last real project in order for prebuilt detection
to work, so we always build known-good. -->
<RootRepo>known-good</RootRepo>
<RootRepoTests>known-good-tests</RootRepoTests>
<RootRepo>dotnet</RootRepo>
</PropertyGroup>
<!--

7
src/SourceBuild/content/build.proj
View file

@ -13,13 +13,6 @@
<MSBuild Projects="$(RepoProjectsDir)$(RootRepo).proj" Targets="Build" BuildInParallel="$(BuildInParallel)" StopOnFirstFailure="true" />
</Target>
<Target Name="RunRepoTests" DependsOnTargets="PrepareOutput;InitBuild">
<Message Text="Build Environment: $(Platform) $(Configuration) $(TargetOS) $(TargetRid)" />
<MSBuild Projects="$(RepoProjectsDir)$(RootRepoTests).proj" Targets="Build" Properties="PrepForTests=true;SkipEnsurePackagesCreated=true" BuildInParallel="$(BuildInParallel)" StopOnFirstFailure="true" />
<MSBuild Projects="$(RepoProjectsDir)$(RootRepoTests).proj" Targets="Build" Properties="RunTests=true;SkipEnsurePackagesCreated=true" BuildInParallel="$(BuildInParallel)" StopOnFirstFailure="true" />
</Target>
<Target Name="PrepareOutput">
<MakeDir Directories="$(OutputPath)" />
<MakeDir Directories="$(LoggingDir)" />

4
src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj
View file

@ -5,9 +5,7 @@
<ItemGroup>
<AllRepoProjects
Include="$(ProjectDir)repo-projects\*.proj"
Exclude="
$(ProjectDir)repo-projects\known-good.proj;
$(ProjectDir)repo-projects\known-good-tests.proj" />
Exclude="$(ProjectDir)repo-projects\dotnet.proj" />
</ItemGroup>
<MSBuild

52
src/SourceBuild/content/repo-projects/dotnet.proj Normal file
View file

@ -0,0 +1,52 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<RepoApiImplemented>false</RepoApiImplemented>
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
</PropertyGroup>
<!-- This project file serves a couple of purpose.
- We conditionally include repos based on what works on different platforms/configurations.
- We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
- If we have a repo that is not in sdk's dependency tree, we can still build it by including it here. -->
<ItemGroup>
<!-- Toolsets -->
<RepositoryReference Include="source-build-reference-packages" />
<RepositoryReference Include="sourcelink" />
<RepositoryReference Include="arcade" />
<!-- Product Repos -->
<RepositoryReference Include="command-line-api" />
<RepositoryReference Include="diagnostics" />
<RepositoryReference Include="emsdk" />
<RepositoryReference Include="razor" />
<RepositoryReference Include="xliff-tasks" />
<RepositoryReference Include="runtime" />
<RepositoryReference Include="roslyn" />
<RepositoryReference Include="source-build-externals" />
<RepositoryReference Include="symreader" />
<RepositoryReference Include="xdt" />
<RepositoryReference Include="msbuild" />
<RepositoryReference Include="roslyn-analyzers" />
<RepositoryReference Include="aspnetcore" />
<RepositoryReference Include="deployment-tools" />
<RepositoryReference Include="format" />
<RepositoryReference Include="templating" />
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="test-templates" />
<RepositoryReference Include="fsharp" />
<RepositoryReference Include="sdk" />
<RepositoryReference Include="vstest" />
<RepositoryReference Include="installer" />
<!-- Package source-build artifacts -->
<RepositoryReference Include="package-source-build" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Target Name="RepoBuild" />
</Project>

37
src/SourceBuild/content/repo-projects/known-good-tests.proj
View file

@ -1,37 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<RepoApiImplemented>false</RepoApiImplemented>
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
</PropertyGroup>
<!-- This project file includes only repos that are enabled for building and running tests in source-build. -->
<!-- Windows and ARM builds don't support all repos, keep them separate for future conditioning. -->
<Choose>
<When Condition="'$(OS)' == 'Windows_NT'">
<ItemGroup>
<RepositoryReference Include="runtime" />
</ItemGroup>
</When>
<When Condition="$(Platform.Contains('arm'))">
<ItemGroup>
<RepositoryReference Include="runtime" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<!-- List of repos currently enabled. -->
<RepositoryReference Include="runtime" />
</ItemGroup>
</Otherwise>
</Choose>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Target Name="RepoBuild">
</Target>
</Project>

79
src/SourceBuild/content/repo-projects/known-good.proj
View file

@ -1,79 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<RepoApiImplemented>false</RepoApiImplemented>
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
</PropertyGroup>
<!-- This project file serves a couple of purpose.
- We conditionally include repos based on what works on different platforms/configurations.
- We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
- If we have a repo that is not in core-sdk's dependency tree, we can still build it by including it here. -->
<!-- Windows and ARM builds currently only work through core-setup -->
<Choose>
<When Condition="'$(OS)' == 'Windows_NT'">
<ItemGroup>
<RepositoryReference Include="runtime" />
</ItemGroup>
</When>
<!-- Originally used to capture arm platforms. Now with support, left as an extension point for bringing up new architectures in the future. -->
<When Condition="'true' == 'false'">
<ItemGroup>
<RepositoryReference Include="runtime" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<!-- Toolsets -->
<RepositoryReference Include="source-build-reference-packages" />
<RepositoryReference Include="sourcelink" />
<RepositoryReference Include="arcade" />
<!-- Tier 1 -->
<RepositoryReference Include="command-line-api" />
<RepositoryReference Include="diagnostics" />
<RepositoryReference Include="emsdk" />
<RepositoryReference Include="razor" />
<RepositoryReference Include="xliff-tasks" />
<RepositoryReference Include="runtime" />
<RepositoryReference Include="roslyn" />
<RepositoryReference Include="source-build-externals" />
<RepositoryReference Include="symreader" />
<RepositoryReference Include="xdt" />
<!-- Tier 2 -->
<RepositoryReference Include="msbuild" />
<!-- Tier 3 -->
<RepositoryReference Include="roslyn-analyzers" />
<!-- Tier 4 -->
<RepositoryReference Include="aspnetcore" />
<RepositoryReference Include="deployment-tools" />
<RepositoryReference Include="format" />
<RepositoryReference Include="templating" />
<RepositoryReference Include="nuget-client" />
<RepositoryReference Include="test-templates" />
<!-- Tier 5 -->
<RepositoryReference Include="fsharp" />
<RepositoryReference Include="sdk" />
<RepositoryReference Include="vstest" />
<!-- Tier 6 -->
<RepositoryReference Include="installer" />
<!-- Package source-build artifacts -->
<RepositoryReference Include="package-source-build" />
</ItemGroup>
</Otherwise>
</Choose>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Target Name="RepoBuild">
</Target>
</Project>