diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml index ae08b068..3d7f5591 100644 --- a/Thermo.Active.Config/Config/serverConfig.xml +++ b/Thermo.Active.Config/Config/serverConfig.xml @@ -141,7 +141,7 @@ - + diff --git a/Thermo.Active.sln b/Thermo.Active.sln index 8e69cb33..3c9a9a5d 100644 --- a/Thermo.Active.sln +++ b/Thermo.Active.sln @@ -204,14 +204,14 @@ Global {49B04D99-0ECD-4900-86D3-7098D61314D7}.Release|x86.Build.0 = Release|Any CPU {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|x64 - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|Any CPU + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|Any CPU {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug|x86 {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug|x86 {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.ActiveCfg = Release|Any CPU {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.Build.0 = Release|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|x64 - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|Any CPU + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|Any CPU {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|x86 {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|x86 {0780047F-12E4-4FCC-9748-6B23F0FD3711}.Debug|Any CPU.ActiveCfg = Debug|x64 diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj index 202e4f8b..2fff4879 100644 --- a/Thermo.Active/Thermo.Active.csproj +++ b/Thermo.Active/Thermo.Active.csproj @@ -11778,6 +11778,8 @@ Always + + @@ -16499,6 +16501,29 @@ app.manifest + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x64\Release\ + TRACE + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + @@ -16513,12 +16538,12 @@ --> - + @@ -16527,4 +16552,7 @@ + + call "$(ProjectDir)\FLIR.Atlas.x86.bat" "$(TargetDir)" + \ No newline at end of file diff --git a/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj b/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj index c4f5930e..e699013e 100644 --- a/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj +++ b/Thermo.Cam.Setup/Thermo.Cam.Setup.csproj @@ -75,13 +75,13 @@ false - + False - ..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Image.dll + ..\Thermo.Cam.Utils\dll\x86\Flir.Atlas.Image.dll - + False - ..\Thermo.Cam.Utils\dll\x64\Flir.Atlas.Live.dll + ..\Thermo.Cam.Utils\dll\x86\Flir.Atlas.Live.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -167,7 +167,7 @@ - call "$(ProjectDir)\FLIR.Atlas.x64.bat" "$(TargetDir)" + call "$(ProjectDir)\FLIR.Atlas.x86.bat" "$(TargetDir)"