Update build configurations

2024-11-26 07:21:43 +00:00 · 2024-08-15 17:47:29 +09:00 · 2024-08-15 17:47:29 +09:00 · 1863a76a4c
commit 1863a76a4c
parent 8865723dd4
7 changed files with 20 additions and 28 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -14,20 +14,16 @@ before_build:

 build_script:
  - msbuild "C:\projects\welsonjs\WelsonJS.Toolkit\WelsonJS.Toolkit.sln" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=%CONFIGURATION% /p:Platform="x86"
-  - msbuild "C:\projects\welsonjs\WelsonJS.Toolkit\WelsonJS.Toolkit.sln" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=%CONFIGURATION% /p:Platform="x64"

 after_build:
-  - cmd: 7z a WelsonJS.Toolkit.x86.zip WelsonJS.Toolkit\WelsonJS.Toolkit\bin\x86\%CONFIGURATION%\*
-  - cmd: 7z a WelsonJS.Toolkit.x64.zip WelsonJS.Toolkit\WelsonJS.Toolkit\bin\x64\%CONFIGURATION%\*
-  - cmd: 7z a WelsonJS.Service.x86.zip WelsonJS.Toolkit\WelsonJS.Service\bin\x86\%CONFIGURATION%\*
+  - cmd: 7z a WelsonJS.Toolkit.zip WelsonJS.Toolkit\WelsonJS.Toolkit\bin\x86\%CONFIGURATION%\*
+  - cmd: 7z a WelsonJS.Service.zip WelsonJS.Toolkit\WelsonJS.Service\bin\x86\%CONFIGURATION%\*

 artifacts:
-  - path: WelsonJS.Toolkit.x86.zip
-    name: WelsonJS.Toolkit.x86
-  - path: WelsonJS.Toolkit.x64.zip
-    name: WelsonJS.Toolkit.x64
-  - path: WelsonJS.Service.x86.zip
-    name: WelsonJS.Service.x86
+  - path: WelsonJS.Toolkit.zip
+    name: WelsonJS.Toolkit
+  - path: WelsonJS.Service.zip
+    name: WelsonJS.Service

 notifications:
  - provider: Email
--- a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
+++ b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs
@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 using MSScriptControl;
 using System.IO;
 using System.Collections.Generic;
-using WelsonJS.Service.TinyINIController;
+using WelsonJS.TinyINIController;

 namespace WelsonJS.Service
 {
--- a/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj
+++ b/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj
@ -144,7 +144,6 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="ScreenMatching.cs" />
    <Compile Include="ScreenMatchResult.cs" />
-    <Compile Include="TinyINIController\IniFile.cs" />
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="MSScriptControl">
@ -167,6 +166,12 @@
    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\WelsonJS.Toolkit\WelsonJS.Toolkit.csproj">
+      <Project>{d6007282-b4f7-4694-ac67-bb838d91b77a}</Project>
+      <Name>WelsonJS.Toolkit</Name>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
--- a/WelsonJS.Toolkit/WelsonJS.Toolkit.sln
+++ b/WelsonJS.Toolkit/WelsonJS.Toolkit.sln
@ -10,35 +10,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|x64.ActiveCfg = Debug|x64
-		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|x64.Build.0 = Debug|x64
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|x86.ActiveCfg = Debug|x86
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Debug|x86.Build.0 = Debug|x86
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|x64.ActiveCfg = Release|x64
-		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|x64.Build.0 = Release|x64
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|x86.ActiveCfg = Release|x86
 		{D6007282-B4F7-4694-AC67-BB838D91B77A}.Release|x86.Build.0 = Release|x86
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|x64.ActiveCfg = Debug|x64
-		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|x64.Build.0 = Debug|x64
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|x86.ActiveCfg = Debug|x86
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Debug|x86.Build.0 = Debug|x86
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|x64.ActiveCfg = Release|x86
-		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|x64.Build.0 = Release|x86
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|x86.ActiveCfg = Release|x86
 		{09F295EE-5EDB-4327-ABBE-DDCCDF5EDD9E}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
--- a/WelsonJS.Toolkit/WelsonJS.Toolkit/TinyINIController/IniFile.cs
+++ b/WelsonJS.Toolkit/WelsonJS.Toolkit/TinyINIController/IniFile.cs
@ -5,14 +5,14 @@ using System.Runtime.InteropServices;
 using System.Text;

 // https://github.com/niklyadov/tiny-ini-file-class
-namespace WelsonJS.Service.TinyINIController
+namespace WelsonJS.TinyINIController
 {
-    class IniFile
+    public class IniFile
    {
-        [DllImport("kernel32", CharSet = CharSet.Unicode)]
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
        static extern long WritePrivateProfileString(string section, string key, string value, string FilePath);

-        [DllImport("kernel32", CharSet = CharSet.Unicode)]
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
        static extern int GetPrivateProfileString(string section, string key, string Default, StringBuilder RetVal, int Size, string FilePath);

        private readonly FileInfo FileInfo;
--- a/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj
+++ b/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj
@ -90,6 +90,7 @@
    <Compile Include="ProcessUtils.cs" />
    <Compile Include="Prompt.cs" />
    <Compile Include="Serialization\KVSerializer.cs" />
+    <Compile Include="TinyINIController\IniFile.cs" />
    <Compile Include="Toolkit.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Window.cs" />
--- a/bootstrap.bat
+++ b/bootstrap.bat
@ -17,8 +17,8 @@ rem echo [*] Registering AutoItX component...
 rem regsvr32 /s "%PROGRAMFILES(X86)%\AutoIt3\AutoItX\AutoItX3.dll"
 rem regsvr32 /s "%PROGRAMFILES(X86)%\AutoIt3\AutoItX\AutoItX3_x64.dll"

-REM echo [*] Registering WelsonJS Toolkit component...
-REM %WINDIR%\Microsoft.NET\Framework\v2.0.50727\RegAsm.exe /codebase bin\x86\WelsonJS.Toolkit.dll
+echo [*] Registering WelsonJS.Toolkit component...
+%WINDIR%\Microsoft.NET\Framework\v2.0.50727\RegAsm.exe /codebase bin\x86\WelsonJS.Toolkit.dll
 REM %WINDIR%\Microsoft.NET\Framework64\v2.0.50727\RegAsm.exe /codebase bin\x64\WelsonJS.Toolkit.dll

 echo [*] Done.