Skip to content

Commit

Permalink
Combined common project settings via props file
Browse files Browse the repository at this point in the history
  • Loading branch information
chrishamm committed Oct 20, 2023
1 parent 6dc855a commit 71ae33d
Show file tree
Hide file tree
Showing 19 changed files with 336 additions and 490 deletions.
34 changes: 12 additions & 22 deletions src/CodeConsole/CodeConsole.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<Version>3.5.0-rc.2</Version>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
</Project>
35 changes: 12 additions & 23 deletions src/CodeLogger/CodeLogger.csproj
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<Version>3.5.0-rc.2</Version>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<Copyright>Duet3D Ltd</Copyright>
<AssemblyVersion>3.3.0.0</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
</Project>
34 changes: 12 additions & 22 deletions src/CodeStream/CodeStream.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<Version>3.5.0-rc.2</Version>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
</Project>
34 changes: 12 additions & 22 deletions src/CustomHttpEndpoint/CustomHttpEndpoint.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TrimUnusedDependencies>true</TrimUnusedDependencies>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Version>3.5.0-rc.2</Version>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DuetAPIClient\DuetAPIClient.csproj" />
<ProjectReference Include="..\DuetAPI\DuetAPI.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="DotnetPublishSsh" Version="0.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DuetAPIClient\DuetAPIClient.csproj" />
</ItemGroup>
</Project>
13 changes: 13 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<LangVersion>10</LangVersion>
<Version>3.5.0-rc.2</Version>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<Copyright>Duet3D Ltd</Copyright>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
</PropertyGroup>
</Project>
27 changes: 8 additions & 19 deletions src/DocGen/DocGen.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<Version>3.5.0-rc.2</Version>
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>

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

<ItemGroup>
<ProjectReference Include="..\DuetAPI\DuetAPI.csproj" />
</ItemGroup>
</Project>
19 changes: 9 additions & 10 deletions src/Documentation/Documentation.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="docfx.console" Version="2.59.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="docfx.console" Version="2.59.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
63 changes: 26 additions & 37 deletions src/DuetAPI/DuetAPI.csproj
Original file line number Diff line number Diff line change
@@ -1,42 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<Version>3.5.0-rc.2</Version>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Official API library for Duet Software Framework (Duet 3) by Duet3D</Description>
<Copyright>Duet3D Ltd</Copyright>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<PackageIcon>duet_teardrop_wifi_large.png</PackageIcon>
<PackageIconUrl />
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Official API library for Duet Software Framework (Duet 3) by Duet3D</Description>
<PackageIcon>duet_teardrop_wifi_large.png</PackageIcon>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>DuetAPI.xml</DocumentationFile>
<PackageTags>Duet Duet3 DSF DuetSoftwareFramework</PackageTags>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>DuetAPI.xml</DocumentationFile>
<PackageTags>Duet Duet3 DSF DuetSoftwareFramework</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\pkg\common\duet_teardrop_wifi_large.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="6.0.8" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\pkg\common\duet_teardrop_wifi_large.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="6.0.8" />
</ItemGroup>
</Project>
67 changes: 28 additions & 39 deletions src/DuetAPIClient/DuetAPIClient.csproj
Original file line number Diff line number Diff line change
@@ -1,45 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Official client API library for Duet Software Framework (Duet 3) by Duet3D</Description>
<PackageIcon>duet_teardrop_wifi_large.png</PackageIcon>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>
<Authors>Christian Hammacher</Authors>
<Company>Duet3D Ltd</Company>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<Version>3.5.0-rc.2</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Official client API library for Duet Software Framework (Duet 3) by Duet3D</Description>
<PackageProjectUrl>https://github.com/Duet3D/DuetSoftwareFramework</PackageProjectUrl>
<PackageIcon>duet_teardrop_wifi_large.png</PackageIcon>
<PackageIconUrl />
<RepositoryUrl>https://github.com/Duet3D/DuetSoftwareFramework.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>DuetAPIClient.xml</DocumentationFile>
<PackageTags>Duet Duet3 DSF DuetSoftwareFramework</PackageTags>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>DuetAPIClient.xml</DocumentationFile>
<PackageTags>Duet Duet3 DSF DuetSoftwareFramework</PackageTags>
<Copyright>Duet3D Ltd</Copyright>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DuetAPI\DuetAPI.csproj" />
</ItemGroup>

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

<ItemGroup>
<None Include="..\..\pkg\common\duet_teardrop_wifi_large.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="..\..\pkg\common\duet_teardrop_wifi_large.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
Loading

0 comments on commit 71ae33d

Please sign in to comment.