diff --git a/Common/README.md b/Common/README.md index 59a6f0e..25f6cb4 100644 --- a/Common/README.md +++ b/Common/README.md @@ -90,7 +90,7 @@ having to manually add pages and images, I forgot to insert references for the cut. So I dusted off ImageMagick, but instead of driving it in javascript -I decided to take advantage of the brand new Net 6.0 +I decided to take advantage of the brand new Net 6.0 (and from december 2023 also Net 8.0) and the Magick.NET library which already incorporates ImageMagick and therefore allows you to create ready-to-use executables. @@ -230,15 +230,15 @@ to help in writing and testing custom scripts ### .net -The library is compiled for .net 6.0 +The library is compiled for .net 6.0 and .net 8.0 ### Packages The following packages are required: -- Microsoft.CodeAnalysis.Common Version >= 4.5.0 -- Magick.NET-Q16-AnyCPU Version >= 12.3.0 -- Magick.NET.SystemWindowsMedia >= 6.1.3 -- Microsoft.CodeAnalysis.CSharp Version >= 4.5.0 +- Microsoft.CodeAnalysis.Common Version >= 4.8.0 +- Magick.NET-Q16-AnyCPU Version >= 13.5.0 +- Magick.NET.SystemWindowsMedia >= 7.2.1 +- Microsoft.CodeAnalysis.CSharp Version >= 4.8.0 - Mono.Options Version >= 6.12.0.148 - Casasoft.Xaml.Controls >= 22.4.13 diff --git a/Contemporary_CDV.sln b/Contemporary_CDV.sln index 4f9d2ff..10f76c9 100644 --- a/Contemporary_CDV.sln +++ b/Contemporary_CDV.sln @@ -55,7 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{BE17CE64-B docs\Scatola.1 = docs\Scatola.1 EndProjectSection EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsInstaller", "WindowsInstaller\WindowsInstaller.wixproj", "{D1091528-75F5-4E8A-A081-80409EB09361}" +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WindowsInstaller", "WindowsInstaller\WindowsInstaller.wixproj", "{D1091528-75F5-4E8A-A081-80409EB09361}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{9D6B5EF5-AD86-4F3A-BC04-F5AED9993F3B}" ProjectSection(SolutionItems) = preProject diff --git a/build_tools/publish.cmd b/build_tools/publish.cmd index ace3243..d629e92 100644 --- a/build_tools/publish.cmd +++ b/build_tools/publish.cmd @@ -33,7 +33,13 @@ set winrar="C:\Program Files\WinRAR\winrar.exe" set version=23.12.17 @del /S /Q %build% +@del /S /Q %bin%\build\ @del /Q %bin%%pkgname%*.* + +set prj=Common +@dotnet build -c Release -o %build% -p:version="%version%" %repo%%prj%\%prj%.csproj +@copy %bin%build\*.nupkg %bin% + set prj=Cartella @dotnet publish -c Release -o %build% -p:version="%version%" --no-self-contained %repo%%prj%\%prj%.csproj set prj=CreditCard @@ -88,4 +94,7 @@ wix build ^ %repo%WindowsInstaller\product.wxs dotnet pack %repo%Templates\ScriptTestTemplatesPack.csproj -p:PackageVersion=%version% -dotnet pack %repo%ProjectTemplate\CCDV_ProjectTemplate.csproj -p:PackageVersion=%version% \ No newline at end of file +dotnet pack %repo%ProjectTemplate\CCDV_ProjectTemplate.csproj -p:PackageVersion=%version% + +rem only for debug +:end \ No newline at end of file