diff --git a/.gitignore b/.gitignore index afc5e34..ecff89b 100644 --- a/.gitignore +++ b/.gitignore @@ -103,11 +103,5 @@ dist # TernJS port file .tern-port -# Custom directories and files -bin/ -packages/ -config.xml -staticip.xml - # ChatGPT API Key data/chatgpt-apikey.txt diff --git a/WelsonJS.Toolkit/WelsonJS.Toolkit.sln b/WelsonJS.Toolkit/WelsonJS.Toolkit.sln index 43a3035..1a3ba0e 100644 --- a/WelsonJS.Toolkit/WelsonJS.Toolkit.sln +++ b/WelsonJS.Toolkit/WelsonJS.Toolkit.sln @@ -1,23 +1,29 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31515.178 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34322.80 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WelsonJS.Toolkit", "WelsonJS.Toolkit\WelsonJS.Toolkit.csproj", "{D6007282-B4F7-4694-AC67-BB838D91B77A}" 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|Any CPU {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|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj b/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj index b871e23..38ad783 100644 --- a/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj +++ b/WelsonJS.Toolkit/WelsonJS.Toolkit/WelsonJS.Toolkit.csproj @@ -41,6 +41,24 @@ welsonjs.snk + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + diff --git a/bin/x64/WelsonJS.Toolkit.dll b/bin/x64/WelsonJS.Toolkit.dll new file mode 100644 index 0000000..e6c846a Binary files /dev/null and b/bin/x64/WelsonJS.Toolkit.dll differ diff --git a/WelsonJS.Toolkit.pdb b/bin/x64/WelsonJS.Toolkit.pdb similarity index 100% rename from WelsonJS.Toolkit.pdb rename to bin/x64/WelsonJS.Toolkit.pdb diff --git a/WelsonJS.Toolkit.dll b/bin/x86/WelsonJS.Toolkit.dll similarity index 100% rename from WelsonJS.Toolkit.dll rename to bin/x86/WelsonJS.Toolkit.dll diff --git a/bin/x86/WelsonJS.Toolkit.pdb b/bin/x86/WelsonJS.Toolkit.pdb new file mode 100644 index 0000000..5b1b931 Binary files /dev/null and b/bin/x86/WelsonJS.Toolkit.pdb differ diff --git a/preconfigure.bat b/preconfigure.bat index 465a360..d95a563 100644 --- a/preconfigure.bat +++ b/preconfigure.bat @@ -15,8 +15,8 @@ regsvr32 /s "%PROGRAMFILES(X86)%\AutoIt3\AutoItX\AutoItX3.dll" regsvr32 /s "%PROGRAMFILES(X86)%\AutoIt3\AutoItX\AutoItX3_x64.dll" echo [*] Registering WelsonJS native component... -%WINDIR%\Microsoft.NET\Framework\v2.0.50727\RegAsm.exe /codebase WelsonJS.Toolkit.dll -%WINDIR%\Microsoft.NET\Framework64\v2.0.50727\RegAsm.exe /codebase WelsonJS.Toolkit.dll +%WINDIR%\Microsoft.NET\Framework\v2.0.50727\RegAsm.exe /codebase bin\x86\WelsonJS.Toolkit.dll +%WINDIR%\Microsoft.NET\Framework64\v2.0.50727\RegAsm.exe /codebase bin\x64\WelsonJS.Toolkit.dll echo Done