From e4572cb8f899d265a42f4f69303634dbcb99dc0d Mon Sep 17 00:00:00 2001
From: carabasdaniel <dani@aserto.com>
Date: Mon, 23 Sep 2024 16:39:41 +0300
Subject: [PATCH 1/2] Update ci-msbuild nuget and add Aserto Middleware nuspec

---
 .github/workflows/ci-msbuild.yaml                |  8 +++++---
 src/Aserto.Middleware/Aserto.Middleware.csproj   | 13 +++++++++++++
 src/Aserto.Middleware/Aserto.Middleware.nuspec   | 16 ++++++++++++++++
 src/Aserto.Middleware/Properties/AssemblyInfo.cs |  4 ++--
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 src/Aserto.Middleware/Aserto.Middleware.nuspec

diff --git a/.github/workflows/ci-msbuild.yaml b/.github/workflows/ci-msbuild.yaml
index 93191cc..22d19eb 100644
--- a/.github/workflows/ci-msbuild.yaml
+++ b/.github/workflows/ci-msbuild.yaml
@@ -47,7 +47,6 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - { project: Aserto.Clients }
           - { project: Aserto.Middleware }
     name: Build ${{ matrix.cfg.project }}
     steps:
@@ -73,6 +72,9 @@ jobs:
       - name: Build app for release
         run: msbuild src\${{matrix.cfg.project}}\${{matrix.cfg.project}}.csproj -t:rebuild -verbosity:diag -property:Configuration=Release
 
-      - name: Publish to NuGet.org
-        run: nuget push src\${{matrix.cfg.project}}\bin\Release\*.nupkg -ApiKey ${NUGET_API_KEY}
+      - name: Pack and push nuget
+        run: |
+          cd src\${{matrix.cfg.project}}
+          nuget pack
+          nuget push *.nupkg -ApiKey $Env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
 
diff --git a/src/Aserto.Middleware/Aserto.Middleware.csproj b/src/Aserto.Middleware/Aserto.Middleware.csproj
index 72253bf..dc0eb85 100644
--- a/src/Aserto.Middleware/Aserto.Middleware.csproj
+++ b/src/Aserto.Middleware/Aserto.Middleware.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,6 +17,14 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PackageIcon>aserto-brandmark-color.png</PackageIcon>
+  </PropertyGroup>
+  <ItemGroup>
+        <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+        <None Include="..\..\build\aserto-brandmark-color.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -25,6 +34,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<!-- Generate the nupkg package on Release build -->
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
diff --git a/src/Aserto.Middleware/Aserto.Middleware.nuspec b/src/Aserto.Middleware/Aserto.Middleware.nuspec
new file mode 100644
index 0000000..f971099
--- /dev/null
+++ b/src/Aserto.Middleware/Aserto.Middleware.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>Aserto Middleware</title>
+    <authors>Aserto Dev</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">Apache-2.0</license>
+    <projectUrl>http://github.com/aserto-dev/aserto-dotnet/</projectUrl>
+    <description>$description$</description>
+    <releaseNotes>Aserto Middleware for .Net Framework.</releaseNotes>
+    <copyright>$copyright$</copyright>
+    <tags>aserto middleware</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/src/Aserto.Middleware/Properties/AssemblyInfo.cs b/src/Aserto.Middleware/Properties/AssemblyInfo.cs
index 0f85dad..13dbe80 100644
--- a/src/Aserto.Middleware/Properties/AssemblyInfo.cs
+++ b/src/Aserto.Middleware/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.52.2")]
+[assembly: AssemblyFileVersion("0.52.2")]

From d079b8c179c3b2b154719b81f2d8d22e7b9ced56 Mon Sep 17 00:00:00 2001
From: carabasdaniel <dani@aserto.com>
Date: Mon, 23 Sep 2024 16:52:11 +0300
Subject: [PATCH 2/2] Update Aserto Clients icon and readme

---
 src/Aserto.Clients/Aserto.Clients.csproj | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Aserto.Clients/Aserto.Clients.csproj b/src/Aserto.Clients/Aserto.Clients.csproj
index bf6dd93..ba1a422 100644
--- a/src/Aserto.Clients/Aserto.Clients.csproj
+++ b/src/Aserto.Clients/Aserto.Clients.csproj
@@ -7,6 +7,9 @@
 	  <TargetFrameworks>net6;net7;net8;netstandard2.0</TargetFrameworks>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <LangVersion>8.0</LangVersion>
+	  <Company>Aserto</Company>
+	  <PackageIcon>aserto-brandmark-color.png</PackageIcon>
+	  <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
 
@@ -35,6 +38,13 @@
   </ItemGroup>
 	
   <ItemGroup>
-	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
+	<None Include="..\..\build\aserto-brandmark-color.png">
+	  <Pack>True</Pack>
+	  <PackagePath>\</PackagePath>
+	</None>
+	<None Include="..\..\README.md">
+	  <Pack>True</Pack>
+	  <PackagePath>\</PackagePath>
+	</None>
   </ItemGroup>
 </Project>