Upgrade to v2.2.0.

Orden4 · Sep 24, 2023 · fc017a9 · fc017a9
1 parent b543bc0
commit fc017a9
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 54 deletions.
diff --git a/NuGet/WCSharp.Buffs/WCSharp.Buffs.csproj b/NuGet/WCSharp.Buffs/WCSharp.Buffs.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Buffs.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.2</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,9 +20,9 @@ This package allows for the creation and management of powerful buffs and auras
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Dummies" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.2" />
+    <PackageReference Include="WCSharp.Dummies" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.ConstantGenerator/WCSharp.ConstantGenerator.csproj b/NuGet/WCSharp.ConstantGenerator/WCSharp.ConstantGenerator.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.ConstantGenerator.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>

diff --git a/NuGet/WCSharp.DateTime/WCSharp.DateTime.csproj b/NuGet/WCSharp.DateTime/WCSharp.DateTime.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.DateTime.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.3</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,9 +20,9 @@ This package defines custom DateTime and TimeSpan classes that can be used in Wa
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Sync" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Sync" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Dummies/WCSharp.Dummies.csproj b/NuGet/WCSharp.Dummies/WCSharp.Dummies.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Dummies.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,7 +20,7 @@ This package allows for the fetching and recycling of dummy units in Warcraft II
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Effects/WCSharp.Effects.csproj b/NuGet/WCSharp.Effects/WCSharp.Effects.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Effects.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,7 +20,7 @@ This package simply allows you to destroy Warcraft III special effects on a dela
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Events/WCSharp.Events.csproj b/NuGet/WCSharp.Events/WCSharp.Events.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Events.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.1</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,7 +20,7 @@ The Events package provides various systems for organising events with a focus o
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Json/WCSharp.Json.csproj b/NuGet/WCSharp.Json/WCSharp.Json.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Json.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.1</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -18,7 +18,7 @@ This package allows for the (de)serialization of class structures to JSON within
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Knockbacks/WCSharp.Knockbacks.csproj b/NuGet/WCSharp.Knockbacks/WCSharp.Knockbacks.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Knockbacks.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,9 +20,9 @@ This package allows for the creation and management of knockback effects in Warc
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Effects" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Effects" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Lightnings/WCSharp.Lightnings.csproj b/NuGet/WCSharp.Lightnings/WCSharp.Lightnings.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Lightnings.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,7 +20,7 @@ This package allows for the creation and management of lightning effects in Warc
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Missiles/WCSharp.Missiles.csproj b/NuGet/WCSharp.Missiles/WCSharp.Missiles.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Missiles.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.2</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,8 +20,8 @@ This package allows for the creation and management of missiles in Warcraft III.
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Events" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.2" />
+    <PackageReference Include="WCSharp.Events" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.SaveLoad/WCSharp.SaveLoad.csproj b/NuGet/WCSharp.SaveLoad/WCSharp.SaveLoad.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.SaveLoad.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.8</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,9 +20,9 @@ The SaveLoad package provides a system that can be used to save and load data be
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Json" Version="2.1.1" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Sync" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Json" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Sync" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.Shared/WCSharp.Shared.csproj b/NuGet/WCSharp.Shared/WCSharp.Shared.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Shared.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.3</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>

diff --git a/NuGet/WCSharp.Sync/WCSharp.Sync.csproj b/NuGet/WCSharp.Sync/WCSharp.Sync.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.Sync.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.2</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>
@@ -20,8 +20,8 @@ This package allows for the syncing of class structures between players in Warcr
   <ItemGroup>
     <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
     <PackageReference Include="War3Api.Common" Version="1.33.0" />
-    <PackageReference Include="WCSharp.Json" Version="2.1.0" />
-    <PackageReference Include="WCSharp.Shared" Version="2.1.0" />
+    <PackageReference Include="WCSharp.Json" Version="2.2.0" />
+    <PackageReference Include="WCSharp.Shared" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGet/WCSharp.W3MMD/WCSharp.W3MMD.csproj b/NuGet/WCSharp.W3MMD/WCSharp.W3MMD.csproj
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <DocumentationFile>WCSharp.W3MMD.xml</DocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.1.2</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/Orden4/WCSharp</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Orden4/WCSharp</RepositoryUrl>

