Skip to content

Clean up shared props usage #9

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
May 14, 2025
Merged

Clean up shared props usage #9

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
cf80146
Clean up shared props usage
hhvrc May 14, 2025
fef84cc
Merge branch 'master' into chore/cleanup-shared-props-usage
hhvrc May 14, 2025
7e74d10
Downgrade langversion
hhvrc May 14, 2025
86ff7db
Add missing using statements
hhvrc May 14, 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
5 changes: 4 additions & 1 deletion SDK.CSharp.Example/ExampleConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace SDK.CSharp.Example;
using System;
using System.Collections.Generic;

namespace SDK.CSharp.Example;

public sealed class ExampleConfig
{
Expand Down
3 changes: 3 additions & 0 deletions SDK.CSharp.Example/Http/PauseShocker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using OpenShock.SDK.CSharp;
using System;
using System.Linq;
using System.Threading.Tasks;

namespace SDK.CSharp.Example.Http;

Expand Down
4 changes: 3 additions & 1 deletion SDK.CSharp.Example/IExample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace SDK.CSharp.Example;
using System.Threading.Tasks;

namespace SDK.CSharp.Example;

public interface IExample
{
Expand Down
2 changes: 2 additions & 0 deletions SDK.CSharp.Example/LiveControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
using OpenShock.SDK.CSharp;
using OpenShock.SDK.CSharp.Live;
using OpenShock.SDK.CSharp.Models;
using System;
using System.Threading.Tasks;

namespace SDK.CSharp.Example;

Expand Down
5 changes: 4 additions & 1 deletion SDK.CSharp.Example/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using System.Collections.Immutable;
using System;
using System.Collections.Immutable;
using System.Linq;
using System.Text.Json;
using System.Threading;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
Expand Down
2 changes: 0 additions & 2 deletions SDK.CSharp.Example/SDK.CSharp.Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions SDK.CSharp.Example/SignalrHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using OpenShock.SDK.CSharp.Hub;
using OpenShock.SDK.CSharp.Models;
using Serilog;
using System.Linq;
using System.Threading.Tasks;

namespace SDK.CSharp.Example;

Expand Down
1 change: 0 additions & 1 deletion SDK.CSharp.Hub/HubClientOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using OpenShock.SDK.CSharp;

namespace OpenShock.SDK.CSharp.Hub;

Expand Down
4 changes: 0 additions & 4 deletions SDK.CSharp.Hub/SDK.CSharp.Hub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<Import Project="../Shared.props" />

<PropertyGroup>
<AssemblyName>OpenShock.SDK.CSharp.Hub</AssemblyName>
<RootNamespace>OpenShock.SDK.CSharp.Hub</RootNamespace>
<Title>SDK.DotNet.Hub</Title>
<Product>SDK.CSharp.Hub</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
4 changes: 0 additions & 4 deletions SDK.CSharp.Live/SDK.CSharp.Live.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<Import Project="../Shared.props" />

<PropertyGroup>
<AssemblyName>OpenShock.SDK.CSharp.Live</AssemblyName>
<RootNamespace>OpenShock.SDK.CSharp.Live</RootNamespace>
<Title>SDK.DotNet.Live</Title>
<Product>SDK.CSharp.Live</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
6 changes: 5 additions & 1 deletion SDK.CSharp.Tests/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
using System.Net;
using System;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Net.Mime;
using System.Text;
using System.Threading.Tasks;
using OpenShock.SDK.CSharp;

namespace SDK.CSharp.Tests;
Expand Down
5 changes: 5 additions & 0 deletions SDK.CSharp.Tests/HttpMessageHandlerStub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

namespace SDK.CSharp.Tests;

public class HttpMessageHandlerStub : HttpMessageHandler
Expand Down
3 changes: 0 additions & 3 deletions SDK.CSharp.Tests/SDK.CSharp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

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

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion SDK.CSharp.Tests/TestShockerEndpoints.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace SDK.CSharp.Tests;
using System.Threading.Tasks;

namespace SDK.CSharp.Tests;

public sealed class TestShockerEndpoints
{
Expand Down
1 change: 0 additions & 1 deletion SDK.CSharp/OpenShockApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Collections.Immutable;
using System.Net;
using System.Net.Http.Json;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.Json;
using OneOf;
Expand Down
3 changes: 1 addition & 2 deletions SDK.CSharp/Problems/ProblemDetails.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Net;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;

namespace OpenShock.SDK.CSharp.Problems;

Expand Down
4 changes: 1 addition & 3 deletions SDK.CSharp/Problems/ShockerControlProblem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Net;

namespace OpenShock.SDK.CSharp.Problems;
namespace OpenShock.SDK.CSharp.Problems;

public sealed class ShockerControlProblem : ProblemDetails
{
Expand Down
4 changes: 0 additions & 4 deletions SDK.CSharp/SDK.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<Import Project="../Shared.props" />

<PropertyGroup>
<AssemblyName>OpenShock.SDK.CSharp</AssemblyName>
<RootNamespace>OpenShock.SDK.CSharp</RootNamespace>
<Title>OpenShock.SDK.DotNet</Title>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>OpenShock.SDK.CSharp</PackageId>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion SDK.CSharp/Utils/HttpResponseUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Text.Json;
using OneOf.Types;
using OpenShock.SDK.CSharp.Models;

namespace OpenShock.SDK.CSharp.Utils;
Expand Down
8 changes: 6 additions & 2 deletions Shared.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
<Product>$(Company).$(MSBuildProjectName)</Product>
<Version>0.0.34</Version>

<Title>$(Product)</Title>
<Authors>OpenShock</Authors>
<Description>.NET / C# SDK for developing OpenShock applications. Used to interact with a OpenShock backend.</Description>
<RepositoryUrl>https://github.com/OpenShock/SDK.CSharp</RepositoryUrl>
<PackageProjectUrl>https://openshock.org</PackageProjectUrl>
<PackageId>$(Product)</PackageId>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<PackageTags>openshock</PackageTags>
<LangVersion>13</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -23,10 +24,13 @@
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;netstandard2.1</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>Latest</LangVersion>
<Nullable>enable</Nullable>
<AssemblyName>$(Product)</AssemblyName>
<RootNamespace>$(Product)</RootNamespace>
<AssemblyVersion>$(Version)</AssemblyVersion>
<FileVersion>$(Version)</FileVersion>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
</Project>
</Project>
Loading