Skip to content

Cleanup project files #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hhvrc merged 4 commits into from
Feb 6, 2025
Merged

Cleanup project files #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1727483
Clean up project files
hhvrc Feb 6, 2025
b61208e
Include more package specific props
hhvrc Feb 6, 2025
d19ae34
Minor fixup
hhvrc Feb 6, 2025
02c27f0
Add Package License URL
hhvrc Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions API/API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="../Shared.props" />

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>OpenShock.API</AssemblyName>
<RootNamespace>OpenShock.API</RootNamespace>
<AssemblyVersion>3.10.3</AssemblyVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Company>OpenShock</Company>
<Product>API</Product>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<NoWarn>1701;1702;IL2121;1591</NoWarn>
<NoWarn>1701;1702;IL2121;1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<NoWarn>1701;1702;IL2121;1591</NoWarn>
<NoWarn>1701;1702;IL2121;1591</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -69,11 +61,10 @@
<ProjectReference Include="..\Common\Common.csproj" />
<None Include="devcert.pfx" CopyToPublishDirectory="Always" />
<None Update="SmtpTemplates\PasswordReset.liquid">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SmtpTemplates\EmailVerification.liquid">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
45 changes: 18 additions & 27 deletions Common.Tests/Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Shared.props" />

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>OpenShock.Common.Tests</AssemblyName>
<RootNamespace>OpenShock.Common.Tests</RootNamespace>
<Company>OpenShock</Company>
<Product>OpenShock.Common.Tests</Product>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Testcontainers" Version="4.1.0" />
<PackageReference Include="Testcontainers.PostgreSql" Version="4.1.0" />
<PackageReference Include="Testcontainers.Redis" Version="4.1.0" />
<PackageReference Include="TUnit" Version="0.10.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Testcontainers.PostgreSql" Version="4.1.0" />
<PackageReference Include="Testcontainers.Redis" Version="4.1.0" />
<PackageReference Include="TUnit" Version="0.10.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Validation\DataSets\BlackList.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Validation\DataSets\WhiteList.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Validation\DataSets\BlackList.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Validation\DataSets\WhiteList.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
15 changes: 3 additions & 12 deletions Common/Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="../Shared.props" />

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>OpenShock.Common</AssemblyName>
<RootNamespace>OpenShock.Common</RootNamespace>
<Company>OpenShock</Company>
<Product>OpenShock.Common</Product>
<AssemblyVersion>3.1.0</AssemblyVersion>
<FileVersion>3.1.0</FileVersion>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
Expand Down Expand Up @@ -54,5 +46,4 @@
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.103.7" />
</ItemGroup>

</Project>
20 changes: 5 additions & 15 deletions Cron/Cron.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>OpenShock.Cron</AssemblyName>
<RootNamespace>OpenShock.Cron</RootNamespace>
<Company>OpenShock</Company>
<AssemblyVersion>3.10.3</AssemblyVersion>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
</PropertyGroup>
<Import Project="../Shared.props" />

<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.17" />
Expand All @@ -18,12 +8,12 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\Common\Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="devcert.pfx">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</None>
<None Update="devcert.pfx">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</None>
</ItemGroup>
</Project>
23 changes: 7 additions & 16 deletions LiveControlGateway/LiveControlGateway.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="../Shared.props" />

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>OpenShock.LiveControlGateway</AssemblyName>
<RootNamespace>OpenShock.LiveControlGateway</RootNamespace>
<Company>OpenShock</Company>
<AssemblyVersion>3.10.3</AssemblyVersion>
<Product>LiveControlGateway</Product>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -39,14 +31,13 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<FlatSharpSchema Include="Serialization\**\*.fbs" />
<ProjectReference Include="..\Common\Common.csproj" />
<FlatSharpSchema Include="Serialization\**\*.fbs" />
</ItemGroup>

<ItemGroup>
<None Update="devcert.pfx">
<None Update="devcert.pfx">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</None>
</None>
</ItemGroup>

</Project>
</Project>
7 changes: 2 additions & 5 deletions MigrationHelper/MigrationHelper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Shared.props" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\Common\Common.csproj" />
</ItemGroup>

</Project>
35 changes: 35 additions & 0 deletions Shared.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project>
<PropertyGroup>
<Company>OpenShock</Company>
<Product>$(Company).$(MSBuildProjectName)</Product>
<Version>3.10.3</Version>

<RepositoryUrl>https://github.com/OpenShock/API</RepositoryUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageLicenseUrl>$(RepositoryUrl)/LICENSE</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
</PropertyGroup>

<ItemGroup>
<None Include="../README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="../LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>$(Product)</AssemblyName>
<RootNamespace>$(Product.Replace(" ", "_"))</RootNamespace>
<AssemblyVersion>$(Version)</AssemblyVersion>
<FileVersion>$(Version)</FileVersion>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
</PropertyGroup>
</Project>
Loading