v5.0.2

- (Fix) Remove a condition that prevents the new Anycubic file format from being used - (Upgrade) AvaloniaUI from 11.1.3 to 11.2.2
sn4k3 · Dec 19, 2024 · 4b0c674 · 4b0c674
1 parent 026ac1d
commit 4b0c674
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 16 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 19/12/2024 - v5.0.2
+
+- (Fix) Remove a condition that prevents the new Anycubic file format from being used
+- (Upgrade) AvaloniaUI from 11.1.3 to 11.2.2
+
 ## 19/12/2024 - v5.0.1
 
 - (Fix) Windows MSI: System.IO.Compression.Native is missing when upgrading from 4.4.3 (#957)

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -37,8 +37,8 @@
         <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
         <!-- Versions -->
-        <UVtoolsVersion>5.0.1</UVtoolsVersion>
-        <AvaloniaVersion>11.2.2</AvaloniaVersion>
+        <UVtoolsVersion>5.0.2</UVtoolsVersion>
+        <AvaloniaVersion>11.2.3</AvaloniaVersion>
 
         <!-- MvvmToolkit -->
         <MvvmToolkitEnableINotifyPropertyChangingSupport>false</MvvmToolkitEnableINotifyPropertyChangingSupport>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,3 @@
-- (Fix) Index out of range when saving some file formats (#957)
-- (Change) Exposure time finder: Allow using 0 for the normal step in the multiple exposure generator (#958)
+- (Fix) Remove a condition that prevents the new Anycubic file format from being used
+- (Upgrade) AvaloniaUI from 11.1.3 to 11.2.2
 
diff --git a/UVtools.Core/FileFormats/FileFormat.cs b/UVtools.Core/FileFormats/FileFormat.cs
@@ -485,10 +485,8 @@ public PrintParameterModifier Clone()
         new CTBEncryptedFile(), // encrypted ctb
         new AnycubicPhotonSFile(), // photons
         new PHZFile(), // phz
-        new AnycubicFile(), // PSW
-#if DEBUG
+        new AnycubicFile(), // PSW, PW0
         new AnycubicZipFile(), // PWSZ
-#endif
         new CWSFile(), // CWS
         new AnetFile(), // Anet N4, N7
         new LGSFile(), // LGS, LGS30

diff --git a/UVtools.sln b/UVtools.sln
@@ -52,6 +52,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{2BE3
 		Scripts\install-uvtools.sh = Scripts\install-uvtools.sh
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{D606E7A2-219E-4FD1-B269-9F28F0BFC206}"
+	ProjectSection(SolutionItems) = preProject
+		.github\FUNDING.yml = .github\FUNDING.yml
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{21A89D47-FDB1-450D-8703-200EA399B16C}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\workflows\devskim.yml = .github\workflows\devskim.yml
+		.github\workflows\greetings.yml = .github\workflows\greetings.yml
+		.github\workflows\package-publish.yml = .github\workflows\package-publish.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{2ADDF363-B0A0-40E7-B210-A50F1B04D669}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\bug_report.md.old = .github\ISSUE_TEMPLATE\bug_report.md.old
+		.github\ISSUE_TEMPLATE\bug_report_form.yml = .github\ISSUE_TEMPLATE\bug_report_form.yml
+		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
+		.github\ISSUE_TEMPLATE\feature_request.md.old = .github\ISSUE_TEMPLATE\feature_request.md.old
+		.github\ISSUE_TEMPLATE\feature_request_form.yml = .github\ISSUE_TEMPLATE\feature_request_form.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -136,6 +159,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{B5BD32D7-3B3E-4254-877C-3353664BC044} = {E91CEB7A-5EDC-4928-8133-D8F354EF3CE8}
 		{2BE3B5D1-3E9C-451E-A795-40298AFFDE6B} = {E91CEB7A-5EDC-4928-8133-D8F354EF3CE8}
+		{D606E7A2-219E-4FD1-B269-9F28F0BFC206} = {E91CEB7A-5EDC-4928-8133-D8F354EF3CE8}
+		{21A89D47-FDB1-450D-8703-200EA399B16C} = {D606E7A2-219E-4FD1-B269-9F28F0BFC206}
+		{2ADDF363-B0A0-40E7-B210-A50F1B04D669} = {D606E7A2-219E-4FD1-B269-9F28F0BFC206}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E9BEE8D8-E894-49A9-9435-491BF1E26E46}

diff --git a/build/createRelease.ps1 b/build/createRelease.ps1
@@ -81,7 +81,7 @@ $rootPath           = Split-Path $PSScriptRoot -Parent
 $buildPath          = "$rootPath\build"
 $platformsPath      = "$buildPath\platforms"
 $artifactsPath      = "$rootPath\artifacts"
-$publishPath        = "$rootPath\$publishFolder"
+$publishPath        = "$artifactsPath\$publishFolder"
 #$releasePath        = "$rootPath\artifacts\bin\$project\$buildWith\net$netVersion"
 #$objPath            = "$rootPath\artifacts\obj\$project\$buildWith\net$netVersion"
 $changelogFile      = "$rootPath\CHANGELOG.md"
@@ -253,8 +253,8 @@ foreach ($obj in $runtimes.GetEnumerator()) {
         #New-Item "$publishCurrentPath\runtime_package.dat" -ItemType File -Value $runtime
 
         # Cleanup
-        Remove-Item "$rootPath\UVtools.Cmd\bin\$buildWith\net$netVersion\$runtime" -Recurse -ErrorAction Ignore
-        Remove-Item "$rootPath\UVtools.Cmd\obj\$buildWith\net$netVersion\$runtime" -Recurse -ErrorAction Ignore
+        #Remove-Item "$rootPath\UVtools.Cmd\bin\$buildWith\net$netVersion\$runtime" -Recurse -ErrorAction Ignore
+        #Remove-Item "$rootPath\UVtools.Cmd\obj\$buildWith\net$netVersion\$runtime" -Recurse -ErrorAction Ignore
 
         #Remove-Item "$releasePath\$runtime" -Recurse -ErrorAction Ignore
         #Remove-Item "$objPath\$runtime" -Recurse -ErrorAction Ignore
@@ -370,6 +370,7 @@ if($null -ne $enableMSI -and $enableMSI)
     }
 }
 
+# Cleanup
 Get-ChildItem -Force -Path "$artifactsPath" -Recurse -Directory | 
   Where-Object { $_.name -match "^$($buildWith.ToLower())_.*-.*" } | 
   Remove-Item -Force -Recurse #-Whatif

diff --git a/build/createRelease.sh b/build/createRelease.sh
@@ -24,7 +24,7 @@ version="$(perl -nle'print $& while m{<UVtoolsVersion>\K([0-9]+[.][0-9]+[.][0-9]
 platformsDir="$buildDir/platforms"
 runtimePlatformDir="$platformsDir/$runtime"
 publishName="UVtools_${runtime}_v$version"
-publishDir="$rootDir/publish"
+publishDir="$artifactsDir/publish"
 publishRuntimeDir="$publishDir/$publishName"
 buildProject="UVtools.UI"
 cmdProject="UVtools.Cmd"

diff --git a/build/package-manager/nugetPublish.ps1 b/build/package-manager/nugetPublish.ps1
@@ -5,6 +5,7 @@ Set-Location $PSScriptRoot\..\..
 # Variables
 $package = "UVtools.Core"
 $nugetApiKeyFile = 'build/secret/nuget_api.key'
+$githubApiKeyFile = 'build/secret/github_packages.key'
 $outputFolder = "artifacts/package/release"
 
 $projectXml = [Xml] (Get-Content "Directory.Build.props")
@@ -24,7 +25,9 @@ if (Test-Path -Path $nugetApiKeyFile -PathType Leaf)
 
     if (Test-Path -Path $nupkg -PathType Leaf){
         $nugetApiKeyFile = (Get-Content $nugetApiKeyFile)
-        dotnet nuget push $nupkg --api-key $nugetApiKeyFile --source https://api.nuget.org/v3/index.json
+		$githubApiKeyFile = (Get-Content $githubApiKeyFile)
+        dotnet nuget push $nupkg --api-key $nugetApiKeyFile --source https://api.nuget.org/v3/index.json --skip-duplicate
+		dotnet nuget push $nupkg --api-key $githubApiKeyFile --source https://nuget.pkg.github.com/sn4k3/index.json --skip-duplicate
         #Remove-Item $nupkg
     }else {
         Write-Error "Nuget package publish failed!"

diff --git a/build/package-manager/nugetPublish_UVtools.AvaloniaControls.ps1 b/build/package-manager/nugetPublish_UVtools.AvaloniaControls.ps1
@@ -27,7 +27,7 @@ if (Test-Path -Path $nugetApiKeyFile -PathType Leaf)
         $nugetApiKeyFile = (Get-Content $nugetApiKeyFile)
         $githubApiKeyFile = (Get-Content $githubApiKeyFile)
         dotnet nuget push $nupkg --api-key $nugetApiKeyFile --source https://api.nuget.org/v3/index.json --skip-duplicate
-        #dotnet nuget push $nupkg --api-key $githubApiKeyFile --source https://nuget.pkg.github.com/sn4k3/UVtools/index.json --skip-duplicate
+        dotnet nuget push $nupkg --api-key $githubApiKeyFile --source https://nuget.pkg.github.com/sn4k3/index.json --skip-duplicate
         #Remove-Item $nupkg
     }else {
         Write-Error "Nuget package publish failed!"