Resolves an issue when checking content NUS.

Fixes an error that prevented packing NUS content without a loaded base.
phacoxcll · Apr 24, 2019 · 65e9076 · 65e9076
1 parent a84a397
commit 65e9076
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 30 deletions.
diff --git a/64Inject.sln b/64Inject.sln
@@ -19,6 +19,9 @@ Global
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Revision release|Any CPU = Revision release|Any CPU
+		Revision release|x64 = Revision release|x64
+		Revision release|x86 = Revision release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Beta|Any CPU.ActiveCfg = Beta|Any CPU
@@ -45,6 +48,12 @@ Global
 		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x64.Build.0 = Release|x64
 		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x86.ActiveCfg = Release|x86
 		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x86.Build.0 = Release|x86
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|Any CPU.ActiveCfg = Revision release|Any CPU
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|Any CPU.Build.0 = Revision release|Any CPU
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x64.ActiveCfg = Revision release|x64
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x64.Build.0 = Revision release|x64
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x86.ActiveCfg = Revision release|x86
+		{7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x86.Build.0 = Revision release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/64Inject/64Inject.csproj b/64Inject/64Inject.csproj
@@ -14,10 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
@@ -150,6 +148,36 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Revision release|AnyCPU'">
+    <OutputPath>bin\Revision release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Revision release|x86'">
+    <OutputPath>bin\x86\Revision release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Revision release|x64'">
+    <OutputPath>bin\x64\Revision release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/64Inject/64InjectGUI.Designer.cs b/64Inject/64InjectGUI.Designer.cs
diff --git a/64Inject/64Injector.cs b/64Inject/64Injector.cs
@@ -10,7 +10,7 @@ namespace _64Inject
 {
     public class _64Injector
     {
-        public const string Release = "1.1 debug"; //CllVersionReplace "major.minor stability"
+        public const string Release = "1.1.1 debug"; //CllVersionReplace "major.minor.revision stability"
 
         public Cll.Log Log;
 

diff --git a/64Inject/NusContent.cs b/64Inject/NusContent.cs
@@ -60,7 +60,7 @@ public static string Check(string path)
                 File.Exists(path + "\\meta\\meta.xml"))
             {
                 XmlDocument xmlMeta = new XmlDocument();
-                xmlMeta.Load("base\\meta\\meta.xml");
+                xmlMeta.Load(path + "\\meta\\meta.xml");
                 XmlNode meta_title_id = xmlMeta.SelectSingleNode("menu/title_id");
                 return meta_title_id.InnerText;
             }

diff --git a/64Inject/Program.cs b/64Inject/Program.cs
@@ -3,7 +3,7 @@
 
 namespace _64Inject
 {
-    static class Program
+    class Program
     {
         [System.Runtime.InteropServices.DllImport("kernel32.dll")]
         static extern bool FreeConsole();

diff --git a/64Inject/Properties/AssemblyInfo.cs b/64Inject/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o establecer como predeterminados los números de versión de compilación y de revisión 
 // mediante el asterisco ('*'), como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.8.0")]
+[assembly: AssemblyVersion("1.1.14.1")]
 [assembly: AssemblyFileVersion("1.0.0.0")]