Tidied up the code.

FirehawkV21 · Dec 24, 2021 · 125f2d0 · 125f2d0
1 parent f324d1e
commit 125f2d0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/RMMVCookTool.CLI/RMMVCookTool.CLI.csproj b/RMMVCookTool.CLI/RMMVCookTool.CLI.csproj
@@ -3,13 +3,13 @@
 	<PropertyGroup>
 	<OutputType>Exe</OutputType>
 	<TargetFramework>net6.0</TargetFramework>
-	<AssemblyVersion>2.2.0.21279</AssemblyVersion>
-	<FileVersion>2.2.0.21279</FileVersion>
+	<AssemblyVersion>2.2.0.21358</AssemblyVersion>
+	<FileVersion>2.2.0.21358</FileVersion>
 	<ApplicationIcon>Brick-02-WF.ico</ApplicationIcon>
 	<StartupObject>RMMVCookTool.CLI.Program</StartupObject>
 	<AssemblyTitle>RPG Maker MV Cook Tool (CLI Version)</AssemblyTitle>
 	<PackageId>StudioACE.RMMVCookTool.CLI</PackageId>
-	<Version>2.2.0-20211006</Version>
+	<Version>2.2.0-20211224</Version>
 	<Authors>AceOfAces</Authors>
 	<Company>Studio ACE</Company>
 	<Product>RPG Maker MV Cook Tool</Product>
@@ -66,8 +66,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.1" />
-	<PackageReference Include="Microsoft.NETCore.Targets" Version="6.0.0-preview.4.21253.7" />
 	<PackageReference Include="Spectre.Console" Version="0.43.0" />
 	</ItemGroup>
 

diff --git a/RMMVCookTool.Core/Compiler/CompilerProject.cs b/RMMVCookTool.Core/Compiler/CompilerProject.cs
@@ -1,5 +1,4 @@
 using System.IO.Compression;
-using System.Runtime.CompilerServices;
 using RMMVCookTool.Core.Utilities;
 
 namespace RMMVCookTool.Core.Compiler
@@ -53,7 +52,6 @@ public CompilerProject(string project, string fileExtension, bool removeAfterCom
         /// Starts the NW.js compiler.
         /// </summary>
         /// <param name="index">The index in the list.</param>
-        [MethodImplAttribute(MethodImplOptions.AggressiveOptimization)]
         public void CompileFile(int index)
         {
             CompilerUtilities.RecordToLog("Setting up the compiler...", 3);

diff --git a/RMMVCookTool.Core/RMMVCookTool.Core.csproj b/RMMVCookTool.Core/RMMVCookTool.Core.csproj
@@ -2,9 +2,9 @@
 
 	<PropertyGroup>
 	<TargetFrameworks>net6.0</TargetFrameworks>
-	<AssemblyVersion>2.0.4.21279</AssemblyVersion>
-	<FileVersion>2.0.4.21279</FileVersion>
-	<Version>2.0.4-20211006</Version>
+	<AssemblyVersion>2.0.5.21358</AssemblyVersion>
+	<FileVersion>2.0.5.21279</FileVersion>
+	<Version>2.0.5-20211224</Version>
 	<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
 	<AssemblyTitle>RPG Maker MV Cook Tool Core</AssemblyTitle>
 	<Authors>AceOfAces</Authors>

diff --git a/RMMVCookTool.Core/Utilities/CompilerUtilities.cs b/RMMVCookTool.Core/Utilities/CompilerUtilities.cs
@@ -1,6 +1,5 @@
 using Serilog;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace RMMVCookTool.Core.Utilities

diff --git a/RMMVCookTool.GUI/RMMVCookTool.GUI.csproj b/RMMVCookTool.GUI/RMMVCookTool.GUI.csproj
@@ -4,8 +4,8 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>3.2.0.21279</AssemblyVersion>
-    <FileVersion>3.2.0.21279</FileVersion>
+    <AssemblyVersion>3.2.1.21358</AssemblyVersion>
+    <FileVersion>3.2.1.21358</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>Brick-02-WF.ico</ApplicationIcon>
     <NeutralLanguage>en</NeutralLanguage>
@@ -14,7 +14,7 @@
     <Authors>AceOfAces</Authors>
     <Company>Studio ACE</Company>
     <Product>RPG Maker MV Cook Tool</Product>
-    <Version>3.2.0-20211006</Version>
+    <Version>3.2.1-20211224</Version>
     <PublishReadyToRun>true</PublishReadyToRun>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,7 +8,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-2022'
 
 variables:
   solution: '**/*.sln'
@@ -19,20 +19,20 @@ steps:
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk'
-    version: '5.0.300'
+    version: '6.0.100'
 
 - task: DotNetCoreCLI@2
   inputs:
     command: 'build'
     projects: 'RMMVCookTool.CLI\RMMVCookTool.CLI.csproj'
-    arguments: '-f net5.0'
+    arguments: '-f net6.0'
 
 
 - task: DotNetCoreCLI@2
   inputs:
     command: 'build'
     projects: 'RMMVCookTool.GUI\RMMVCookTool.GUI.csproj'
-    arguments: '-f net5.0-windows'
+    arguments: '-f net6.0-windows'
 
 - task: VSTest@2
   inputs: