diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config new file mode 100644 index 00000000..67f8ea04 --- /dev/null +++ b/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe new file mode 100644 index 00000000..6bb79fe5 Binary files /dev/null and b/.nuget/NuGet.exe differ diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets new file mode 100644 index 00000000..3f8c37b2 --- /dev/null +++ b/.nuget/NuGet.targets @@ -0,0 +1,144 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + + + + + $(SolutionDir).nuget + + + + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config + + + + $(MSBuildProjectDirectory)\packages.config + $(PackagesProjectConfig) + + + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 "$(NuGetExePath)" + + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + "$(SolutionDir) " + "$(SolutionDir)" + + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) + $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SugarCRMClient/SuiteCRMClient.csproj b/SugarCRMClient/SuiteCRMClient.csproj index b10f87b4..97ee03a1 100644 --- a/SugarCRMClient/SuiteCRMClient.csproj +++ b/SugarCRMClient/SuiteCRMClient.csproj @@ -11,6 +11,8 @@ SugarCRMClient v4.5 512 + ..\ + true true @@ -36,8 +38,9 @@ SuiteCRMClient.snk - - ..\..\..\Westlawn\WebServiceTest\WebServiceTest\bin\Debug\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + True @@ -103,6 +106,7 @@ + SettingsSingleFileGenerator Settings.Designer.cs @@ -110,6 +114,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - + SuiteCRMAddIn diff --git a/SuiteCRMAddInSetup/SuiteCRMAddInSetup/Express/Interm/_IsIcoRes.Exe b/SuiteCRMAddInSetup/SuiteCRMAddInSetup/Express/Interm/_IsIcoRes.Exe index 1921f7ee..3bca07dc 100644 Binary files a/SuiteCRMAddInSetup/SuiteCRMAddInSetup/Express/Interm/_IsIcoRes.Exe and b/SuiteCRMAddInSetup/SuiteCRMAddInSetup/Express/Interm/_IsIcoRes.Exe differ diff --git a/SuiteCRMOutlookAddIn.sln b/SuiteCRMOutlookAddIn.sln index 53a14bcb..da153dfb 100644 --- a/SuiteCRMOutlookAddIn.sln +++ b/SuiteCRMOutlookAddIn.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuiteCRMClient", "SugarCRMClient\SuiteCRMClient.csproj", "{383E8EE7-604D-447D-A2C2-C50080D28F69}" EndProject diff --git a/setup.exe b/setup.exe index 47df5c01..35102d5f 100644 Binary files a/setup.exe and b/setup.exe differ