Merge pull request #102 from AmpScm/fix/nuspec-issues

Update Nuspec and nuget build arguments
AmpScm · Sep 17, 2024 · 715b806 · 715b806
2 parents 6c5bd34 + a9f8689
commit 715b806
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/MSBuild.yml b/.github/workflows/MSBuild.yml
@@ -357,4 +357,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: nupkg-files
-          path: nuspec/bin/*.nupkg
+          path: |
+            nuspec/bin/*.nupkg
+            nuspec/bin/*.snupkg
diff --git a/nuspec/SharpSvn.AnnotateAssembly.nuspec b/nuspec/SharpSvn.AnnotateAssembly.nuspec
@@ -23,6 +23,7 @@
     <releaseNotes>
     </releaseNotes>
     <copyright>Copyright (c) 2006-2018</copyright>
+	<readme>docs\README.md</readme>
     <tags>msbuild assemblyinfo versioninfo</tags>
     <developmentDependency>true</developmentDependency>
   </metadata>
@@ -31,5 +32,8 @@
     <file target="build" src="..\src\SharpSvn.AnnotateAssembly-nuspec\SharpSvn.AnnotateAssembly.targets" />
     <file target="build" src="..\src\SharpSvn.MSBuild\bin\Release\SharpSvn.MSBuild.dll" />
     <file target="build\projects" src="..\src\SharpSvn.AnnotateAssembly-nuspec\projects\AnnotateAssembly.*.targets" />
+
+	<!-- Add Readme file -->
+	<file src="../README.md" target="docs\"/>
   </files>
 </package>
diff --git a/nuspec/SharpSvn.ShortMSDeployWebContentPath.nuspec b/nuspec/SharpSvn.ShortMSDeployWebContentPath.nuspec
@@ -18,10 +18,14 @@
     </description>
     <releaseNotes></releaseNotes>
     <copyright>Copyright (c) 2018-2021</copyright>
+	<readme>docs\README.md</readme>
     <tags>msbuild aspnet webproject</tags>
   </metadata>
   <files>
     <file target="build" src="..\src\SharpSvn.ShortMSDeployWebContentPath-nuspec\SharpSvn.ShortMSDeployWebContentPath.props" />
     <file target="build" src="..\src\SharpSvn.ShortMSDeployWebContentPath-nuspec\SharpSvn.ShortMSDeployWebContentPath.targets" />
+
+	<!-- Add Readme file -->
+	<file src="../README.md" target="docs\"/>
   </files>
 </package>
diff --git a/nuspec/SharpSvn.UI.nuspec b/nuspec/SharpSvn.UI.nuspec
@@ -8,6 +8,7 @@
     <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/ampscm/SharpSvn</projectUrl>
     <description>Default UI implementation for users of SharpSvn</description>
+	<readme>docs\README.md</readme>
     <repository type="git" url="https://github.com/ampscm/SharpSvn.git" branch="main" commit="" />
     <tags>Subversion Svn SharpSvn</tags>
     <dependencies>
@@ -26,5 +27,8 @@
     <file target="lib/netcoreapp" src="..\src\SharpSvn.UI\bin\releasecore\SharpSvn.UI.dll" />
     <file target="lib/netcoreapp" src="..\src\SharpSvn.UI\bin\releasecore\SharpSvn.UI.xml" />
     <file target="lib/netcoreapp" src="..\src\SharpSvn.UI\bin\releasecore\SharpSvn.UI.pdb" />
+
+	<!-- Add Readme file -->
+	<file src="../README.md" target="docs\"/>
   </files>
 </package>
diff --git a/nuspec/SharpSvn.nuspec b/nuspec/SharpSvn.nuspec
@@ -7,10 +7,10 @@
     <owners>SharpSvn</owners>
     <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/AmpScm/SharpSvn/</projectUrl>
-    <iconUrl>https://subversion.apache.org/favicon.ico</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>SharpSvn is a binding of the Subversion Client API for .NET based on the actual Subversion code, which is included in this library.</description>
     <copyright>(C) Copyright 2006-2022 The SharpSvn Project</copyright>
+	<readme>docs\README.md</readme>
     <tags>Subversion Svn SharpSvn</tags>
     <repository type="git" url="https://github.com/AmpScm/SharpSvn.git" branch="main" commit="" />
     <dependencies>
@@ -87,5 +87,8 @@
     <!-- Automatically copy .svnExe/.svnDll files with SharpSvn during build -->
     <file target="build" src="builds/SharpSvn.targets" />
     <file target="buildTransitive" src="builds/SharpSvn.targets" />
+
+	<!-- Add Readme file -->
+	<file src="../README.md" target="docs\"/>
   </files>
 </package>
diff --git a/nuspec/build.cmd b/nuspec/build.cmd
@@ -45,8 +45,8 @@ IF NOT "%GIT_SHA%" == "" CALL :xmlpoke SharpSvn.AnnotateAssembly.nuspec "//nu:re
 CALL :xmlpoke SharpSvn.ShortMSDeployWebContentPath.nuspec //nu:metadata/nu:version %SHARPSVN_VER% || EXIT /B 1
 IF NOT "%GIT_SHA%" == "" CALL :xmlpoke SharpSvn.ShortMSDeployWebContentPath.nuspec "//nu:repository[@type='git']/@commit" %GIT_SHA% || EXIT /B 1
 
-nuget pack -Symbols SharpSvn.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
-nuget pack -Symbols SharpSvn.UI.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
+nuget pack -Symbols -SymbolPackageFormat snupkg SharpSvn.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
+nuget pack -Symbols -SymbolPackageFormat snupkg SharpSvn.UI.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
 nuget pack SharpSvn.AnnotateAssembly.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
 nuget pack SharpSvn.ShortMSDeployWebContentPath.nuspec -version %SHARPSVN_VER% -OutputDirectory bin || exit /B 1
 echo "--done--"

diff --git a/scripts/gh-version-setup.cmd b/scripts/gh-version-setup.cmd
@@ -40,6 +40,10 @@ echo Prepare building SharpProj %SVN_VER_MAJOR%.%SHARPSVN_MINOR%.%1
 ) >> %CACHE%
 
 (
+  REM For Versions
+  echo /p:FileVersion=%SHARPSVN_MAJOR%.%SHARPSVN_MINOR%.%SHARPSVN_PATCH%
+  echo /p:AssemblyVersion=%SHARPSVN_MAJOR%.%SHARPSVN_MINOR%.%SHARPSVN_PATCH%
+
   REM For SDK Projects
   echo /p:Version=%SHARPSVN_MAJOR%.%SHARPSVN_MINOR%.%SHARPSVN_PATCH%
   echo /p:Company="SharpSvn Project, powered by AmpScm, QQn & GitHub"