diff --git a/NuGetPusher/Program.cs b/NuGetPusher/Program.cs
@@ -17,10 +17,10 @@ internal class Program
 			"W3MMD",
 			"Json",
 			"Events",
+			"Dummies",
 			"Effects",
 			"Sync",
 			"SaveLoad",
-			"Dummies",
 			"Buffs",
 			"DateTime",
 			"Knockbacks",

diff --git a/WCSharpTemplate/Launcher/Launcher.csproj b/WCSharpTemplate/Launcher/Launcher.csproj
@@ -11,10 +11,10 @@
 	  <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
 	  <PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
 	  <PackageReference Include="War3Api.Common" Version="1.33.0" />
-	  <PackageReference Include="War3Net.Build" Version="5.6.0.1" />
+	  <PackageReference Include="War3Net.Build" Version="5.7.1" />
 	  <PackageReference Include="War3Net.CSharpLua" Version="1.8.0-preview.1" />
 	  <PackageReference Include="War3Net.CSharpLua.CoreSystem" Version="1.7.18" />
-	  <PackageReference Include="WCSharp.ConstantGenerator" Version="2.1.0" />
+	  <PackageReference Include="WCSharp.ConstantGenerator" Version="2.2.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/WCSharpTemplate/Launcher/Program.cs b/WCSharpTemplate/Launcher/Program.cs
@@ -17,7 +17,6 @@ internal static class Program
 	{
 		// Input
 		private const string SOURCE_CODE_PROJECT_FOLDER_PATH = @"..\..\..\..\Source";
-		private const string ASSETS_FOLDER_PATH = @"..\..\..\..\Assets\";
 		private const string BASE_MAP_PATH = @"..\..\..\..\source.w3x";
 
 		// Output
@@ -70,14 +69,12 @@ private static void MakeDecision()
 		public static void Build(bool launch)
 		{
 			// Ensure these folders exist
-			Directory.CreateDirectory(ASSETS_FOLDER_PATH);
 			Directory.CreateDirectory(OUTPUT_FOLDER_PATH);
 
 			// Load existing map data
 			var map = Map.Open(BASE_MAP_PATH);
 			var builder = new MapBuilder(map);
 			builder.AddFiles(BASE_MAP_PATH, "*", SearchOption.AllDirectories);
-			builder.AddFiles(ASSETS_FOLDER_PATH, "*", SearchOption.AllDirectories);
 
 			// Set debug options if necessary, configure compiler
 			var csc = DEBUG ? "-debug -define:DEBUG" : null;
@@ -88,7 +85,7 @@ public static void Build(bool launch)
 				IsModule = false,
 				IsInlineSimpleProperty = false,
 				IsPreventDebugObject = true,
-				IsCommentsDisabled = !DEBUG
+				IsCommentsDisabled = !DEBUG,
 			};
 
 			// Collect required paths and compile

diff --git a/WCSharpTemplate/Source/Source.csproj b/WCSharpTemplate/Source/Source.csproj
@@ -9,17 +9,17 @@
 	<ItemGroup>
 		<PackageReference Include="War3Api.Blizzard" Version="1.33.0" />
 		<PackageReference Include="War3Api.Common" Version="1.33.0" />
-		<PackageReference Include="WCSharp.Buffs" Version="2.1.0" />
-		<PackageReference Include="WCSharp.DateTime" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Dummies" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Effects" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Events" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Json" Version="2.1.1" />
-		<PackageReference Include="WCSharp.Knockbacks" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Lightnings" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Missiles" Version="2.1.0" />
-		<PackageReference Include="WCSharp.SaveLoad" Version="2.1.1" />
-		<PackageReference Include="WCSharp.Shared" Version="2.1.0" />
-		<PackageReference Include="WCSharp.Sync" Version="2.1.0" />
+		<PackageReference Include="WCSharp.Buffs" Version="2.2.0" />
+		<PackageReference Include="WCSharp.DateTime" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Dummies" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Effects" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Events" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Json" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Knockbacks" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Lightnings" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Missiles" Version="2.2.0" />
+		<PackageReference Include="WCSharp.SaveLoad" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Shared" Version="2.2.0" />
+		<PackageReference Include="WCSharp.Sync" Version="2.2.0" />
 	</ItemGroup>
 </Project>