From f9192f8e1dce32a37fa0f3f283b142d66587aa1b Mon Sep 17 00:00:00 2001 From: Daniel Bardi Date: Thu, 7 Dec 2017 21:38:15 -0700 Subject: [PATCH] changed framework version to 4.6.2 --- .gitignore | 1 + CTCTWrapper/CTCTWrapper.UnitTest/App.config | 2 +- .../CTCTWrapper.UnitTest/CTCTWrapper.UnitTest.csproj | 7 +++++-- CTCTWrapper/CTCTWrapper.UnitTest/CtctUnitTest.cs | 2 +- CTCTWrapper/CTCTWrapper.csproj | 7 +++++-- CTCTWrapper/Resources/Errors1.Designer.cs | 4 ++-- CTCTWrapper/Settings/ActivitiesColumns.Designer.cs | 4 ++-- CTCTWrapper/Settings/Endpoints.Designer.cs | 4 ++-- CTCTWrapper/Settings/Login.Designer.cs | 4 ++-- CTCTWrapper/app.config | 2 +- 10 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 9945616..deffda8 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ $RECYCLE.BIN/ # Mac crap .DS_Store +CTCTWrapper/.vs/ diff --git a/CTCTWrapper/CTCTWrapper.UnitTest/App.config b/CTCTWrapper/CTCTWrapper.UnitTest/App.config index a6f6f98..9606bea 100644 --- a/CTCTWrapper/CTCTWrapper.UnitTest/App.config +++ b/CTCTWrapper/CTCTWrapper.UnitTest/App.config @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/CTCTWrapper/CTCTWrapper.UnitTest/CTCTWrapper.UnitTest.csproj b/CTCTWrapper/CTCTWrapper.UnitTest/CTCTWrapper.UnitTest.csproj index e93dc74..94b4867 100644 --- a/CTCTWrapper/CTCTWrapper.UnitTest/CTCTWrapper.UnitTest.csproj +++ b/CTCTWrapper/CTCTWrapper.UnitTest/CTCTWrapper.UnitTest.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,9 +11,10 @@ Properties CTCTWrapper.UnitTest CTCTWrapper.UnitTest - v4.0 + v4.6.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true @@ -23,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +33,7 @@ TRACE prompt 4 + false diff --git a/CTCTWrapper/CTCTWrapper.UnitTest/CtctUnitTest.cs b/CTCTWrapper/CTCTWrapper.UnitTest/CtctUnitTest.cs index a15f555..92091d2 100644 --- a/CTCTWrapper/CTCTWrapper.UnitTest/CtctUnitTest.cs +++ b/CTCTWrapper/CTCTWrapper.UnitTest/CtctUnitTest.cs @@ -1299,7 +1299,7 @@ public void LiveContactTrackingEmailCampaignActivitiesTest() Assert.IsNotNull(contacts.Results); Assert.IsTrue(contacts.Results.Count > 0); - ResultSet result = contactTrackingService.GetEmailCampaignActivities(contacts.Results[0].Id); + var result = contactTrackingService.GetEmailCampaignActivities(contacts.Results[0].Id); Assert.IsNotNull(result); } diff --git a/CTCTWrapper/CTCTWrapper.csproj b/CTCTWrapper/CTCTWrapper.csproj index 0e1f756..778c889 100644 --- a/CTCTWrapper/CTCTWrapper.csproj +++ b/CTCTWrapper/CTCTWrapper.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties CTCT CTCT - v4.0 + v4.6.2 512 + true @@ -22,6 +23,7 @@ prompt 4 bin\Debug\CTCT.XML + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false diff --git a/CTCTWrapper/Resources/Errors1.Designer.cs b/CTCTWrapper/Resources/Errors1.Designer.cs index ebc4e21..0c10003 100644 --- a/CTCTWrapper/Resources/Errors1.Designer.cs +++ b/CTCTWrapper/Resources/Errors1.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace CTCT.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Errors { diff --git a/CTCTWrapper/Settings/ActivitiesColumns.Designer.cs b/CTCTWrapper/Settings/ActivitiesColumns.Designer.cs index 8b7a0c0..b9fbefe 100644 --- a/CTCTWrapper/Settings/ActivitiesColumns.Designer.cs +++ b/CTCTWrapper/Settings/ActivitiesColumns.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace CTCT.Settings { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class ActivitiesColumns : global::System.Configuration.ApplicationSettingsBase { private static ActivitiesColumns defaultInstance = ((ActivitiesColumns)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new ActivitiesColumns()))); diff --git a/CTCTWrapper/Settings/Endpoints.Designer.cs b/CTCTWrapper/Settings/Endpoints.Designer.cs index 285132e..3d13937 100644 --- a/CTCTWrapper/Settings/Endpoints.Designer.cs +++ b/CTCTWrapper/Settings/Endpoints.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace CTCT.Settings { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Endpoints : global::System.Configuration.ApplicationSettingsBase { private static Endpoints defaultInstance = ((Endpoints)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Endpoints()))); diff --git a/CTCTWrapper/Settings/Login.Designer.cs b/CTCTWrapper/Settings/Login.Designer.cs index ea77b77..2af44e2 100644 --- a/CTCTWrapper/Settings/Login.Designer.cs +++ b/CTCTWrapper/Settings/Login.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace CTCT.Settings { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Login : global::System.Configuration.ApplicationSettingsBase { private static Login defaultInstance = ((Login)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Login()))); diff --git a/CTCTWrapper/app.config b/CTCTWrapper/app.config index 885f175..85d017e 100644 --- a/CTCTWrapper/app.config +++ b/CTCTWrapper/app.config @@ -290,4 +290,4 @@ - \ No newline at end of file +