Merge branch 'main' into build/improve-versioning

WojciechMazur · Oct 23, 2024 · 80832a0 · 80832a0
2 parents 9306e66 + d6367fd
commit 80832a0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/project/Build.scala b/project/Build.scala
@@ -2275,7 +2275,9 @@ object Build {
     )
     .settings(
       Windows / name := "scala",
-      Windows / version := developedVersion,
+      // Windows/version is used to create ProductInfo - it requires a version without any -RC suffixes
+      // If not explicitly overriden it would try to use `dottyVersion` assigned to `dist-win-x86_64/version`
+      Windows / version    := developedVersion,
       Windows / mappings   := (Universal / mappings).value,
       Windows / packageBin := (Windows / packageBin).dependsOn(republish).value,
       Windows / wixFiles   := (Windows / wixFiles).dependsOn(republish).value,