Update War3Net to v6.0.0

.github/scripts/build-and-pack-nuget.sh

@@ -31,8 +31,8 @@ can_build_project() {
   # Get the dependencies - dotnet list outputs them with paths like ..\ProjectName\ProjectName.csproj
   # We need to extract just the project name from the filename
   local deps=$(dotnet list "$project" reference 2>/dev/null | grep '\.csproj$' | while read -r line; do
-    # Remove everything up to the last backslash, then remove .csproj extension
-    echo "$line" | sed 's/.*\\//' | sed 's/\.csproj$//'
+    # Remove everything up to the last slash (forward or back), then remove .csproj extension
+    echo "$line" | sed 's/.*[\\\/]//' | sed 's/\.csproj$//'
   done | tr '\n' ' ')
 
   for dep in $deps; do
@@ -72,7 +72,7 @@ while [ -n "$REMAINING_PROJECTS" ] && [ $ITERATION -lt $MAX_ITERATIONS ]; do
     echo "$STILL_REMAINING" | tr ';' '\n' | while read -r p; do
       if [ -n "$p" ]; then
         echo "  - $(basename $(dirname "$p"))"
-        echo "    Dependencies: $(dotnet list "$p" reference 2>/dev/null | grep -E "^\s+.*\.csproj" | sed 's/.*\///' | sed 's/\.csproj.*//' | tr '\n' ' ')"
+        echo "    Dependencies: $(dotnet list "$p" reference 2>/dev/null | grep -E "^\s+.*\.csproj" | sed 's/.*[\\\/]//' | sed 's/\.csproj.*//' | tr '\n' ' ')"
       fi
     done
     echo "Already built: $BUILT_PROJECTS"
@@ -159,10 +159,10 @@ while [ -n "$REMAINING_PROJECTS" ] && [ $ITERATION -lt $MAX_ITERATIONS ]; do
       dotnet restore "$project" -p:Configuration=Release --verbosity minimal --force --no-cache
 
       # Build the project
-      dotnet build "$project" --configuration Release --no-restore --verbosity minimal
+      dotnet build "$project" -p:PACK=true -p:WarningLevel=0 -p:RunAnalyzers=false -p:SuppressTfmSupportBuildWarnings=true --configuration Release --no-restore --verbosity minimal
 
       # Pack directly to artifacts with project name folder structure for proper NuGet feed
-      dotnet pack "$project" --configuration Release --no-build --output "./artifacts/${PROJECT_NAME}" -p:PACK=true --verbosity minimal
+      dotnet pack "$project" -p:PACK=true --configuration Release --no-build --output "./artifacts/${PROJECT_NAME}" --verbosity minimal
     fi
 
     BUILT_PROJECTS="${BUILT_PROJECTS}${PROJECT_NAME};"

Directory.Build.props

@@ -6,7 +6,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(PACK)'=='true'">
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
   </ItemGroup>
   <ItemGroup Condition="'$(PACK)'!='true'">
     <Content Include="$(MSBuildThisFileDirectory)LICENSE" Visible="false">

Directory.Packages.props

@@ -4,12 +4,14 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
+		<PackageVersion Include="DiffPlex" Version="1.7.0" />
 		<PackageVersion Include="DotNetZip" Version="1.16.0" />
 		<PackageVersion Include="JpegLibrary" Version="0.3.30" />
 		<PackageVersion Include="MessagePack" Version="2.2.60" />
 		<PackageVersion Include="MessagePackAnalyzer" Version="2.2.60" />
 		<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 		<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
 		<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
 		<PackageVersion Include="NAudio" Version="1.10.0" />
@@ -30,21 +32,21 @@
 		<PackageVersion Include="Veldrid.StartupUtilities" Version="4.8.0" />
 		<PackageVersion Include="Veldrid.Utilities" Version="4.8.0" />
 		<PackageVersion Include="War3Api.Object" Version="1.31.1-rc.11" />
-		<PackageVersion Include="War3Net.Build" Version="5.8.2" />
-		<PackageVersion Include="War3Net.Build.Core" Version="5.8.2" />
-		<PackageVersion Include="War3Net.CodeAnalysis" Version="5.8.0" />
-		<PackageVersion Include="War3Net.CodeAnalysis.Decompilers" Version="5.8.2" />
-		<PackageVersion Include="War3Net.CodeAnalysis.Jass" Version="5.8.0" />
-		<PackageVersion Include="War3Net.CodeAnalysis.Transpilers" Version="5.8.0" />
+		<PackageVersion Include="War3Net.Build" Version="6.0.0" />
+		<PackageVersion Include="War3Net.Build.Core" Version="6.0.0" />
+		<PackageVersion Include="War3Net.CodeAnalysis" Version="6.0.0" />
+		<PackageVersion Include="War3Net.CodeAnalysis.Decompilers" Version="6.0.0" />
+		<PackageVersion Include="War3Net.CodeAnalysis.Jass" Version="6.0.0" />
+		<PackageVersion Include="War3Net.CodeAnalysis.Transpilers" Version="6.0.0" />
 		<PackageVersion Include="War3Net.CodeAnalysis.VJass" Version="0.1.0" />
-		<PackageVersion Include="War3Net.Common" Version="5.8.0" />
-		<PackageVersion Include="War3Net.CSharpLua" Version="2.0.1" />
-		<PackageVersion Include="War3Net.CSharpLua.CoreSystem" Version="2.0.1" />
-		<PackageVersion Include="War3Net.Drawing.Blp" Version="5.9.0" />
+		<PackageVersion Include="War3Net.Common" Version="6.0.0" />
+		<PackageVersion Include="War3Net.CSharpLua" Version="2.0.2" />
+		<PackageVersion Include="War3Net.CSharpLua.CoreSystem" Version="2.0.2" />
+		<PackageVersion Include="War3Net.Drawing.Blp" Version="6.0.0" />
 		<PackageVersion Include="War3Net.IO.Casc" Version="0.1.0" />
-		<PackageVersion Include="War3Net.IO.Compression" Version="5.8.0" />
-		<PackageVersion Include="War3Net.IO.Mpq" Version="5.8.1" />
-		<PackageVersion Include="War3Net.IO.Slk" Version="5.8.1" />
+		<PackageVersion Include="War3Net.IO.Compression" Version="6.0.0" />
+		<PackageVersion Include="War3Net.IO.Mpq" Version="6.0.0" />
+		<PackageVersion Include="War3Net.IO.Slk" Version="6.0.0" />
 		<PackageVersion Include="War3Net.Modeling" Version="0.1.0" />
 	</ItemGroup>
 </Project>

NuGet.config

@@ -16,9 +16,9 @@
       <package pattern="DotNetZip" />
       <package pattern="ICSharpCode.Decompiler" />
       <package pattern="JpegLibrary" />
-      <package pattern="Pidgin" />
       <package pattern="NETStandard.Library" />
       <package pattern="Newtonsoft.Json" />
+      <package pattern="Pidgin" />
       <package pattern="runtime.native.System" />
       <package pattern="StyleCop.Analyzers" />
       <package pattern="StyleCop.Analyzers.Unstable" />

docs/changelogs/War3Net.Build.Core.changelog.md

@@ -1,5 +1,13 @@
 # War3Net.Build.Core Changelog
 
+## v6.0.0
+### Breaking changes
+- The EscapedStringProvider class has been moved to War3Net.CodeAnalysis.Jass.
+### Changes
+- Added W3MathF class.
+### Bugfixes
+- Fixed exception when deserializing MapInfo.EditorVersion as JSON string.
+
 ## v1.5.3
 ### Changes
 - Add UseNewFormat property to MapCustomTextTriggers.

docs/changelogs/War3Net.Build.changelog.md

@@ -1,5 +1,11 @@
 # War3Net.Build Changelog
 
+## v6.0.0
+### Breaking changes
+- MapScriptBuilder methods have been renamed and now write to an IndentedTextWriter instead of returning a syntax class.
+- TriggerRenderer and TriggerRendererContext now expect an IndentedTextWriter instead of JassRenderer/TextWriter.
+- MapScriptBuilder's C# api methods have been removed, you can now use the GenerateGlobals methods and manually transpile to C#.
+
 ## v1.5.0
 ### Changes
 - Support parsing and serializing .wtg files.

docs/changelogs/War3Net.CodeAnalysis.Jass.changelog.md

@@ -0,0 +1,5 @@
+# War3Net.CodeAnalysis.Jass Changelog
+
+## v6.0.0
+### Breaking changes
+- Breaking changes have been documented in [the migration guide](../guides/jass-migration-guide-v5-to-v6.md)