Skip to content

Commit 87b3034

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'cleanup-csproj-manifests' into develop
2 parents 11415eb + d740679 commit 87b3034

8 files changed

Lines changed: 59 additions & 62 deletions

File tree

‎OnTopic.AspNetCore.Mvc.Tests/OnTopic.AspNetCore.Mvc.Tests.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
@@ -9,7 +9,6 @@
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1010
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
1111
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
12-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
1312
</ItemGroup>
1413

1514
<ItemGroup>

‎OnTopic.AspNetCore.Mvc/OnTopic.AspNetCore.Mvc.csproj‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<ProjectGuid>{B7F136A1-C86D-4A74-AC4F-3693CD1358A4}</ProjectGuid>
5+
<RootNamespace>OnTopic.AspNetCore.Mvc</RootNamespace>
46
<TargetFramework>netcoreapp3.0</TargetFramework>
57
<ShouldCreateLogs>True</ShouldCreateLogs>
68
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
79
<LangVersion>8.0</LangVersion>
810
<Nullable>enable</Nullable>
911
</PropertyGroup>
12+
1013
<PropertyGroup>
11-
<AssemblyTitle>Ignia OnTopic ASP.NET Core Library</AssemblyTitle>
14+
<AssemblyTitle>OnTopic ASP.NET Core Library</AssemblyTitle>
1215
<Company>Ignia</Company>
13-
<Product>Ignia OnTopic Library</Product>
16+
<Product>OnTopic</Product>
1417
<Description>Provides presentation-layer support for the ASP.NET Core Framework.</Description>
1518
<Copyright>©2020 Ignia, LLC</Copyright>
1619
<OutputPath>bin\$(Configuration)\</OutputPath>
1720
<Authors>Ignia</Authors>
1821
</PropertyGroup>
22+
1923
<PropertyGroup>
2024
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2125
<PackageTags>C# .NET CMS Presentation Web MVC ASP.NET Core Controller</PackageTags>
2226
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2327
</PropertyGroup>
28+
2429
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2530
<DebugType>full</DebugType>
2631
<RunCodeAnalysis>false</RunCodeAnalysis>
@@ -31,11 +36,7 @@
3136
<DebugType>pdbonly</DebugType>
3237
<NoWarn>1701;1702;CA1303</NoWarn>
3338
</PropertyGroup>
34-
<ItemGroup>
35-
<Compile Remove="Backup\**" />
36-
<EmbeddedResource Remove="Backup\**" />
37-
<None Remove="Backup\**" />
38-
</ItemGroup>
39+
3940
<ItemGroup>
4041
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4142
<PackageReference Include="GitVersionTask" Version="5.0.1">
@@ -45,16 +46,14 @@
4546
<PrivateAssets>all</PrivateAssets>
4647
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4748
</PackageReference>
48-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
49-
<PrivateAssets>all</PrivateAssets>
50-
</PackageReference>
51-
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
52-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
5349
</ItemGroup>
50+
5451
<ItemGroup>
5552
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5653
</ItemGroup>
54+
5755
<ItemGroup>
5856
<None Include="README.md" />
5957
</ItemGroup>
58+
6059
</Project>

‎OnTopic.Data.Caching/OnTopic.Data.Caching.csproj‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<ProjectGuid>{206B7F91-CA25-4E9D-9576-60D2E54A2C0A}</ProjectGuid>
5+
<RootNamespace>OnTopic.Data.Caching</RootNamespace>
46
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
57
<ShouldCreateLogs>True</ShouldCreateLogs>
68
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
79
<LangVersion>8.0</LangVersion>
810
<Nullable>enable</Nullable>
911
</PropertyGroup>
12+
1013
<PropertyGroup>
1114
<AssemblyTitle>OnTopic Cached Repository</AssemblyTitle>
1215
<Company>Ignia</Company>
13-
<Product>Ignia OnTopic Library</Product>
16+
<Product>OnTopic</Product>
1417
<Description>Provides a caching decorator for ITopicRepository implementations.</Description>
1518
<Copyright>©2020 Ignia, LLC</Copyright>
1619
<OutputPath>bin\$(Configuration)\</OutputPath>
1720
<Authors>Ignia</Authors>
1821
</PropertyGroup>
22+
1923
<PropertyGroup>
2024
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2125
<PackageTags>C# .NET CMS Caching Data Repository</PackageTags>
2226
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2327
</PropertyGroup>
28+
2429
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2530
<DebugType>full</DebugType>
2631
<RunCodeAnalysis>false</RunCodeAnalysis>
@@ -32,6 +37,7 @@
3237
<UseVSHostingProcess>false</UseVSHostingProcess>
3338
<NoWarn>1701;1702;CA1303</NoWarn>
3439
</PropertyGroup>
40+
3541
<ItemGroup>
3642
<PackageReference Include="GitVersionTask" Version="5.0.1">
3743
<PrivateAssets>all</PrivateAssets>
@@ -40,19 +46,14 @@
4046
<PrivateAssets>all</PrivateAssets>
4147
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4248
</PackageReference>
43-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
44-
<PrivateAssets>all</PrivateAssets>
45-
</PackageReference>
46-
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
47-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Reference Include="Microsoft.CSharp" />
5149
</ItemGroup>
50+
5251
<ItemGroup>
5352
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5453
</ItemGroup>
54+
5555
<ItemGroup>
5656
<None Include="README.md" />
5757
</ItemGroup>
58+
5859
</Project>

