Skip to content

Commit 244d179

Browse files
commonsensesoftwarecommonsensesoftware
committed
Simplify build for full .NET Framework reference assemblies
1 parent be7db04 commit 244d179

File tree

7 files changed

+50
-51
lines changed

7 files changed

+50
-51
lines changed

‎asp.sln‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ EndProject
2626
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{7B0FA6C2-47BA-4C34-90E0-B75DF44F2124}"
2727
EndProject
2828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{34A0373F-12C9-44A8-9A1C-5EEE7218C877}"
29+
ProjectSection(SolutionItems) = preProject
30+
src\AspNet\Directory.Build.targets = src\AspNet\Directory.Build.targets
31+
EndProjectSection
2932
EndProject
3033
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCore", "AspNetCore", "{EBC9F217-E8BC-4DCE-9C67-F22150959EAF}"
3134
EndProject
@@ -191,43 +194,6 @@ EndProject
191194
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SomeOpenApiODataWebApiExample", "examples\AspNet\OData\SomeOpenApiODataWebApiExample\SomeOpenApiODataWebApiExample.csproj", "{AC952FBF-D7DC-4DE4-AD1C-4CEA589034F5}"
192195
EndProject
193196
Global
194-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
195-
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{0be9efaa-3627-46fe-9861-9121ee8f0e26}*SharedItemsImports = 5
196-
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{0fa0aa78-4356-4593-854a-e9698d27ab3d}*SharedItemsImports = 13
197-
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{130d569d-ae59-43a6-977c-4fe6062ac0ba}*SharedItemsImports = 5
198-
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{15bb5197-ef0d-4b30-954f-344eeb33c46e}*SharedItemsImports = 5
199-
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{17445b9a-9d8d-46c2-a5cf-2ab6449df187}*SharedItemsImports = 5
200-
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{1e4b750a-60b7-43a9-9b1a-bc4359ef1ac5}*SharedItemsImports = 13
201-
src\Common\src\Common.OData\Common.OData.projitems*{1ed0d3ef-16a1-40d1-a3dc-978df1eb7d3f}*SharedItemsImports = 13
202-
src\Common\src\Common.Mvc\Common.Mvc.projitems*{2faa780d-bc3a-4fb3-ba3c-a21226aba7cd}*SharedItemsImports = 5
203-
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{3e60a78c-f6cf-4071-a366-b00fc15082f8}*SharedItemsImports = 5
204-
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{496a5b79-afd2-45ac-af9a-1cd28a7e1cdb}*SharedItemsImports = 13
205-
src\Common\src\Common.Mvc\Common.Mvc.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
206-
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
207-
src\Common\src\Common.TypeInfo\Common.TypeInfo.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
208-
src\Common\src\Common\Common.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
209-
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{6164f975-0d7d-44be-bb8a-1e79e3036a30}*SharedItemsImports = 5
210-
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{62c25010-2f1d-4146-bdfc-89831d5993d4}*SharedItemsImports = 13
211-
src\Common\src\Common.Mvc\Common.Mvc.projitems*{6629a038-4ff4-45fa-8d32-3a640d831601}*SharedItemsImports = 13
212-
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{71ab5ea3-6e24-4c45-b3d9-38e935437686}*SharedItemsImports = 5
213-
src\Common\src\Common\Common.projitems*{71ab5ea3-6e24-4c45-b3d9-38e935437686}*SharedItemsImports = 5
214-
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{75b059a2-6656-4ffd-ab41-75d272b78e9d}*SharedItemsImports = 13
215-
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{75b0a776-45a2-4167-9d15-145e5352f99f}*SharedItemsImports = 13
216-
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{77070ff4-1f7b-41d2-a06c-e81e985afd2e}*SharedItemsImports = 5
217-
src\Common\src\Common.OData\Common.OData.projitems*{79c5999c-86bd-4aef-a018-02d3ae8fa40b}*SharedItemsImports = 5
218-
src\Common\src\Common.TypeInfo\Common.TypeInfo.projitems*{7a5f3994-0df5-48b5-af3d-3f88a1d4eb04}*SharedItemsImports = 13
219-
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{897167d5-3959-45ad-837c-9ed0b5cd9213}*SharedItemsImports = 5
220-
src\Common\test\Common.Tests\Common.Tests.projitems*{91fbdded-442b-4ff7-b096-10305bfe1899}*SharedItemsImports = 5
221-
src\Common\src\Common\Common.projitems*{a2df7cb6-142e-43d0-82c0-47ad5e89f4e3}*SharedItemsImports = 13
222-
src\Common\src\Common.OData\Common.OData.projitems*{c7581efd-32f9-4adc-afa6-3ec9da8aa628}*SharedItemsImports = 5
223-
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{c7e8692d-e286-4c41-a49e-0be65aeb3aa5}*SharedItemsImports = 5
224-
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{e3e486e4-107b-488f-835b-d53a727c2c5e}*SharedItemsImports = 13
225-
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{ef10c285-7950-469d-81a2-2df5fab7c613}*SharedItemsImports = 5
226-
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{f844c122-1f9c-4290-b1ac-829072a5db77}*SharedItemsImports = 5
227-
src\Common\test\Common.Tests\Common.Tests.projitems*{f844c122-1f9c-4290-b1ac-829072a5db77}*SharedItemsImports = 5
228-
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{fa4da84b-9e9e-4ba9-bf96-5547b33dd1bb}*SharedItemsImports = 5
229-
src\Common\test\Common.Tests\Common.Tests.projitems*{feb58f0f-cfde-4da7-9336-af593e33634f}*SharedItemsImports = 13
230-
EndGlobalSection
231197
GlobalSection(SolutionConfigurationPlatforms) = preSolution
232198
Debug|Any CPU = Debug|Any CPU
233199
Release|Any CPU = Release|Any CPU
@@ -505,4 +471,41 @@ Global
505471
GlobalSection(ExtensibilityGlobals) = postSolution
506472
SolutionGuid = {91FE116A-CEFB-4304-A8A6-CFF021C7453A}
507473
EndGlobalSection
474+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
475+
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{0be9efaa-3627-46fe-9861-9121ee8f0e26}*SharedItemsImports = 5
476+
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{0fa0aa78-4356-4593-854a-e9698d27ab3d}*SharedItemsImports = 13
477+
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{130d569d-ae59-43a6-977c-4fe6062ac0ba}*SharedItemsImports = 5
478+
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{15bb5197-ef0d-4b30-954f-344eeb33c46e}*SharedItemsImports = 5
479+
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{17445b9a-9d8d-46c2-a5cf-2ab6449df187}*SharedItemsImports = 5
480+
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{1e4b750a-60b7-43a9-9b1a-bc4359ef1ac5}*SharedItemsImports = 13
481+
src\Common\src\Common.OData\Common.OData.projitems*{1ed0d3ef-16a1-40d1-a3dc-978df1eb7d3f}*SharedItemsImports = 13
482+
src\Common\src\Common.Mvc\Common.Mvc.projitems*{2faa780d-bc3a-4fb3-ba3c-a21226aba7cd}*SharedItemsImports = 5
483+
src\Common\src\Common.ApiExplorer\Common.ApiExplorer.projitems*{3e60a78c-f6cf-4071-a366-b00fc15082f8}*SharedItemsImports = 5
484+
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{496a5b79-afd2-45ac-af9a-1cd28a7e1cdb}*SharedItemsImports = 13
485+
src\Common\src\Common.Mvc\Common.Mvc.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
486+
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
487+
src\Common\src\Common.TypeInfo\Common.TypeInfo.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
488+
src\Common\src\Common\Common.projitems*{4d876bcc-62ea-432b-86d9-3802c9f20837}*SharedItemsImports = 5
489+
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{6164f975-0d7d-44be-bb8a-1e79e3036a30}*SharedItemsImports = 5
490+
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{62c25010-2f1d-4146-bdfc-89831d5993d4}*SharedItemsImports = 13
491+
src\Common\src\Common.Mvc\Common.Mvc.projitems*{6629a038-4ff4-45fa-8d32-3a640d831601}*SharedItemsImports = 13
492+
src\Common\src\Common.ProblemDetails\Common.ProblemDetails.projitems*{71ab5ea3-6e24-4c45-b3d9-38e935437686}*SharedItemsImports = 5
493+
src\Common\src\Common\Common.projitems*{71ab5ea3-6e24-4c45-b3d9-38e935437686}*SharedItemsImports = 5
494+
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{75b059a2-6656-4ffd-ab41-75d272b78e9d}*SharedItemsImports = 13
495+
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{75b0a776-45a2-4167-9d15-145e5352f99f}*SharedItemsImports = 13
496+
src\Common\test\Common.Acceptance.Tests\Common.Acceptance.Tests.projitems*{77070ff4-1f7b-41d2-a06c-e81e985afd2e}*SharedItemsImports = 5
497+
src\Common\src\Common.OData\Common.OData.projitems*{79c5999c-86bd-4aef-a018-02d3ae8fa40b}*SharedItemsImports = 5
498+
src\Common\src\Common.TypeInfo\Common.TypeInfo.projitems*{7a5f3994-0df5-48b5-af3d-3f88a1d4eb04}*SharedItemsImports = 13
499+
src\Common\test\Common.OData.ApiExplorer.Tests\Common.OData.ApiExplorer.Tests.projitems*{897167d5-3959-45ad-837c-9ed0b5cd9213}*SharedItemsImports = 5
500+
src\Common\test\Common.Tests\Common.Tests.projitems*{91fbdded-442b-4ff7-b096-10305bfe1899}*SharedItemsImports = 5
501+
src\Common\src\Common\Common.projitems*{a2df7cb6-142e-43d0-82c0-47ad5e89f4e3}*SharedItemsImports = 13
502+
src\Common\src\Common.OData\Common.OData.projitems*{c7581efd-32f9-4adc-afa6-3ec9da8aa628}*SharedItemsImports = 5
503+
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{c7e8692d-e286-4c41-a49e-0be65aeb3aa5}*SharedItemsImports = 5
504+
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{e3e486e4-107b-488f-835b-d53a727c2c5e}*SharedItemsImports = 13
505+
src\Common\src\Common.OData.ApiExplorer\Common.OData.ApiExplorer.projitems*{ef10c285-7950-469d-81a2-2df5fab7c613}*SharedItemsImports = 5
506+
src\Common\test\Common.Mvc.Tests\Common.Mvc.Tests.projitems*{f844c122-1f9c-4290-b1ac-829072a5db77}*SharedItemsImports = 5
507+
src\Common\test\Common.Tests\Common.Tests.projitems*{f844c122-1f9c-4290-b1ac-829072a5db77}*SharedItemsImports = 5
508+
src\Common\test\Common.OData.Tests\Common.OData.Tests.projitems*{fa4da84b-9e9e-4ba9-bf96-5547b33dd1bb}*SharedItemsImports = 5
509+
src\Common\test\Common.Tests\Common.Tests.projitems*{feb58f0f-cfde-4da7-9336-af593e33634f}*SharedItemsImports = 13
510+
EndGlobalSection
508511
EndGlobal

