[8.1.6.0] use x64

VOICeVIO · Jul 3, 2021 · ea0601f · ea0601f
1 parent 4068ec4
commit ea0601f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 6 deletions.
diff --git a/CeVIO AI/CeVIO AI.csproj b/CeVIO AI/CeVIO AI.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{6DED98AF-CFC8-4FFB-A9A5-E769311A5889}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CeVIO.Editor.Properties</RootNamespace>
+    <RootNamespace>CeVIO.Editor</RootNamespace>
     <AssemblyName>CeVIO AI</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -53,7 +54,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />
+    <EmbeddedResource Include="Properties\Resources.ja-JP.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/CeVIO AI/Properties/Resources.Designer.cs b/CeVIO AI/Properties/Resources.Designer.cs
diff --git a/CeVIO.KnobControl/CeVIO.KnobControl.csproj b/CeVIO.KnobControl/CeVIO.KnobControl.csproj
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/CeVIO.SFE.Signer/CeVIO.SFE.Signer.csproj b/CeVIO.SFE.Signer/CeVIO.SFE.Signer.csproj
@@ -31,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/CeVIO.SFE.Signer/Program.cs b/CeVIO.SFE.Signer/Program.cs
@@ -5,6 +5,8 @@
 using System.IO;
 using CeVIO.SFE.Signer.Properties;
 using dnlib.DotNet;
+using dnlib.DotNet.Writer;
+using dnlib.PE;
 
 namespace CeVIO.SFE.Signer
 {
@@ -66,20 +68,23 @@ static void Main(string[] args)
         static void Sign(string path, string key, Version v, string newPath = null)
         {
             var dll = AssemblyDef.Load(path);
+            var option = new ModuleWriterOptions(dll.ManifestModule) {PEHeadersOptions = {Machine = Machine.AMD64}};
+
             dll.HasPublicKey = true;
             dll.PublicKey = new PublicKey(key);
+
             if (v != null)
             {
                 dll.Version = v;
             }
 
             if (newPath == null)
             {
-                dll.Write(path);
+                dll.Write(path, option);
             }
             else
             {
-                dll.Write(Path.Combine(newPath, $"{dll.Name}.dll"));
+                dll.Write(Path.Combine(newPath, $"{dll.Name}.dll"), option);
             }
 
         }

diff --git a/CeVIO.SevenSegmentControl/CeVIO.SevenSegmentControl.csproj b/CeVIO.SevenSegmentControl/CeVIO.SevenSegmentControl.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/CeVIO.SongEditorControl/CeVIO.SongEditorControl.csproj b/CeVIO.SongEditorControl/CeVIO.SongEditorControl.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/CeVIO.TalkAnalyzeControl/CeVIO.TalkAnalyzeControl.csproj b/CeVIO.TalkAnalyzeControl/CeVIO.TalkAnalyzeControl.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/CeVIO.ToolBarControl/CeVIO.ToolBarControl.csproj b/CeVIO.ToolBarControl/CeVIO.ToolBarControl.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>