Skip to content

Commit 585ca02

Browse files
mkArtakMSFTwtgodbe
andauthored
Include all projects under the src/Features folder instead of just the JsonPatch (#61620)
* Include all projects under the src/Features folder instead of just the JsonPatch This is required because the new JsonPatch.SystemTextJson project is also in this folder yet is not picked-up for producing the package. * Missed another reference to JsonPatch directly * Run the GenerateProjectList.ps1 * Update Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj --------- Co-authored-by: William Godbe <wigodbe@microsoft.com>
1 parent 1cb6199 commit 585ca02

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

eng/Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
$(RepoRoot)src\Assets\**\*.*proj;
163163
$(RepoRoot)src\Caching\**\*.*proj;
164164
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
165-
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;
165+
$(RepoRoot)src\Features\**\*.*proj;
166166
$(RepoRoot)src\DataProtection\**\*.*proj;
167167
$(RepoRoot)src\Antiforgery\**\*.*proj;
168168
$(RepoRoot)src\Hosting\**\*.*proj;
@@ -211,7 +211,7 @@
211211
$(RepoRoot)src\Assets\**\*.*proj;
212212
$(RepoRoot)src\Caching\**\src\*.csproj;
213213
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
214-
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;
214+
$(RepoRoot)src\Features\**\src\*.csproj;
215215
$(RepoRoot)src\DataProtection\**\src\*.csproj;
216216
$(RepoRoot)src\Antiforgery\**\src\*.csproj;
217217
$(RepoRoot)src\Hosting\**\src\*.csproj;

eng/ProjectReferences.props

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
1010
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
1111
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />
12+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" ProjectPath="$(RepoRoot)src\Features\JsonPatch.SystemTextJson\src\Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj" />
1213
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" />
1314
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
1415
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" />

eng/ShippingAssemblies.props

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.App.Internal.Assets" />
109109
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.SqlServer" />
110110
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
111+
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" />
111112
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch" />
112113
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
113114
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />

src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<ProjectReference Include="..\src\Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj" />
8+
<Reference Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" />
99
</ItemGroup>
1010

1111
</Project>

0 commit comments

Comments
 (0)