Build and package for 2.58

RickStrahl · Nov 18, 2014 · 17cf969 · 17cf969
1 parent b6be087
commit 17cf969
Show file tree

Hide file tree

Showing 31 changed files with 6,028 additions and 95 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,13 +1,19 @@
 #West Wind Toolkit Change Log
 
-### Version 2.57
+### Version 2.58
 *not released yet*
 
 * **New HttpUtils.JsonRequest**<br/>
 Added a new HttpUtils class with a JsonRequest() and JsonRequestAsync() 
 methods to handle calling JSON services and automatically sending
 and receiving of JSON data.
 
+* **New HttpUtils class**<br />
+Added static HttpUtils class to make it easy to make Http Requests
+and specifically to make JSON service calls that can automatically
+serialize and deserialize data. Class also includes a simple HTTP
+retrieval routine.
+
 * **AppConfiguration support for Nested Property Encryption**<br />
 You can now specify nested fields for encryption in the provider's
 PropertiesToEncrypt properties. For example, using `PropertiesToEncrypt=
@@ -28,6 +34,12 @@ attributes and uses the new MutationObserver DOM Api that works with
 all modern browsers. Slight interface change passing parameters
 as an `options` parameter
 
+* **Split .NET 4.0 and 4.5 targets for Westwind.Utilities**<br />
+Create seperate net40 target for .NET 4.0 compatible output of
+Westwind.Utilities while moving forward to 4.5 with most of the
+code. Start integrating a number of async features into new and
+existing utility classes.
+
 ### Version 2.56
 *October 2nd, 2014*
 

diff --git a/Samples/WestwindToolkitMvcWeb/WestwindToolkitMvcWeb.csproj b/Samples/WestwindToolkitMvcWeb/WestwindToolkitMvcWeb.csproj
@@ -211,6 +211,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

diff --git a/Tests/Westwind.Data.Test/Westwind.Data.Test/Westwind.Data.Test.csproj b/Tests/Westwind.Data.Test/Westwind.Data.Test/Westwind.Data.Test.csproj
@@ -39,6 +39,15 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\net40\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Tests/Westwind.Utilities.Test/HttpUtilsTests.cs b/Tests/Westwind.Utilities.Test/HttpUtilsTests.cs
@@ -26,7 +26,7 @@ public async Task HttpRequestStringWithUrlAsyncTest()
         [TestMethod]
         public void HttpRequestStringWithSettingsTest()
         {
-            var settings = new HttpHelperRequestSettings()
+            var settings = new HttpRequestSettings()
             {
                 Url = "http://microsoft.com",
 
@@ -41,7 +41,7 @@ public void HttpRequestStringWithSettingsTest()
         [TestMethod]
         public void JsonRequestTest()
         {
-            var settings = new HttpHelperRequestSettings()
+            var settings = new HttpRequestSettings()
             {
                 Url = "http://codepaste.net/recent?format=json",
 
@@ -58,7 +58,7 @@ public void JsonRequestTest()
         [TestMethod]
         public async Task JsonRequestAsyncTest()
         {
-            var settings = new HttpHelperRequestSettings()
+            var settings = new HttpRequestSettings()
             {
                 Url = "http://codepaste.net/recent?format=json",
 
@@ -85,7 +85,7 @@ public async Task JsonRequestPostAsyncTest()
             };
 
 
-            var settings = new HttpHelperRequestSettings()
+            var settings = new HttpRequestSettings()
             {
                 Url = "http://codepaste.net/recent?format=json",
                 Data = data,

diff --git a/Tests/Westwind.Utilities.Test/Westwind.Utilities.Test.csproj b/Tests/Westwind.Utilities.Test/Westwind.Utilities.Test.csproj
@@ -36,6 +36,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\net40\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/WestWind.Data.Models/WestWind.Data.Models.csproj b/WestWind.Data.Models/WestWind.Data.Models.csproj
@@ -36,6 +36,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\net40\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Westwind.Data.MongoDb/Westwind.Data.MongoDb.csproj b/Westwind.Data.MongoDb/Westwind.Data.MongoDb.csproj
@@ -32,6 +32,16 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Westwind.Data.MongoDb.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\net40\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\Westwind.Data.MongoDb.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="MongoDB.Bson, Version=1.9.2.235, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Westwind.Data/Westwind.Data.csproj b/Westwind.Data/Westwind.Data.csproj
@@ -35,6 +35,16 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
     <OutputPath>bin\Deploy\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
+    <OutputPath>bin\net40\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\Westwind.Data.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Westwind.Toolkit.sln b/Westwind.Toolkit.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Westwind.Utilities", "Westwind.Utilities\Westwind.Utilities.csproj", "{1C9829A8-8979-4493-863C-635726F8A61C}"
 EndProject
@@ -49,59 +49,86 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		net40|Any CPU = net40|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1C9829A8-8979-4493-863C-635726F8A61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C9829A8-8979-4493-863C-635726F8A61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C9829A8-8979-4493-863C-635726F8A61C}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{1C9829A8-8979-4493-863C-635726F8A61C}.net40|Any CPU.Build.0 = net40|Any CPU
 		{1C9829A8-8979-4493-863C-635726F8A61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C9829A8-8979-4493-863C-635726F8A61C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.net40|Any CPU.Build.0 = net40|Any CPU
 		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1618C87C-1C5B-4E50-BB14-F6663FE4C0B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.net40|Any CPU.Build.0 = net40|Any CPU
 		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{809985C1-9458-496F-ABC5-FC71140BE4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{809985C1-9458-496F-ABC5-FC71140BE4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{809985C1-9458-496F-ABC5-FC71140BE4A5}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{809985C1-9458-496F-ABC5-FC71140BE4A5}.net40|Any CPU.Build.0 = net40|Any CPU
 		{809985C1-9458-496F-ABC5-FC71140BE4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{809985C1-9458-496F-ABC5-FC71140BE4A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.net40|Any CPU.Build.0 = net40|Any CPU
 		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C38B4E1-0C87-4289-A57B-87C1B5BE3BBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.net40|Any CPU.Build.0 = net40|Any CPU
 		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2976716-5F1C-45EA-A92E-8D96FF98EA58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.net40|Any CPU.Build.0 = net40|Any CPU
 		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A3E1AE8-AB14-4BBE-90C6-595C484E2A62}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C868009-3FF3-4195-A909-2035FE670675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C868009-3FF3-4195-A909-2035FE670675}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C868009-3FF3-4195-A909-2035FE670675}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{1C868009-3FF3-4195-A909-2035FE670675}.net40|Any CPU.Build.0 = net40|Any CPU
 		{1C868009-3FF3-4195-A909-2035FE670675}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C868009-3FF3-4195-A909-2035FE670675}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.net40|Any CPU.Build.0 = net40|Any CPU
 		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1431264-23EF-4AAC-B57A-CA68A7C26396}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.net40|Any CPU.Build.0 = net40|Any CPU
 		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.net40|Any CPU.Build.0 = net40|Any CPU
 		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4C1B460-7E42-41C6-AB01-B98D7B698860}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0CE58260-3B66-480C-8394-35BA649F77D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0CE58260-3B66-480C-8394-35BA649F77D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CE58260-3B66-480C-8394-35BA649F77D6}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{0CE58260-3B66-480C-8394-35BA649F77D6}.net40|Any CPU.Build.0 = net40|Any CPU
 		{0CE58260-3B66-480C-8394-35BA649F77D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CE58260-3B66-480C-8394-35BA649F77D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5E78920-D93A-49C2-884E-39611DD5B660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5E78920-D93A-49C2-884E-39611DD5B660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5E78920-D93A-49C2-884E-39611DD5B660}.net40|Any CPU.ActiveCfg = net40|Any CPU
+		{C5E78920-D93A-49C2-884E-39611DD5B660}.net40|Any CPU.Build.0 = net40|Any CPU
 		{C5E78920-D93A-49C2-884E-39611DD5B660}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5E78920-D93A-49C2-884E-39611DD5B660}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
@@ -111,9 +138,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{2AFD91E5-5DE1-46D7-B2C1-D957050CB53D} = {90FB62AD-E28A-460D-AB4B-38F39F51ADC0}
 		{B2976716-5F1C-45EA-A92E-8D96FF98EA58} = {90FB62AD-E28A-460D-AB4B-38F39F51ADC0}
+		{1C868009-3FF3-4195-A909-2035FE670675} = {C15BC2AE-D993-4E5E-AF9A-10566AE241E9}
 		{E7062F1F-B1A0-47CA-A0A0-B93A2F44147D} = {90FB62AD-E28A-460D-AB4B-38F39F51ADC0}
 		{A4C1B460-7E42-41C6-AB01-B98D7B698860} = {90FB62AD-E28A-460D-AB4B-38F39F51ADC0}
 		{C5E78920-D93A-49C2-884E-39611DD5B660} = {90FB62AD-E28A-460D-AB4B-38F39F51ADC0}
-		{1C868009-3FF3-4195-A909-2035FE670675} = {C15BC2AE-D993-4E5E-AF9A-10566AE241E9}
 	EndGlobalSection
 EndGlobal
diff --git a/Westwind.Utilities/Properties/AssemblyInfo.cs b/Westwind.Utilities/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.56.*")]
-[assembly: AssemblyFileVersion("2.56")]
+[assembly: AssemblyVersion("2.58.*")]
+[assembly: AssemblyFileVersion("2.58")]