‎OnTopic.Data.Sql/OnTopic.Data.Sql.csproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<ProjectGuid>{1DE1F923-C7C2-435B-B49A-975ACBCB5FF0}</ProjectGuid>
5+
<RootNamespace>OnTopic.Data.Sql</RootNamespace>
46
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
57
<LangVersion>8.0</LangVersion>
68
<Nullable>enable</Nullable>
79
</PropertyGroup>
10+
811
<PropertyGroup>
9-
<AssemblyTitle>Ignia SQL Server Repository</AssemblyTitle>
12+
<AssemblyTitle>OnTopic SQL Server Repository</AssemblyTitle>
1013
<Company>Ignia</Company>
11-
<Product>Ignia OnTopic Library</Product>
14+
<Product>OnTopic</Product>
1215
<Description>Provides Microsoft SQL Server support for persisting the OnTopic graph to a database.</Description>
1316
<Copyright>©2020 Ignia, LLC</Copyright>
1417
<OutputPath>bin\$(Configuration)\</OutputPath>
1518
<Authors>Ignia</Authors>
1619
</PropertyGroup>
20+
1721
<PropertyGroup>
1822
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
1923
<PackageTags>C# .NET CMS SQL Data Repository</PackageTags>
2024
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2125
</PropertyGroup>
26+
2227
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2328
<DebugType>full</DebugType>
2429
<RunCodeAnalysis>false</RunCodeAnalysis>
@@ -29,6 +34,7 @@
2934
<DebugType>pdbonly</DebugType>
3035
<NoWarn>1701;1702;CA1303</NoWarn>
3136
</PropertyGroup>
37+
3238
<ItemGroup>
3339
<PackageReference Include="GitVersionTask" Version="5.0.1">
3440
<PrivateAssets>all</PrivateAssets>
@@ -37,20 +43,15 @@
3743
<PrivateAssets>all</PrivateAssets>
3844
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3945
</PackageReference>
40-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
41-
<PrivateAssets>all</PrivateAssets>
42-
</PackageReference>
43-
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
44-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
4546
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
4647
</ItemGroup>
47-
<ItemGroup>
48-
<Reference Include="Microsoft.CSharp" />
49-
</ItemGroup>
48+
5049
<ItemGroup>
5150
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5251
</ItemGroup>
52+
5353
<ItemGroup>
5454
<None Include="README.md" />
5555
</ItemGroup>
56+
5657
</Project>

‎OnTopic.TestDoubles/OnTopic.TestDoubles.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<PropertyGroup>
10-
<AssemblyTitle>Ignia OnTopic Test Doubles</AssemblyTitle>
10+
<AssemblyTitle>OnTopic Test Doubles</AssemblyTitle>
1111
<Company>Ignia</Company>
12-
<Product>Ignia OnTopic Library</Product>
12+
<Product>OnTopic</Product>
1313
<Description>Test doubles, such as dummies and stubs, useful in setting up unit and integration tests for OnTopic.</Description>
1414
<Copyright>©2020 Ignia, LLC</Copyright>
1515
<OutputPath>bin\$(Configuration)\</OutputPath>

‎OnTopic.Tests/OnTopic.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
3131
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
3232
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
33-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
3433
</ItemGroup>
3534
<ItemGroup>
3635
<ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj" />

