From eade8aae838a7b2ff19e0f3de0cdd92f3019e5ab Mon Sep 17 00:00:00 2001
From: JamesMurkin <jamesmurkin@hotmail.com>
Date: Fri, 29 Nov 2019 09:29:23 +0000
Subject: [PATCH] Updating dotnet client to prepare it for publishing to
 nuget.org

Added to csproj to include release information such as:
 - Authors
 - PackageId
 - Company

This will be used by Nuget to display information about the package

Also update the Namespace to include GResearch, to make it bring it inline with other projects published by companies
---
 .../Armada.Client.Test.csproj}                | 37 +++++++++++--------
 .../Tests.cs                                  |  4 +-
 .../DotNet/Armada.Client/Armada.Client.csproj | 27 ++++++++++++++
 .../{ArmadaClient => Armada.Client}/Client.cs |  2 +-
 .../ClientGenerated.cs                        |  2 +-
 client/DotNet/ArmadaClient.sln                |  4 +-
 .../DotNet/ArmadaClient/ArmadaClient.csproj   | 17 ---------
 7 files changed, 54 insertions(+), 39 deletions(-)
 rename client/DotNet/{ArmadaClient.Test/ArmadaClient.Test.csproj => Armada.Client.Test/Armada.Client.Test.csproj} (70%)
 rename client/DotNet/{ArmadaClient.Test => Armada.Client.Test}/Tests.cs (97%)
 create mode 100644 client/DotNet/Armada.Client/Armada.Client.csproj
 rename client/DotNet/{ArmadaClient => Armada.Client}/Client.cs (97%)
 rename client/DotNet/{ArmadaClient => Armada.Client}/ClientGenerated.cs (99%)
 delete mode 100644 client/DotNet/ArmadaClient/ArmadaClient.csproj

diff --git a/client/DotNet/ArmadaClient.Test/ArmadaClient.Test.csproj b/client/DotNet/Armada.Client.Test/Armada.Client.Test.csproj
similarity index 70%
rename from client/DotNet/ArmadaClient.Test/ArmadaClient.Test.csproj
rename to client/DotNet/Armada.Client.Test/Armada.Client.Test.csproj
index 9e2eaef75d1..ce32211afb5 100644
--- a/client/DotNet/ArmadaClient.Test/ArmadaClient.Test.csproj
+++ b/client/DotNet/Armada.Client.Test/Armada.Client.Test.csproj
@@ -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>
diff --git a/client/DotNet/ArmadaClient.Test/Tests.cs b/client/DotNet/Armada.Client.Test/Tests.cs
similarity index 97%
rename from client/DotNet/ArmadaClient.Test/Tests.cs
rename to client/DotNet/Armada.Client.Test/Tests.cs
index 099150313e5..5a11261ce9a 100644
--- a/client/DotNet/ArmadaClient.Test/Tests.cs
+++ b/client/DotNet/Armada.Client.Test/Tests.cs
@@ -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
     {
diff --git a/client/DotNet/Armada.Client/Armada.Client.csproj b/client/DotNet/Armada.Client/Armada.Client.csproj
new file mode 100644
index 00000000000..5b65865f055
--- /dev/null
+++ b/client/DotNet/Armada.Client/Armada.Client.csproj
@@ -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>
diff --git a/client/DotNet/ArmadaClient/Client.cs b/client/DotNet/Armada.Client/Client.cs
similarity index 97%
rename from client/DotNet/ArmadaClient/Client.cs
rename to client/DotNet/Armada.Client/Client.cs
index 2f28f3b81a0..a1ce03707ae 100644
--- a/client/DotNet/ArmadaClient/Client.cs
+++ b/client/DotNet/Armada.Client/Client.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace ArmadaClient
+namespace GResearch.Armada.Client
 {
     public class StreamResponse<T>
     {
diff --git a/client/DotNet/ArmadaClient/ClientGenerated.cs b/client/DotNet/Armada.Client/ClientGenerated.cs
similarity index 99%
rename from client/DotNet/ArmadaClient/ClientGenerated.cs
rename to client/DotNet/Armada.Client/ClientGenerated.cs
index c28d8aa3098..13bf3f67f61 100644
--- a/client/DotNet/ArmadaClient/ClientGenerated.cs
+++ b/client/DotNet/Armada.Client/ClientGenerated.cs
@@ -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;
     
diff --git a/client/DotNet/ArmadaClient.sln b/client/DotNet/ArmadaClient.sln
index d52d0727181..c04d95e05dd 100644
--- a/client/DotNet/ArmadaClient.sln
+++ b/client/DotNet/ArmadaClient.sln
@@ -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
diff --git a/client/DotNet/ArmadaClient/ArmadaClient.csproj b/client/DotNet/ArmadaClient/ArmadaClient.csproj
deleted file mode 100644
index f68da9c0812..00000000000
--- a/client/DotNet/ArmadaClient/ArmadaClient.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </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:ArmadaClient /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
-  </Target>
-  
-</Project>