‎src/AspNet/Directory.Build.targets‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<Import Project="$([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)','$(MSBuildThisFileDirectory)../'))" />
5+
6+
<ItemGroup>
7+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.$(TargetFramework)" Version="1.0.2" PrivateAssets="All" />
8+
</ItemGroup>
9+
10+
</Project>

‎src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Asp.Versioning.WebApi.OData.ApiExplorer.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<Reference Include="System.ComponentModel.DataAnnotations" />
3232
</ItemGroup>
3333

34-
<ItemGroup>
35-
<PackageReference Include="microsoft.netframework.referenceassemblies.net45" Version="1.0.2" PrivateAssets="All" />
36-
</ItemGroup>
37-
3834
<ItemGroup>
3935
<ProjectReference Include="..\..\..\WebApi\src\Asp.Versioning.WebApi.ApiExplorer\Asp.Versioning.WebApi.ApiExplorer.csproj" />
4036
<ProjectReference Include="..\Asp.Versioning.WebApi.OData\Asp.Versioning.WebApi.OData.csproj" />

‎src/AspNet/OData/src/Asp.Versioning.WebApi.OData/Asp.Versioning.WebApi.OData.csproj‎

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

1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.AspNet.OData" Version="[7.5.14,8.0.0)" />
19-
<PackageReference Include="microsoft.netframework.referenceassemblies.net45" Version="1.0.2" PrivateAssets="All" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

