diff --git a/.gitignore b/.gitignore index d6813cd..6bc5137 100644 --- a/.gitignore +++ b/.gitignore @@ -332,3 +332,4 @@ UpgradeLog*.XML .ionide/symbolCache.db +*.user diff --git a/CSharpLibrary/CSharpLibrary.csproj b/CSharpLibrary/CSharpLibrary.csproj index 91d13ab..5b0a636 100644 --- a/CSharpLibrary/CSharpLibrary.csproj +++ b/CSharpLibrary/CSharpLibrary.csproj @@ -34,25 +34,6 @@ v4.0 - - true - full - false - ..\CameraMng\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true ..\CameraMng\bin\Debug\ @@ -69,42 +50,6 @@ x86 prompt - - true - bin\Debug WinXP\ - DEBUG;TRACE - full - AnyCPU - prompt - false - false - - - true - bin\x86\Debug WinXP\ - DEBUG;TRACE - full - x86 - prompt - false - false - - - bin\Release WinXP\ - TRACE - true - pdbonly - AnyCPU - prompt - - - bin\x86\Release WinXP\ - TRACE - true - pdbonly - x86 - prompt - true bin\x64\Debug\ @@ -125,26 +70,6 @@ false false - - true - bin\x64\Debug WinXP\ - DEBUG;TRACE - full - x64 - prompt - false - false - - - bin\x64\Release WinXP\ - TRACE - true - pdbonly - x64 - prompt - false - false - diff --git a/CSharpLibrary/obj/x64/Debug/CSharpLibrary.csproj.AssemblyReference.cache b/CSharpLibrary/obj/x64/Debug/CSharpLibrary.csproj.AssemblyReference.cache index c48813d..386888d 100644 Binary files a/CSharpLibrary/obj/x64/Debug/CSharpLibrary.csproj.AssemblyReference.cache and b/CSharpLibrary/obj/x64/Debug/CSharpLibrary.csproj.AssemblyReference.cache differ diff --git a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.AssemblyReference.cache b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.AssemblyReference.cache index 386888d..c48813d 100644 Binary files a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.AssemblyReference.cache and b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.AssemblyReference.cache differ diff --git a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.CoreCompileInputs.cache b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.CoreCompileInputs.cache index 21ad06f..e660a2d 100644 --- a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.CoreCompileInputs.cache +++ b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5b824d8976a22f313749e4a5f6631879cf078f8beeb61d09a1d2090862091358 +7ece82b598310e04d9cdd650539e98058bf5bafc3080390680c7ea64ecc78473 diff --git a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.GenerateResource.cache b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.GenerateResource.cache index 15ddacf..6a122b3 100644 Binary files a/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.GenerateResource.cache and b/CSharpLibrary/obj/x64/Release/CSharpLibrary.csproj.GenerateResource.cache differ diff --git a/CameraMng.sln b/CameraMng.sln index a0f5ece..0acefd3 100644 --- a/CameraMng.sln +++ b/CameraMng.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31105.61 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36414.22 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CameraMng", "CameraMng\CameraMng.vbproj", "{5BBC23C8-48BC-47EC-B801-79F27347503C}" ProjectSection(ProjectDependencies) = postProject @@ -12,64 +12,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpLibrary", "CSharpLibr EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug WinXP|Any CPU = Debug WinXP|Any CPU - Debug WinXP|x64 = Debug WinXP|x64 - Debug WinXP|x86 = Debug WinXP|x86 - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release WinXP|Any CPU = Release WinXP|Any CPU - Release WinXP|x64 = Release WinXP|x64 - Release WinXP|x86 = Release WinXP|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|Any CPU.ActiveCfg = Debug WinXP|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|Any CPU.Build.0 = Debug WinXP|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|x64.ActiveCfg = Debug WinXP|x64 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|x64.Build.0 = Debug WinXP|x64 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|x86.ActiveCfg = Debug WinXP|x86 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug WinXP|x86.Build.0 = Debug WinXP|x86 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x64.ActiveCfg = Debug|x64 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x64.Build.0 = Debug|x64 + {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x64.ActiveCfg = Release|x64 + {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x64.Build.0 = Release|x64 {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x86.ActiveCfg = Debug|x86 {5BBC23C8-48BC-47EC-B801-79F27347503C}.Debug|x86.Build.0 = Debug|x86 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|Any CPU.ActiveCfg = Release WinXP|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|Any CPU.Build.0 = Release WinXP|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|x64.ActiveCfg = Release WinXP|x64 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|x64.Build.0 = Release WinXP|x64 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|x86.ActiveCfg = Release WinXP|x86 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release WinXP|x86.Build.0 = Release WinXP|x86 - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|Any CPU.Build.0 = Release|Any CPU {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|x64.ActiveCfg = Release|x64 {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|x64.Build.0 = Release|x64 {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|x86.ActiveCfg = Release|x86 {5BBC23C8-48BC-47EC-B801-79F27347503C}.Release|x86.Build.0 = Release|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|Any CPU.ActiveCfg = Debug WinXP|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|Any CPU.Build.0 = Debug WinXP|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|x64.ActiveCfg = Debug WinXP|x64 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|x64.Build.0 = Debug WinXP|x64 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|x86.ActiveCfg = Debug WinXP|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug WinXP|x86.Build.0 = Debug WinXP|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x64.ActiveCfg = Debug|x64 - {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x64.Build.0 = Debug|x64 + {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x64.ActiveCfg = Release|x64 + {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x64.Build.0 = Release|x64 {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x86.ActiveCfg = Debug|x86 {60CE9527-95BC-433A-BE8F-640489315539}.Debug|x86.Build.0 = Debug|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|Any CPU.ActiveCfg = Release WinXP|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|Any CPU.Build.0 = Release WinXP|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|x64.ActiveCfg = Release WinXP|x64 - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|x64.Build.0 = Release WinXP|x64 - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|x86.ActiveCfg = Release WinXP|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Release WinXP|x86.Build.0 = Release WinXP|x86 - {60CE9527-95BC-433A-BE8F-640489315539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60CE9527-95BC-433A-BE8F-640489315539}.Release|Any CPU.Build.0 = Release|Any CPU {60CE9527-95BC-433A-BE8F-640489315539}.Release|x64.ActiveCfg = Release|x64 {60CE9527-95BC-433A-BE8F-640489315539}.Release|x64.Build.0 = Release|x64 {60CE9527-95BC-433A-BE8F-640489315539}.Release|x86.ActiveCfg = Release|x86 diff --git a/CameraMng/CameraMng.vbproj b/CameraMng/CameraMng.vbproj index c3cdace..129ff24 100644 --- a/CameraMng/CameraMng.vbproj +++ b/CameraMng/CameraMng.vbproj @@ -57,69 +57,6 @@ My Project\app.manifest - - true - true - true - bin\Debug\ - CameraMng.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - - - true - bin\Release\ - CameraMng.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - AnyCPU - - - true - true - true - bin\Debug WinXP\ - WinXp = 1 - CameraMng.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - x86 - false - false - - - true - true - true - bin\Debug WinXP\ - CameraMng.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - false - false - - - true - bin\Release WinXP\ - CameraMng.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - x86 - WinXp = 1 - - - true - bin\Release WinXP\ - CameraMng.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - AnyCPU - true true @@ -144,31 +81,6 @@ false false - - true - true - true - bin\x64\Debug WinXP\ - WinXp = 1 - CameraMng.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - x64 - false - false - - - true - bin\x64\Release WinXP\ - WinXp = 1 - CameraMng.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - x64 - false - false - False @@ -389,20 +301,8 @@ - if /I "$(ConfigurationName)" == "Debug" copy "$(ProjectDir)DepEmgu\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Debug" copy "$(ProjectDir)DepEmgu\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Debug" copy "$(ProjectDir)DepCanon\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Debug WinXP" copy "$(ProjectDir)DepEmguXP\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Debug WinXP" copy "$(ProjectDir)DepEmguXP\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Debug WinXP" copy "$(ProjectDir)DepCanonXP\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release" copy "$(ProjectDir)DepEmgu\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release" copy "$(ProjectDir)DepEmgu\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release" copy "$(ProjectDir)DepCanon\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release WinXP" copy "$(ProjectDir)DepEmguXP\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release WinXP" copy "$(ProjectDir)DepEmguXP\$(Platform)\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -if /I "$(ConfigurationName)" == "Release WinXP" copy "$(ProjectDir)DepCanonXP\*.*" "$(ProjectDir)bin\$(ConfigurationName)" -copy "$(ProjectDir)CommonDependencies\*.*" "$(ProjectDir)bin\$(ConfigurationName)" - + IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\CameraMng\CameraMng.exe +IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\CameraMng\CameraMngD64.exe