‎OnTopic.ViewModels/OnTopic.ViewModels.csproj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<ProjectGuid>{E52FC633-B4C5-4A2B-8CAF-30E756D7A6A7}</ProjectGuid>
4-
<RootNamespace>OnTopic.Models</RootNamespace>
5+
<RootNamespace>OnTopic.ViewModels</RootNamespace>
56
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
67
<ShouldCreateLogs>True</ShouldCreateLogs>
78
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
89
<LangVersion>8.0</LangVersion>
910
<Nullable>enable</Nullable>
1011
</PropertyGroup>
12+
1113
<PropertyGroup>
12-
<AssemblyTitle>Ignia OnTopic View Models</AssemblyTitle>
14+
<AssemblyTitle>OnTopic View Models</AssemblyTitle>
1315
<Company>Ignia</Company>
14-
<Product>Ignia OnTopic Library</Product>
16+
<Product>OnTopic</Product>
1517
<Description>Provides view models that map to the factory default content type schemas.</Description>
1618
<Copyright>©2020 Ignia, LLC</Copyright>
1719
<OutputPath>bin\$(Configuration)\</OutputPath>
1820
<Authors>Ignia</Authors>
1921
</PropertyGroup>
22+
2023
<PropertyGroup>
2124
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2225
<PackageTags>C# .NET CMS Presentation View Models POCO</PackageTags>
2326
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2427
</PropertyGroup>
28+
2529
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2630
<DebugType>full</DebugType>
2731
<NoWarn>CS1591,CA1056,CA1303</NoWarn>
@@ -32,6 +36,7 @@
3236
<DebugType>pdbonly</DebugType>
3337
<NoWarn>CA1303</NoWarn>
3438
</PropertyGroup>
39+
3540
<ItemGroup>
3641
<PackageReference Include="GitVersionTask" Version="5.0.1">
3742
<PrivateAssets>all</PrivateAssets>
@@ -40,19 +45,13 @@
4045
<PrivateAssets>all</PrivateAssets>
4146
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4247
</PackageReference>
43-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
44-
<PrivateAssets>all</PrivateAssets>
45-
</PackageReference>
46-
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
47-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Reference Include="Microsoft.CSharp" />
5148
</ItemGroup>
5249
<ItemGroup>
5350
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5451
</ItemGroup>
52+
5553
<ItemGroup>
5654
<None Include="README.md" />
5755
</ItemGroup>
56+
5857
</Project>

‎OnTopic/OnTopic.csproj‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<ProjectGuid>{B8D5B290-4451-4C3B-AE9E-0FF075958A74}</ProjectGuid>
5+
<RootNamespace>OnTopic</RootNamespace>
46
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
57
<ShouldCreateLogs>True</ShouldCreateLogs>
68
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
79
<LangVersion>8.0</LangVersion>
810
<Nullable>enable</Nullable>
911
</PropertyGroup>
12+
1013
<PropertyGroup>
11-
<AssemblyTitle>Ignia OnTopic Library</AssemblyTitle>
14+
<AssemblyTitle>OnTopic Library</AssemblyTitle>
1215
<Company>Ignia</Company>
13-
<Product>Ignia OnTopic Library</Product>
16+
<Product>OnTopic</Product>
1417
<Description>Libraries for supporting Ignia Topics, a content management system (CMS) based on structured, hierarchical data.</Description>
1518
<Copyright>©2020 Ignia, LLC</Copyright>
1619
<OutputPath>bin\$(Configuration)\</OutputPath>
1720
<Authors>Ignia</Authors>
1821
</PropertyGroup>
22+
1923
<PropertyGroup>
2024
<PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
2125
<PackageTags>C# .NET CMS Domain</PackageTags>
2226
<UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
2327
</PropertyGroup>
28+
2429
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2530
<DebugType>full</DebugType>
2631
<DocumentationFile>bin\$(Configuration)\OnTopic.XML</DocumentationFile>
@@ -32,6 +37,7 @@
3237
<UseVSHostingProcess>false</UseVSHostingProcess>
3338
<NoWarn>1701;1702;CA1303</NoWarn>
3439
</PropertyGroup>
40+
3541
<ItemGroup>
3642
<PackageReference Include="GitVersionTask" Version="5.0.1">
3743
<PrivateAssets>all</PrivateAssets>
@@ -40,24 +46,17 @@
4046
<PrivateAssets>all</PrivateAssets>
4147
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4248
</PackageReference>
43-
<PackageReference Include="Microsoft.CSharp" Version="4.6.0" />
44-
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="15.5.31" />
45-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
49+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0">
50+
<PrivateAssets>all</PrivateAssets>
51+
</PackageReference>
52+
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="15.5.31">
4653
<PrivateAssets>all</PrivateAssets>
4754
</PackageReference>
48-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
49-
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Reference Include="Microsoft.CSharp" />
5355
</ItemGroup>
56+
5457
<ItemGroup>
5558
<None Include="Mapping\README.md" />
5659
<None Include="README.md" />
5760
</ItemGroup>
58-
<ItemGroup>
59-
<Folder Include="Internal\Collections\" />
60-
<Folder Include="Internal\Mapping\" />
61-
<Folder Include="Internal\Reflection\" />
62-
</ItemGroup>
61+
6362
</Project>

0 commit comments

Comments
 (0)