diff --git a/bin/app/data/install/uninstall_app.bat b/bin/app/data/install/uninstall_app.bat index 1a342170..f55ba3b1 100644 --- a/bin/app/data/install/uninstall_app.bat +++ b/bin/app/data/install/uninstall_app.bat @@ -1 +1 @@ -%windir%\system32\msiexec.exe /I{E6343DF1-6651-4487-BACE-59068B169BA0} \ No newline at end of file +%windir%\system32\msiexec.exe /I{A54890F6-A227-4BEC-8086-DF08B9B4D0D1} \ No newline at end of file diff --git a/bin/app/data/install/uninstall_trail.bat b/bin/app/data/install/uninstall_trail.bat index 9e9a230d..ce9b8eee 100644 --- a/bin/app/data/install/uninstall_trail.bat +++ b/bin/app/data/install/uninstall_trail.bat @@ -1 +1 @@ -%windir%\system32\msiexec.exe /I{99D5E031-E895-47B2-B108-AD026571FD29} \ No newline at end of file +%windir%\system32\msiexec.exe /I{8732C041-A948-4D7F-BE08-FBCEF8BF4586} \ No newline at end of file diff --git a/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj index 6b474e5e..bb6449de 100644 --- a/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj +++ b/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj @@ -4256,15 +4256,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Coati" - "ProductCode" = "8:{E6343DF1-6651-4487-BACE-59068B169BA0}" - "PackageCode" = "8:{039E56E8-CF44-4CFA-AA27-AC0853CF07BC}" + "ProductCode" = "8:{A54890F6-A227-4BEC-8086-DF08B9B4D0D1}" + "PackageCode" = "8:{1EFFC244-8CCC-46E4-B6AC-F789BF1F7F18}" "UpgradeCode" = "8:{CFF09D53-87AF-4241-960D-98C21ED9D358}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.5.0004" + "ProductVersion" = "8:0.6.0000" "Manufacturer" = "8:Coati Software" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:www.coati.io/support" @@ -5225,7 +5225,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556" { - "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll" + "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5253,7 +5253,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A" { - "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Debug\\SetupCreateStartMenuShortcutLib.dll" + "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5281,7 +5281,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE" { - "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll" + "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5309,7 +5309,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83" { - "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll" + "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" diff --git a/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj index f76f5620..94be7a62 100644 --- a/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj +++ b/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj @@ -4285,15 +4285,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Coati Trial" - "ProductCode" = "8:{99D5E031-E895-47B2-B108-AD026571FD29}" - "PackageCode" = "8:{7C41DFA9-3814-4C1B-A50F-F7442697A957}" + "ProductCode" = "8:{8732C041-A948-4D7F-BE08-FBCEF8BF4586}" + "PackageCode" = "8:{11F55D62-3346-49A5-AD7B-FCA50F3C1D98}" "UpgradeCode" = "8:{00D35BB8-F11C-4179-9962-47B3D55E412C}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.5.0004" + "ProductVersion" = "8:0.6.0000" "Manufacturer" = "8:Coati Software" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:www.coati.io/support" @@ -5254,7 +5254,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556" { - "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll" + "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5282,7 +5282,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A" { - "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Debug\\SetupCreateStartMenuShortcutLib.dll" + "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5310,7 +5310,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE" { - "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll" + "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -5338,7 +5338,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83" { - "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll" + "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" diff --git a/ide_plugins/vs/coati_plugin_vs.vsix b/ide_plugins/vs/coati_plugin_vs.vsix index 42afd975..4b163178 100644 Binary files a/ide_plugins/vs/coati_plugin_vs.vsix and b/ide_plugins/vs/coati_plugin_vs.vsix differ diff --git a/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj index ff90f43a..96a82c67 100644 --- a/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj +++ b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj @@ -20,7 +20,7 @@ Library Properties CoatiSoftware.CoatiPlugin - CoatiPlugin + coati_plugin_vs True Key.snk v4.5 diff --git a/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest index 13778c8e..67a0f69b 100644 --- a/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest +++ b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest @@ -1,10 +1,10 @@  - + CoatiPlugin - This package allows Coati to communicate with Visual Studio and vice versa. -More infos at www.coati.io + This package allows Coati to communicate with Visual Studio and vice versa. + https://www.coati.io/ coati.ico diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh index 3678178c..7860bf7d 100644 --- a/script/deploy_windows.sh +++ b/script/deploy_windows.sh @@ -32,17 +32,23 @@ read -p "Press [Enter] key to continue" echo -e "$INFO Did you change the Product-IDs in the uninstall scripts?" read -p "Press [Enter] key to continue" -echo -e "$INFO Did you set the correct version number for the Visual Studio plugins?" +echo -e "$INFO Did you set the correct version number for the Visual Studio plugin?" read -p "Press [Enter] key to continue" -echo -e "$INFO Are the Visual Studio plugins up to date?" +echo -e "$INFO Is the Visual Studio plugin up to date?" read -p "Press [Enter] key to continue" + # SETTING THE DEPLOY FLAG rm -rf src/lib_gui/platform_includes/deploy.h echo "#define DEPLOY" >src/lib_gui/platform_includes/deploy.h +### TODO: RUN CMAKE! + +### TODO: add HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\12.0_Config\MSBuild\EnableOutOfProcBuild + + # CLEANING THE PROJECT if [ $REBUILD = true ]; then echo -e "$INFO cleaning the project"