Skip to content
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

Updating dotnet client to prepare it for publishing to nuget.org #263

Merged
merged 1 commit into from
Nov 29, 2019
Merged

Updating dotnet client to prepare it for publishing to nuget.org #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions ...rmadaClient.Test/ArmadaClient.Test.csproj → ...ada.Client.Test/Armada.Client.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<ProjectReference Include="../ArmadaClient/ArmadaClient.csproj" Condition="" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

<IsPackable>false</IsPackable>

<RootNamespace>GResearch.Armada.Client.Test</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Armada.Client\Armada.Client.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions client/DotNet/ArmadaClient.Test/Tests.cs → client/DotNet/Armada.Client.Test/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
using ArmadaClient;
using GResearch.Armada.Client;

namespace ArmadaClient.Test
namespace GResearch.Armada.Client.Test
{
public class Tests
{
Expand Down
27 changes: 27 additions & 0 deletions client/DotNet/Armada.Client/Armada.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>G-Research.Armada.Client</PackageId>
<Version>0.0.1</Version>
<Authors>G-Research</Authors>
<Company>G-Research</Company>
<Description>Armada.Client is a .NET core library for communicating with Armada server implemented in C#</Description>
<Copyright>Copyright G-Research 2019</Copyright>
<PackageProjectUrl>https://github.com/G-Research/armada</PackageProjectUrl>
<PackageTags>armada gresearch g-research .net c# dotnet</PackageTags>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RootNamespace>GResearch.Armada.Client</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NSwag.MSBuild" Version="13.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NSwag.CodeGeneration.CSharp" Version="13.1.3" />
</ItemGroup>

<Target Name="NSwag" BeforeTargets="Build">
<Exec Command="$(NSwagExe_Core30) openapi2csclient /ProtectedMethods:Client.GetJobSetEventsAsync /classname:Client /namespace:GResearch.Armada.Client /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion client/DotNet/ArmadaClient/Client.cs → client/DotNet/Armada.Client/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json;

namespace ArmadaClient
namespace GResearch.Armada.Client
{
public class StreamResponse<T>
{
Expand Down
2 changes: 1 addition & 1 deletion ...nt/DotNet/ArmadaClient/ClientGenerated.cs → ...t/DotNet/Armada.Client/ClientGenerated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ...
#pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..."

namespace ArmadaClient
namespace GResearch.Armada.Client
{
using System = global::System;

Expand Down
4 changes: 2 additions & 2 deletions client/DotNet/ArmadaClient.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArmadaClient", "ArmadaClient\ArmadaClient.csproj", "{8016908D-697F-48B0-9AAA-048A64A06FA8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Armada.Client", "Armada.Client\Armada.Client.csproj", "{8016908D-697F-48B0-9AAA-048A64A06FA8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArmadaClient.Test", "ArmadaClient.Test\ArmadaClient.Test.csproj", "{FFF216CF-27D6-4E56-B472-30092FF6AE4D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Armada.Client.Test", "Armada.Client.Test\Armada.Client.Test.csproj", "{FFF216CF-27D6-4E56-B472-30092FF6AE4D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
17 changes: 0 additions & 17 deletions client/DotNet/ArmadaClient/ArmadaClient.csproj
View file
Open in desktop

This file was deleted.