diff --git a/.vs/Single2013/FileContentIndex/925082e6-c0d0-410a-9d14-05fc019f75fd.vsidx b/.vs/Single2013/FileContentIndex/925082e6-c0d0-410a-9d14-05fc019f75fd.vsidx new file mode 100644 index 0000000..f0371df Binary files /dev/null and b/.vs/Single2013/FileContentIndex/925082e6-c0d0-410a-9d14-05fc019f75fd.vsidx differ diff --git a/.vs/Single2013/FileContentIndex/9bab2b5b-bfb7-4a63-8911-818c25d6792d.vsidx b/.vs/Single2013/FileContentIndex/9bab2b5b-bfb7-4a63-8911-818c25d6792d.vsidx new file mode 100644 index 0000000..c409ad6 Binary files /dev/null and b/.vs/Single2013/FileContentIndex/9bab2b5b-bfb7-4a63-8911-818c25d6792d.vsidx differ diff --git a/.vs/Single2013/FileContentIndex/read.lock b/.vs/Single2013/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/.vs/Single2013/v17/.suo b/.vs/Single2013/v17/.suo new file mode 100644 index 0000000..4f00aa1 Binary files /dev/null and b/.vs/Single2013/v17/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..115d2d4 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\Single2013.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/single/v17/.wsuo b/.vs/single/v17/.wsuo new file mode 100644 index 0000000..0d7fa7f Binary files /dev/null and b/.vs/single/v17/.wsuo differ diff --git a/SMBdevices/SMBdevices.csproj b/SMBdevices/SMBdevices.csproj index feba515..1de352e 100644 --- a/SMBdevices/SMBdevices.csproj +++ b/SMBdevices/SMBdevices.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties SMBdevices SMBdevices - v4.5 + v4.8 512 @@ -38,6 +38,9 @@ ..\Single2013\bin\Release\ATMCD32CS.dll + + ..\..\..\..\..\..\Program Files\Andor SDK3\C#\ATSDK3CS.dll + diff --git a/SMBdevices/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/SMBdevices/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 0000000..15efebf --- /dev/null +++ b/SMBdevices/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..f237540 Binary files /dev/null and b/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..634d714 Binary files /dev/null and b/SMBdevices/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SMBdevices/obj/Debug/SMBdevices.csproj.AssemblyReference.cache b/SMBdevices/obj/Debug/SMBdevices.csproj.AssemblyReference.cache new file mode 100644 index 0000000..28d9c64 Binary files /dev/null and b/SMBdevices/obj/Debug/SMBdevices.csproj.AssemblyReference.cache differ diff --git a/SMBdevices/smbCCD.cs b/SMBdevices/smbCCD.cs index 18cc50e..631f8df 100644 --- a/SMBdevices/smbCCD.cs +++ b/SMBdevices/smbCCD.cs @@ -1,6 +1,9 @@ -using System; +using ATMCD32CS; +using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.InteropServices; +using System.Runtime.InteropServices.ComTypes; using System.Text; using System.Threading; using System.Windows.Forms; @@ -12,23 +15,31 @@ public class smbCCD : IDisposable public enum CCDType { ANDOR_CCD, + ANDOR_SCMOS, PROEM_CCD } - + public CCDType m_CCDType; public int m_CCDTemp; + public double m_SCMOSTemp; public double m_exptime = 0.1; public int m_maxretrynum = 3; + //추가함 + int CCDHandle = 0; + + public int m_clipsize; public int m_imagewidth; public int m_imageheight; public int m_binsize = 1; + private bool m_isscmos = false; private int m_rangeheight = 1024; private int m_rangewidth = 1024; - private uint m_Bufsize; + // private uint m_Bufsize; + private int m_Bufsize; private bool m_disposed = false; @@ -38,8 +49,26 @@ public static int getCameraNumber(CCDType ccd) switch (ccd) { case CCDType.ANDOR_CCD: - ATMCD32CS.AndorSDK tmp = new ATMCD32CS.AndorSDK(); - tmp.GetAvailableCameras(ref cameranum); + ATMCD32CS.AndorSDK tmp1 = new ATMCD32CS.AndorSDK(); + tmp1.GetAvailableCameras(ref cameranum); + break; + case CCDType.ANDOR_SCMOS: + long tmpnum; + ATSDK3CS.DeviceWrapper tmp2 = new ATSDK3CS.DeviceWrapper(); + tmp2.AT_GetInt(ATSDK3CS.DeviceWrapper.AT_HANDLE_SYSTEM, "Device Count", out tmpnum); + string sensortype; + int tmphandle; + for (int i = 0; i < tmpnum; i++) + { + tmp2.AT_Open(i, out tmphandle); + tmp2.AT_GetString(tmphandle, "GetSensorType", out sensortype); + tmp2.AT_Close(tmphandle); + if (sensortype != "SCMOS") + { + continue; + } + cameranum++; + } break; case CCDType.PROEM_CCD: @@ -49,25 +78,77 @@ public static int getCameraNumber(CCDType ccd) return cameranum; } + private ATMCD32CS.AndorSDK AndorCCD; + private ATSDK3CS.DeviceWrapper AndorSCMOS; public smbCCD(CCDType ccd, int CCDNum) + { m_CCDType = ccd; - int CCDHandle = 0; + string sensortype; + switch (m_CCDType) { + case CCDType.ANDOR_SCMOS: + + m_rangeheight = 2048; + m_rangewidth = 2048; + + AndorSCMOS = new ATSDK3CS.DeviceWrapper(); + AndorSCMOS.AT_Open(CCDNum, out CCDHandle); + AndorSCMOS.AT_GetString(CCDHandle, "SensorType", out sensortype); + AndorSCMOS = new ATSDK3CS.DeviceWrapper(); + AndorSCMOS.AT_InitialiseLibrary(); + AndorSCMOS.AT_Open(CCDNum, out CCDHandle); + AndorSCMOS.AT_GetFloat(CCDHandle, "SensorTemperature", out m_SCMOSTemp); // OK... + SetBinSize(1); + AndorSCMOS.AT_SetFloat(CCDHandle, "ExposureTime", 0.1f); // OK.. + //AndorSCMOS.AT_SetInt(CCDHandle, " AcquisitionMode", 5); 이런거 없음.. + AndorSCMOS.AT_SetEnumIndex(CCDHandle, "TriggerMode", 0); // 0 : Internal,1 : Software, 2 : External, 3 : External Start, 4 : External Exposure + + /* 공사 중 */ + + //long tmpnum; + //AndorSCMOS = new ATSDK3CS.DeviceWrapper(); + //AndorSCMOS.AT_GetInt(ATSDK3CS.DeviceWrapper.AT_HANDLE_SYSTEM, "Device Count", out tmpnum); + + //m_rangeheight = 2048; + //m_rangewidth = 2048; + + //int tmphandle; + //int cur_index = 0; + //for (int i = 0; i < tmpnum; i++) + //{ + // AndorSCMOS.AT_Open(i, out tmphandle); + // AndorSCMOS.AT_GetString(tmphandle, "GetSensorType", out sensortype); + // if (cur_index == CCDNum) + // { + // break; + // } + // AndorSCMOS.AT_Close(tmphandle); + // if (sensortype != "SCMOS") + // { + // continue; + // } + // cur_index++; + //} + + break; + case CCDType.ANDOR_CCD: float vsspeed = 0; int vsspeed_index = 0; + AndorCCD = new ATMCD32CS.AndorSDK(); AndorCCD.GetCameraHandle(CCDNum, ref CCDHandle); AndorCCD.SetCurrentCamera(CCDHandle); AndorCCD.Initialize(""); - AndorCCD.GetTemperature(ref m_CCDTemp); - this.SetBinSize(1); - AndorCCD.SetExposureTime(0.1f); + //SDK2 - 3 자료형이 안맞아서 수정해줘야함 (e.g. m_CCDTemp) + //AndorCCD.GetTemperature(ref m_CCDTemp); + SetBinSize(1); + AndorCCD.SetExposureTime(0.1f); AndorCCD.SetHSSpeed(0, 0); AndorCCD.GetFastestRecommendedVSSpeed(ref vsspeed_index, ref vsspeed); AndorCCD.SetVSSpeed(vsspeed_index); @@ -76,6 +157,7 @@ public smbCCD(CCDType ccd, int CCDNum) AndorCCD.SetTriggerMode(0); // Internal trigger mode AndorCCD.SetEMAdvanced(1); // Enable high gain break; + case CCDType.PROEM_CCD: m_CCDTemp = 0; break; @@ -86,15 +168,19 @@ public void SetGain(int gain) { switch (m_CCDType) { + + case CCDType.ANDOR_CCD: AndorCCD.SetEMCCDGain(gain); break; + case CCDType.ANDOR_SCMOS: + break;//SONA에는 gain이 필요 없을듯 case CCDType.PROEM_CCD: break; } } - public void SetTemp(int temp) + public void SetTemp(long temp) { // Temp : Temperature of the CCD sensor if (temp > 20) @@ -102,7 +188,8 @@ public void SetTemp(int temp) switch (m_CCDType) { case CCDType.ANDOR_CCD: - AndorCCD.SetTemperature(temp); + AndorCCD.SetTemperature((int)temp); + if (temp < -20) { AndorCCD.CoolerON(); @@ -111,25 +198,46 @@ public void SetTemp(int temp) { AndorCCD.CoolerOFF(); } + + break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_SetFloat(CCDHandle, "TargetSensorTemperature", temp); //OK.. + + if (temp < -20) + { + AndorSCMOS.AT_SetBool(CCDHandle, "SensorCooling", 1); //OK.. + } + else + { + AndorSCMOS.AT_SetBool(CCDHandle, "SensorCooling", 0); //OK.. + } + break; + case CCDType.PROEM_CCD: break; } } - public int GetTemp() + public double GetTemp() { // Temp : Temperature of the CCD sensor switch (m_CCDType) { case CCDType.ANDOR_CCD: AndorCCD.GetTemperature(ref m_CCDTemp); - break; + return m_CCDTemp; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_GetFloat(CCDHandle, "SensorTemperature", out m_SCMOSTemp); //OK.. + return m_SCMOSTemp; + case CCDType.PROEM_CCD: break; } - return m_CCDTemp; + return 1; } private void SetImageSize() @@ -137,13 +245,26 @@ private void SetImageSize() switch (m_CCDType) { case CCDType.ANDOR_CCD: - AndorCCD.SetReadMode(4); + AndorCCD.SetReadMode(4); // AOILayout 으로 설정 가능할 듯! AndorCCD.SetImage(m_binsize, m_binsize, 1, m_rangewidth, 1, m_rangeheight); break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_SetEnumIndex(CCDHandle, "AOILayout", 0); + AndorSCMOS.AT_SetInt(CCDHandle, "AOIHBin", m_binsize); + AndorSCMOS.AT_SetInt(CCDHandle, "AOIVBin", m_binsize); + AndorSCMOS.AT_SetInt(CCDHandle, "AOIWidth", m_rangewidth); + AndorSCMOS.AT_SetInt(CCDHandle, "AOILeft", 1); + AndorSCMOS.AT_SetInt(CCDHandle, "AOIHeight", m_rangeheight); + AndorSCMOS.AT_SetInt(CCDHandle, "AOITop", 1); + break; + case CCDType.PROEM_CCD: break; } - m_Bufsize = (uint)((m_rangewidth / m_binsize) * (m_rangeheight / m_binsize)); + + // m_Bufsize를 unit으로 바꿔주는 코드 제거 + m_Bufsize = (m_rangewidth / m_binsize) * (m_rangeheight / m_binsize); m_imagewidth = m_rangewidth / m_binsize; m_imageheight = m_rangeheight / m_binsize; m_clipsize = (int)(30.0 / (512.0 / Math.Min(m_imagewidth, m_imageheight))); @@ -175,17 +296,31 @@ public void SetRange(int rangeWidth, int rangeHeight) public void SetExpTime(double exptime) { m_exptime = exptime; - AndorCCD.SetExposureTime((float)exptime); + + switch (m_CCDType) + { + case CCDType.ANDOR_CCD: + AndorCCD.SetExposureTime((float)exptime); + break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_SetFloat(CCDHandle, "ExposureTime", (float)exptime); + break; + + case CCDType.PROEM_CCD: + break; + + } } - public int GetImage(int[] imagebuf) + public int GetImage(int[] imagebuf) // 무조건 필요 { int retrynum = 0; uint err; switch (m_CCDType) { case CCDType.ANDOR_CCD: - err = AndorCCD.GetOldestImage(imagebuf, m_Bufsize); + err = AndorCCD.GetOldestImage(imagebuf, (uint)m_Bufsize); if (err == ATMCD32CS.AndorSDK.DRV_SUCCESS) return 0; else if (err == ATMCD32CS.AndorSDK.DRV_NO_NEW_DATA) return 2; @@ -195,6 +330,26 @@ public int GetImage(int[] imagebuf) return 1; break; + + case CCDType.ANDOR_SCMOS: + + IntPtr scmosbuf = Marshal.AllocHGlobal(m_Bufsize); + AndorSCMOS.AT_Command(CCDHandle, "AcquisitionStart"); + AndorSCMOS.AT_QueueBuffer(CCDHandle, scmosbuf, m_Bufsize); + err = (uint)AndorSCMOS.AT_WaitBuffer(CCDHandle, out scmosbuf, out m_Bufsize, 1000); + AndorSCMOS.AT_Command(CCDHandle, "AcquisitionStop"); + AndorSCMOS.AT_Flush(CCDHandle); + Marshal.Copy(scmosbuf, imagebuf, 0, imagebuf.Length); + + + if (err == ATMCD32CS.AndorSDK.DRV_SUCCESS) return 0; + else if (err == ATMCD32CS.AndorSDK.DRV_NO_NEW_DATA) return 2; + else retrynum++; + if (retrynum > m_maxretrynum) + return 1; + + break; + case CCDType.PROEM_CCD: break; } @@ -210,6 +365,12 @@ public void ShutterOn() AndorCCD.SetShutter(1, 1, 1, 1); AndorCCD.StartAcquisition(); break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_SetEnumIndex(CCDHandle, "ShutterMode", 1); + AndorSCMOS.AT_Command(CCDHandle, "AcquisitionStart"); //ShutterMode 외의 세부옵션 추가 안됐음 + break; + case CCDType.PROEM_CCD: break; } @@ -223,12 +384,18 @@ public void ShutterOff() AndorCCD.AbortAcquisition(); AndorCCD.SetShutter(1, 2, 1, 1); break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_Command(CCDHandle, "AcquisitionStop"); + AndorSCMOS.AT_SetEnumIndex(CCDHandle, "ShutterMode", 2); //ShutterMode 외의 세부옵션 추가 안됐음 + break; + case CCDType.PROEM_CCD: break; } } - public void SetRotation(int rotation) + public void SetRotation(int rotation) //사라진 기능, 따로 코드를 짜야할 것 같음. { switch (m_CCDType) { @@ -252,6 +419,32 @@ public void SetRotation(int rotation) AndorCCD.SetImageRotate(2); break; } + + break; + case CCDType.ANDOR_SCMOS: + switch (rotation) + { + case 0: + //AndorCCD3.AT_SetBool(CCDHandle, "FlipX", 0); + //AndorCCD3.AT_SetBool(CCDHandle, "FlipY", 0); + //AndorCCD3.AT_SetInt(CCDHandle, "Rotation", 0); + break; + case 1: + //AndorCCD3.AT_SetBool(CCDHandle, "FlipX", 0); + //AndorCCD3.AT_SetBool(CCDHandle, "FlipY", 0); + //AndorCCD3.AT_SetInt(CCDHandle, "Rotation", 1); + break; + case 2: + //AndorCCD3.AT_SetBool(CCDHandle, "FlipX", 1); + //AndorCCD3.AT_SetBool(CCDHandle, "FlipY", 0); + //AndorCCD3.AT_SetInt(CCDHandle, "Rotation", 0); + break; + case 3: + //AndorCCD3.AT_SetBool(CCDHandle, "FlipX", 0); + //AndorCCD3.AT_SetBool(CCDHandle, "FlipY", 0); + //AndorCCD3.AT_SetInt(CCDHandle, "Rotation", 3); + break; + } break; case CCDType.PROEM_CCD: break; @@ -269,6 +462,15 @@ public void Dispose() AndorCCD.CoolerOFF(); AndorCCD.ShutDown(); break; + + case CCDType.ANDOR_SCMOS: + AndorSCMOS.AT_Command(CCDHandle, "AcquisitionStop"); + AndorSCMOS.AT_SetEnumIndex(CCDHandle, "ShutterMode", 2);//ShutterMode 외의 세부옵션 추가 안됐음 + AndorSCMOS.AT_SetFloat(CCDHandle, "TargetSensorTemperature", 20); + AndorSCMOS.AT_SetBool(CCDHandle, "SensorCooling", 0); + AndorSCMOS.AT_Close(CCDHandle); + break; + case CCDType.PROEM_CCD: break; } diff --git a/Single2013/Properties/Resources.Designer.cs b/Single2013/Properties/Resources.Designer.cs index 63d597b..17a2edd 100644 --- a/Single2013/Properties/Resources.Designer.cs +++ b/Single2013/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. -// 런타임 버전:4.0.30319.0 +// 런타임 버전:4.0.30319.42000 // // 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 // 이러한 변경 내용이 손실됩니다. @@ -19,7 +19,7 @@ namespace Single2013.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture - /// 속성을 재정의합니다. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을 + /// 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Single2013/Single2013.csproj b/Single2013/Single2013.csproj index c51651e..5833fd5 100644 --- a/Single2013/Single2013.csproj +++ b/Single2013/Single2013.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties Single2013 Single2013 - v4.5 + v4.8 512 diff --git a/Single2013/app.config b/Single2013/app.config index 0640bbb..1fa3ac1 100644 --- a/Single2013/app.config +++ b/Single2013/app.config @@ -6,7 +6,7 @@ - + diff --git a/Single2013/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/Single2013/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 0000000..15efebf --- /dev/null +++ b/Single2013/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/Single2013/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Single2013/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..d57b0af Binary files /dev/null and b/Single2013/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Single2013/obj/x86/Debug/Single2013.csproj.AssemblyReference.cache b/Single2013/obj/x86/Debug/Single2013.csproj.AssemblyReference.cache new file mode 100644 index 0000000..b11cdb2 Binary files /dev/null and b/Single2013/obj/x86/Debug/Single2013.csproj.AssemblyReference.cache differ diff --git a/Single2013/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Single2013/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll new file mode 100644 index 0000000..543379d Binary files /dev/null and b/Single2013/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/SingleUpdater/App.config b/SingleUpdater/App.config index d1428ad..4bfa005 100644 --- a/SingleUpdater/App.config +++ b/SingleUpdater/App.config @@ -1,6 +1,6 @@ - + diff --git a/SingleUpdater/Properties/Resources.Designer.cs b/SingleUpdater/Properties/Resources.Designer.cs index d0a8e14..78d750d 100644 --- a/SingleUpdater/Properties/Resources.Designer.cs +++ b/SingleUpdater/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. -// 런타임 버전:4.0.30319.0 +// 런타임 버전:4.0.30319.42000 // // 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 // 이러한 변경 내용이 손실됩니다. @@ -19,7 +19,7 @@ namespace SingleUpdater.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture - /// 속성을 재정의합니다. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을 + /// 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/SingleUpdater/Properties/Settings.Designer.cs b/SingleUpdater/Properties/Settings.Designer.cs index b237eaf..00a51aa 100644 --- a/SingleUpdater/Properties/Settings.Designer.cs +++ b/SingleUpdater/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. -// 런타임 버전:4.0.30319.0 +// 런타임 버전:4.0.30319.42000 // // 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 // 이러한 변경 내용이 손실됩니다. @@ -12,7 +12,7 @@ namespace SingleUpdater.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SingleUpdater/SingleUpdater.csproj b/SingleUpdater/SingleUpdater.csproj index 6ccd223..8e4984a 100644 --- a/SingleUpdater/SingleUpdater.csproj +++ b/SingleUpdater/SingleUpdater.csproj @@ -9,7 +9,7 @@ Properties SingleUpdater SingleUpdater - v4.5 + v4.8 512 true diff --git a/SingleUpdater/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/SingleUpdater/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 0000000..15efebf --- /dev/null +++ b/SingleUpdater/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/SingleUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SingleUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..ba5efa6 Binary files /dev/null and b/SingleUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SingleUpdater/obj/Debug/SingleUpdater.csproj.AssemblyReference.cache b/SingleUpdater/obj/Debug/SingleUpdater.csproj.AssemblyReference.cache new file mode 100644 index 0000000..1f1160e Binary files /dev/null and b/SingleUpdater/obj/Debug/SingleUpdater.csproj.AssemblyReference.cache differ diff --git a/SingleUpdater/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/SingleUpdater/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll new file mode 100644 index 0000000..d11fe21 Binary files /dev/null and b/SingleUpdater/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