Improve Nuget spec (#73)

Denis-Averin · web-flow · commit d0b6df97745a · 2023-08-28T15:29:03.000+07:00
* Bump version to 23.7.1

* Change &lt;Copyright&gt;

* Add link to repository

* Change &lt;Authors&gt;

* Deterministic package build

Set ContinuousIntegrationBuild with env

* Use --warnaserror

* Separate pack workflow

* Do not use PDB

* Update packages
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+/.vs/
+**/bin/
+**/obj/
+*.nupkg
diff --git a/.github/workflows/check-badges.yml b/.github/workflows/check-badges.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  build-and-test:
+  check-badges:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Setup latest version of dotnet
       uses: actions/setup-dotnet@v3
     - name: Build with latest version
-      run: dotnet build
+      run: dotnet build --warnaserror
 
     - name: Setup ${{ matrix.dotnet-version }} version of dotnet
       uses: actions/setup-dotnet@v3
@@ -40,13 +40,3 @@ jobs:
       run: dotnet test --no-build --verbosity normal --framework ${{ matrix.framework }}
       env:
         TEST_CONFIGURATION_JWT_TOKEN: ${{ secrets.TEST_CONFIGURATION_ACCESS_TOKEN }}
-
-  docker-build:
-    needs: [ build-and-test ]
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile
diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -0,0 +1,16 @@
+name: Pack into Nuget package
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  pack-nuget:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -2,9 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS sdk
 
 FROM sdk AS pack
 WORKDIR /src
+RUN dotnet tool install -g sourcelink
 COPY . .
-RUN dotnet build --configuration=Release
-RUN dotnet pack --no-build --configuration=Release --output=/package Aspose.BarCode.Cloud.Sdk.sln
+RUN ./scripts/pack-nuget.bash /package
+RUN ./scripts/test-nuget.bash "$(ls /package/Aspose.BarCode-Cloud.*.nupkg)"
 
 FROM sdk AS final
 WORKDIR /packed
diff --git a/Makefile b/Makefile
@@ -33,8 +33,13 @@ update:
 
 .PHONY: lint
 lint:
-	dotnet build
+	dotnet build --warnaserror
 
 .PHONY: clean
 clean:
 	find . -depth -type d \( -name obj -o -name bin -o -name TestResults \) -exec rm -rf "{}" \; || true
+
+.PHONY: nuget
+nuget:
+	./scripts/pack-nuget.bash
+	./scripts/test-nuget.bash
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Nuget](https://img.shields.io/nuget/v/Aspose.BarCode-Cloud)](https://www.nuget.org/packages/Aspose.BarCode-Cloud/)
 
 - API version: 3.0
-- SDK version: 23.7.0
+- SDK version: 23.7.1
 
 ## Demo applications
 
diff --git a/Tests/Aspose.BarCode.Cloud.Sdk.Tests.csproj b/Tests/Aspose.BarCode.Cloud.Sdk.Tests.csproj
@@ -12,10 +12,10 @@
     <None Remove="TestResults\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
diff --git a/examples/GenerateQR/GenerateQR.csproj b/examples/GenerateQR/GenerateQR.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspose.BarCode-Cloud" Version="23.7.0" />
+    <PackageReference Include="Aspose.BarCode-Cloud" Version="23.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/ReadQR/ReadQR.csproj b/examples/ReadQR/ReadQR.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspose.BarCode-Cloud" Version="23.7.0" />
+    <PackageReference Include="Aspose.BarCode-Cloud" Version="23.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/scripts/pack-nuget.bash b/scripts/pack-nuget.bash
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ $# -ge 1 ]; then
+    output_dir="$1"
+else
+    output_dir=".."
+fi
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+SRC_DIR="$( cd "${SCRIPT_DIR}/../src" &> /dev/null && pwd )"
+
+pushd "${SRC_DIR}"
+export RELEASE_BUILD=true
+dotnet build --warnaserror --configuration=Release Aspose.BarCode.Cloud.Sdk.csproj
+dotnet pack --configuration=Release Aspose.BarCode.Cloud.Sdk.csproj --output="${output_dir}"
+popd
diff --git a/scripts/test-nuget.bash b/scripts/test-nuget.bash
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ $# -ge 1 ]; then
+    nupkg="$1"
+else
+    nupkg="$(ls ./Aspose.BarCode-Cloud.*.nupkg)"
+fi
+
+echo "Checking sourcelink tool installed..."
+dotnet tool install -g sourcelink || true
+
+echo "Testing ${nupkg}..."
+~/.dotnet/tools/sourcelink test "${nupkg}" || (
+    echo
+    echo "Check commit exists on remote!"
+    echo
+    exit 1
+)
diff --git a/src/Aspose.BarCode.Cloud.Sdk.csproj b/src/Aspose.BarCode.Cloud.Sdk.csproj
@@ -10,33 +10,42 @@
 Aspose.Barcode for Cloud allows you to control all aspects of the image and barcode when generating barcode images. Specify image width, height, border style, output image format and more. You can also set barcode attributes like font style, font color, background color, barcode type and the barcode text location.</Description>
     <PackageProjectUrl>https://products.aspose.cloud/barcode/net/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <DebugType>embedded</DebugType>
     <PackageTags>Barcode Scan Recognize Generate QR DataMatrix AustraliaPost VIN MSI Aztec ISBN OPC Postnet Aspose Aspose.BarCode Aspose.BarCode-Cloud EAN13 ISSN PZN SingaporePost UPCA UPCE Code11 Code128 Code32 DotCode EAN14 EAN8 GS1DataMatrix</PackageTags>
-    <Copyright>© Aspose 2001-2023. All Rights Reserved.</Copyright>
-    <RepositoryType>Git</RepositoryType>
+    <Copyright>© Aspose Pty Ltd 2001-2023. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://products.aspose.cloud/barcode/net/</PackageProjectUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Aspose.BarCode-Cloud</PackageId>
     <Product>Aspose.BarCode Cloud SDK for .NET</Product>
     <PackageIcon>PackageIcon.png</PackageIcon>
-    <Version>23.7.0</Version>
-    <Authors>asposecloud</Authors>
-    <AssemblyVersion>23.7.0.0</AssemblyVersion>
+    <Version>23.7.1</Version>
+    <Authors>Aspose</Authors>
+    <AssemblyVersion>23.7.1.0</AssemblyVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/releases/tag/v23.7.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/releases/tag/v23.7.1</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+  </PropertyGroup>
+
+  <!-- Set RELEASE_BUILD=true to make ContinuousIntegrationBuild -->
+  <PropertyGroup Condition="'$(RELEASE_BUILD)' == 'true'">
+    <!-- These should not be enabled during local dev or the debugger won’t be able to find the local source files. -->
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="LICENSE.txt" Pack="true" PackagePath="" />
     <None Include="PackageIcon.png" Pack="true" PackagePath="" />
-    <None Include="..\README.md" Pack="true" PackagePath=""/>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +/.vs/
 +**/bin/
 +**/obj/
 +*.nupkg