diff --git a/Cs_HMI/.vscode/settings.json b/Cs_HMI/.vscode/settings.json new file mode 100644 index 0000000..359cd76 --- /dev/null +++ b/Cs_HMI/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dotnet.preferCSharpExtension": true +} \ No newline at end of file diff --git a/Cs_HMI/Project/AGV4 - Backup.csproj b/Cs_HMI/Project/AGV4 - Backup.csproj deleted file mode 100644 index 0f2b449..0000000 --- a/Cs_HMI/Project/AGV4 - Backup.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - x64 - D:\Amkor\AGV4 - - - - - - - - - - - - - - - - - - - - True - True - Settings.settings - - - - - - PreserveNewest - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - lib\Winsock_Orcas.dll - - - lib\EEProtocol.dll - - - lib\arUtil.dll - - - - - - - - - \ No newline at end of file diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index 88024fb..0f2b449 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -8,17 +8,6 @@ enable x64 D:\Amkor\AGV4 - Amkor - AGV4 - Amkor AGV4 - 25.04.24.1500 - 25.04.24.1500 - - - 1701;1702;8622 - - - 1701;1702;8622 @@ -55,14 +44,18 @@ - - ..\DLL\Winsock Orcas.dll + + lib\Winsock_Orcas.dll + + + lib\EEProtocol.dll + + + lib\arUtil.dll - - diff --git a/Cs_HMI/Project/AGV4.csproj.bak b/Cs_HMI/Project/AGV4.csproj.bak deleted file mode 100644 index 083f694..0000000 --- a/Cs_HMI/Project/AGV4.csproj.bak +++ /dev/null @@ -1,67 +0,0 @@ - - - - WinExe - net8.0-windows - Project - Amkor - true - enable - enable - icons8-split-64.ico - x64 - False - False - False - IDE1006 - - - - ..\..\..\..\..\Amkor\AGV4\ - DEBUG;TRACE - x64 - - - - ..\..\..\ManualMapEditor\ - TRACE - x64 - - - - ..\..\..\..\Amkor\OTP2DReading\ - DEBUG;TRACE - - - - bin\ - TRACE - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - \ No newline at end of file diff --git a/Cs_HMI/Project/Project.sln b/Cs_HMI/Project/Project.sln new file mode 100644 index 0000000..68cd577 --- /dev/null +++ b/Cs_HMI/Project/Project.sln @@ -0,0 +1,36 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.2.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4 - Backup", "AGV4 - Backup.csproj", "{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4", "AGV4.csproj", "{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4.net8", "AGV4.net8.csproj", "{FD3A068E-BC6F-1C35-9239-C435C411B769}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.Build.0 = Release|Any CPU + {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.Build.0 = Release|Any CPU + {FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {31175F6D-6217-4F37-BF84-FA16ACCCBAC0} + EndGlobalSection +EndGlobal diff --git a/Cs_HMI/SubProject/Patch/SWPatch.csproj b/Cs_HMI/SubProject/Patch/SWPatch.csproj index 0a88855..1b52077 100644 --- a/Cs_HMI/SubProject/Patch/SWPatch.csproj +++ b/Cs_HMI/SubProject/Patch/SWPatch.csproj @@ -14,7 +14,7 @@ - x86 + AnyCPU true full false