From f9e3024f3180a7a2f279e0c816d5798b20f843ae Mon Sep 17 00:00:00 2001
From: Drake53 <49623303+Drake53@users.noreply.github.com>
Date: Sat, 22 Nov 2025 10:35:00 +0100
Subject: [PATCH 1/2] Bugfix merge unit and item object skin data.

---
 src/War3App.MapAdapter/Object/BuffObjectDataExtensions.cs | 2 +-
 src/War3App.MapAdapter/Object/ItemObjectDataExtensions.cs | 2 +-
 src/War3App.MapAdapter/Object/UnitObjectDataExtensions.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/War3App.MapAdapter/Object/BuffObjectDataExtensions.cs b/src/War3App.MapAdapter/Object/BuffObjectDataExtensions.cs
index 2efa351..2acdca5 100644
--- a/src/War3App.MapAdapter/Object/BuffObjectDataExtensions.cs
+++ b/src/War3App.MapAdapter/Object/BuffObjectDataExtensions.cs
@@ -32,7 +32,7 @@ public static bool Adapt(this BuffObjectData buffObjectData, AdaptFileContext co
                     if (isSkinFile)
                     {
                         var nonSkinFileName = context.FileName.Replace($"Skin{BuffObjectData.FileExtension}", BuffObjectData.FileExtension);
-                        
+
                         if (context.Archive.FileExists(nonSkinFileName))
                         {
                             context.ReportDiagnostic(DiagnosticRule.ObjectData.RemovedSkinData, nonSkinFileName);
diff --git a/src/War3App.MapAdapter/Object/ItemObjectDataExtensions.cs b/src/War3App.MapAdapter/Object/ItemObjectDataExtensions.cs
index 7435af5..5c14070 100644
--- a/src/War3App.MapAdapter/Object/ItemObjectDataExtensions.cs
+++ b/src/War3App.MapAdapter/Object/ItemObjectDataExtensions.cs
@@ -69,7 +69,7 @@ public static bool Adapt(this ItemObjectData itemObjectData, AdaptFileContext co
                 }
             }
 
-            if (!isSkinFileSupported && context.FileName is not null && context.FileName.EndsWith($"Skin{ItemObjectData.FileExtension}"))
+            if (!isSkinFileSupported && context.FileName is not null && !context.FileName.EndsWith($"Skin{ItemObjectData.FileExtension}"))
             {
                 var expectedSkinFileName = context.FileName.Replace(ItemObjectData.FileExtension, $"Skin{ItemObjectData.FileExtension}");
 
diff --git a/src/War3App.MapAdapter/Object/UnitObjectDataExtensions.cs b/src/War3App.MapAdapter/Object/UnitObjectDataExtensions.cs
index ef859b1..e095611 100644
--- a/src/War3App.MapAdapter/Object/UnitObjectDataExtensions.cs
+++ b/src/War3App.MapAdapter/Object/UnitObjectDataExtensions.cs
@@ -69,7 +69,7 @@ public static bool Adapt(this UnitObjectData unitObjectData, AdaptFileContext co
                 }
             }
 
-            if (!isSkinFileSupported && context.FileName is not null && context.FileName.EndsWith($"Skin{UnitObjectData.FileExtension}"))
+            if (!isSkinFileSupported && context.FileName is not null && !context.FileName.EndsWith($"Skin{UnitObjectData.FileExtension}"))
             {
                 var expectedSkinFileName = context.FileName.Replace(UnitObjectData.FileExtension, $"Skin{UnitObjectData.FileExtension}");
 

From f468deb0ae0af22733b263f155d9824259dea245 Mon Sep 17 00:00:00 2001
From: Drake53 <49623303+Drake53@users.noreply.github.com>
Date: Sat, 22 Nov 2025 10:38:07 +0100
Subject: [PATCH 2/2] Update to v1.6.2

---
 .../War3App.MapAdapter.EtoForms.Gtk.csproj                      | 2 +-
 .../War3App.MapAdapter.EtoForms.csproj                          | 2 +-
 .../War3App.MapAdapter.WinForms.csproj                          | 2 +-
 src/War3App.MapAdapter/War3App.MapAdapter.csproj                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj b/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
index 54a54b6..c4a8148 100644
--- a/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
+++ b/src/War3App.MapAdapter.EtoForms.Gtk/War3App.MapAdapter.EtoForms.Gtk.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <OutputType>WinExe</OutputType>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj b/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
index 42cf5cd..be68357 100644
--- a/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
+++ b/src/War3App.MapAdapter.EtoForms/War3App.MapAdapter.EtoForms.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj b/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
index e2be506..988f70f 100644
--- a/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
+++ b/src/War3App.MapAdapter.WinForms/War3App.MapAdapter.WinForms.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>WinExe</OutputType>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/War3App.MapAdapter/War3App.MapAdapter.csproj b/src/War3App.MapAdapter/War3App.MapAdapter.csproj
index 7171abd..716335d 100644
--- a/src/War3App.MapAdapter/War3App.MapAdapter.csproj
+++ b/src/War3App.MapAdapter/War3App.MapAdapter.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
   </PropertyGroup>
 
   <ItemGroup>