Skip to content

Commit 3641761

Browse files
natemcmasternatemcmaster
authored
Convert AADIntegration projects to ProjectRef (#6082)
1 parent 37291ea commit 3641761

File tree

143 files changed

+565
-1080
lines changed

Some content is hidden

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

143 files changed

+565
-1080
lines changed

‎Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<!-- Implementation projects are the projects which produce nuget packages or shipping assemblies. -->
3939
<IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsTestAssetProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsImplementationProject>
4040

41+
<!-- This determines whether a project is available as a <Reference> to other projects in this repo. -->
42+
<IsProjectReferenceProvider Condition=" '$(IsProjectReferenceProvider)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(PackAsTool)' != 'true' ">true</IsProjectReferenceProvider>
43+
4144
<!-- Suppress KoreBuild warnings about the mismatch of repo version and local project version. The versioning in this mega repo is sufficiently complicated that KoreBuild's validation isn't helpful. -->
4245
<VerifyVersion>false</VerifyVersion>
4346

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<ItemGroup>
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
11-
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1211
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
1312
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1413
<RepositoryBuildOrder Include="Scaffolding" Order="15" />

‎build/repo.props

Lines changed: 50 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,49 +46,60 @@
4646
<SharedFrameworkName Include="Microsoft.AspNetCore.App" />
4747
</ItemGroup>
4848

49-
<ItemGroup>
50-
<SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
49+
<Choose>
50+
<!-- Project selection can be overridden on the command line by passing in -projects -->
51+
<When Condition="'$(Projects)' != ''">
52+
<ItemGroup>
53+
<ProjectToBuild Include="$(Projects)" Exclude="@(ProjectToExclude)" />
54+
</ItemGroup>
55+
</When>
56+
<Otherwise>
57+
<ItemGroup>
58+
<SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
5159

52-
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
60+
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
5361

54-
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
55-
<ProjectToExclude Include="
56-
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
57-
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
58-
"
59-
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
62+
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
63+
<ProjectToExclude Include="
64+
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
65+
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
66+
"
67+
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
6068

61-
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
62-
<ProjectToExclude Include="
63-
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
64-
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
65-
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
66-
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
67-
" />
69+
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
70+
<ProjectToExclude Include="
71+
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
72+
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
73+
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
74+
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
75+
" />
6876

69-
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
70-
<ProjectToBuild Include="
71-
$(RepositoryRoot)src\DefaultBuilder\**\*.*proj;
72-
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
73-
$(RepositoryRoot)src\DataProtection\**\*.*proj;
74-
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
75-
$(RepositoryRoot)src\Hosting\**\*.*proj;
76-
$(RepositoryRoot)src\Http\**\*.*proj;
77-
$(RepositoryRoot)src\Html\**\*.*proj;
78-
$(RepositoryRoot)src\Servers\**\*.csproj;
79-
$(RepositoryRoot)src\Servers\**\*.pkgproj;
80-
$(RepositoryRoot)src\Security\**\*.*proj;
81-
$(RepositoryRoot)src\Shared\**\*.*proj;
82-
$(RepositoryRoot)src\Tools\**\*.*proj;
83-
$(RepositoryRoot)src\Middleware\**\*.*proj;
84-
$(RepositoryRoot)src\Razor\**\*.*proj;
85-
$(RepositoryRoot)src\Mvc\**\*.*proj;
86-
"
87-
Exclude="
88-
@(ProjectToExclude);
89-
$(RepositoryRoot)**\bin\**\*;
90-
$(RepositoryRoot)**\obj\**\*;" />
91-
</ItemGroup>
77+
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
78+
<ProjectToBuild Include="
79+
$(RepositoryRoot)src\DefaultBuilder\**\*.*proj;
80+
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
81+
$(RepositoryRoot)src\DataProtection\**\*.*proj;
82+
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
83+
$(RepositoryRoot)src\Hosting\**\*.*proj;
84+
$(RepositoryRoot)src\Http\**\*.*proj;
85+
$(RepositoryRoot)src\Html\**\*.*proj;
86+
$(RepositoryRoot)src\Servers\**\*.csproj;
87+
$(RepositoryRoot)src\Servers\**\*.pkgproj;
88+
$(RepositoryRoot)src\Security\**\*.*proj;
89+
$(RepositoryRoot)src\Shared\**\*.*proj;
90+
$(RepositoryRoot)src\Tools\**\*.*proj;
91+
$(RepositoryRoot)src\Middleware\**\*.*proj;
92+
$(RepositoryRoot)src\Razor\**\*.*proj;
93+
$(RepositoryRoot)src\Mvc\**\*.*proj;
94+
$(RepositoryRoot)src\Azure\**\*.*proj;
95+
"
96+
Exclude="
97+
@(ProjectToExclude);
98+
$(RepositoryRoot)**\bin\**\*;
99+
$(RepositoryRoot)**\obj\**\*;" />
100+
</ItemGroup>
101+
</Otherwise>
102+
</Choose>
92103

93104
<!-- Properties for publishing -->
94105
<PropertyGroup>

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
4948
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
5049
<ShippedRepository Include="EntityFrameworkCore" />
5150
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />

0 commit comments

Comments
 (0)