‎src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/Asp.Versioning.WebApi.ApiExplorer.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<PackageTags>Asp;AspNet;WebAPI;Versioning;ApiExplorer</PackageTags>
1111
</PropertyGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Include="microsoft.netframework.referenceassemblies.net45" Version="1.0.2" PrivateAssets="All" />
15-
</ItemGroup>
16-
1713
<ItemGroup>
1814
<ProjectReference Include="..\..\..\WebApi\src\Asp.Versioning.WebApi\Asp.Versioning.WebApi.csproj" />
1915
</ItemGroup>

‎src/AspNet/WebApi/src/Asp.Versioning.WebApi/Asp.Versioning.WebApi.csproj‎

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

2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="[5.2.7,6.0.0)" />
24-
<PackageReference Include="microsoft.netframework.referenceassemblies.net45" Version="1.0.2" PrivateAssets="All" />
2524
</ItemGroup>
2625

2726
<ItemGroup>

‎src/AspNet/WebApi/test/Asp.Versioning.WebApi.ApiExplorer.Tests/Asp.Versioning.WebApi.ApiExplorer.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
<RootNamespace>Asp.Versioning</RootNamespace>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="microsoft.netframework.referenceassemblies.net45" Version="1.0.2" PrivateAssets="All" />
10-
</ItemGroup>
11-
128
<ItemGroup>
139
<ProjectReference Include="..\..\src\Asp.Versioning.WebApi.ApiExplorer\Asp.Versioning.WebApi.ApiExplorer.csproj" />
1410
</ItemGroup>

0 commit comments

Comments
 (0)