AWS SDK for .NET - Version 2 (2.0.1)

This is the General Availability (GA) release of AWS SDK for .NET - version 2, the next major release of the SDK.

For more information on AWS SDK for .NET - Version 2, see the release notes at http://aws.amazon.com/releasenotes/9497693924326536

.travis.yml

@@ -1,7 +1,15 @@
-language: c
-
-install:
-  - sudo apt-get install mono-devel mono-gmcs nunit-console
-
+language: objective-c
+
+env:
+ global:
+  - EnableNuGetPackageRestore=true 
+ matrix:
+  - MONO_VER="3.2.3"
+
+before_install:
+ - wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg"
+ - sudo installer -pkg "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target /
+
 script:
-  - xbuild "AWS Source.sln" /p:TargetFrameworkProfile="" /p:TargetFrameworkVersion="v3.5" /p:TreatWarningsAsErrors="false"
+  - MONO_IOMAP=case xbuild "AWSSDK_DotNet35/AWSSDK_DotNet35.sln" /p:TargetFrameworkProfile="" /p:TargetFrameworkVersion="v3.5" /p:TreatWarningsAsErrors="false"
+  - MONO_IOMAP=case xbuild "AWSSDK_DotNet45/AWSSDK_DotNet45.sln" /p:TargetFrameworkProfile="" /p:TargetFrameworkVersion="v4.5" /p:TreatWarningsAsErrors="false"

AWS.Extensions/AWS.Extensions.sln

@@ -0,0 +1,44 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E0CD7DD8-C2A0-427D-9778-C3901073BAA4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWSSDK_DotNet35", "..\AWSSDK_DotNet35\AWSSDK_DotNet35.csproj", "{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AWS.Extensions", "AWS.Extensions", "{DDBCB34F-D5BC-43A7-91A9-9A4EA3650989}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWS.SessionProvider", "SessionProvider\AWS.SessionProvider.csproj", "{65DD8109-6DA4-46A7-A29E-DE712F85010A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWS.TraceListener", "TraceListener\AWS.TraceListener.csproj", "{D607356E-AD0E-4DD2-8281-D42578917BC5}"
+EndProject
+Global
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65DD8109-6DA4-46A7-A29E-DE712F85010A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65DD8109-6DA4-46A7-A29E-DE712F85010A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65DD8109-6DA4-46A7-A29E-DE712F85010A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65DD8109-6DA4-46A7-A29E-DE712F85010A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D607356E-AD0E-4DD2-8281-D42578917BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D607356E-AD0E-4DD2-8281-D42578917BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D607356E-AD0E-4DD2-8281-D42578917BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D607356E-AD0E-4DD2-8281-D42578917BC5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{65DD8109-6DA4-46A7-A29E-DE712F85010A} = {DDBCB34F-D5BC-43A7-91A9-9A4EA3650989}
+		{D607356E-AD0E-4DD2-8281-D42578917BC5} = {DDBCB34F-D5BC-43A7-91A9-9A4EA3650989}
+	EndGlobalSection
+EndGlobal

AWS.Extensions/SessionProvider/AWS.SessionProvider.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Amazon</RootNamespace>
     <AssemblyName>AWS.SessionProvider</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
@@ -20,20 +20,32 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\$(Configuration) $(TargetFrameworkVersion)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\AWS.SessionProvider.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration) $(TargetFrameworkVersion)\AWS.SessionProvider.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\$(Configuration) $(TargetFrameworkVersion)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\AWS.SessionProvider.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration) $(TargetFrameworkVersion)\AWS.SessionProvider.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
+    <DefineConstants>NET35</DefineConstants>
+    <TargetFrameworkVersionNumber>3.5</TargetFrameworkVersionNumber>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">
+    <DefineConstants>NET40</DefineConstants>
+    <TargetFrameworkVersionNumber>4.0</TargetFrameworkVersionNumber>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">
+    <DefineConstants>NET45</DefineConstants>
+    <TargetFrameworkVersionNumber>4.5</TargetFrameworkVersionNumber>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -52,12 +64,24 @@
   <ItemGroup>
     <None Include="..\awssdk.dll.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\AWSSDK\AWSSDKSrc.csproj">
-      <Project>{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}</Project>
-      <Name>AWSSDKSrc</Name>
-    </ProjectReference>
-  </ItemGroup>
+  <Choose>
+    <When Condition=" '$(TargetFrameworkVersionNumber)' == '3.5' Or '$(TargetFrameworkVersionNumber)' == '4.0' ">
+      <ItemGroup>
+        <ProjectReference Include="..\..\AWSSDK_DotNet35\AWSSDK_DotNet35.csproj">
+          <Project>{40e91e2d-70f3-463d-9e3e-408ae2a70ba8}</Project>
+          <Name>AWSSDK_DotNet35</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <ProjectReference Include="..\..\AWSSDK_DotNet45\AWSSDK_DotNet45.csproj">
+          <Project>{5685efe3-7072-4de9-9895-e89c1fb2c5b6}</Project>
+          <Name>AWSSDK_DotNet45</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

AWS.Extensions/SessionProvider/DynamoDBSessionStateStore.cs

@@ -156,7 +156,7 @@ static DynamoDBSessionStateStore()
         int _initialWriteUnits = 5;
         bool _createIfNotExist = true;
 
-        AmazonDynamoDB _ddbClient;
+        IAmazonDynamoDB _ddbClient;
         Table _table;
         TimeSpan _timeout = new TimeSpan(0, 20, 0);
 
@@ -171,7 +171,7 @@ public DynamoDBSessionStateStore()
         /// Constructor for testing.
         /// </summary>
         /// <param name="ddbClient"></param>
-        public DynamoDBSessionStateStore(AmazonDynamoDB ddbClient)
+        public DynamoDBSessionStateStore(IAmazonDynamoDB ddbClient)
         {
             this._ddbClient = ddbClient;
             SetupTable();
@@ -627,7 +627,7 @@ public override void ResetItemTimeout(HttpContext context, string sessionId)
         /// so use this method sparingly like a nightly or weekly clean job.
         /// </summary>
         /// <param name="dbClient">The AmazonDynamoDB client used to find a delete expired sessions.</param>
-        public static void DeleteExpiredSessions(AmazonDynamoDB dbClient)
+        public static void DeleteExpiredSessions(IAmazonDynamoDB dbClient)
         {
             DeleteExpiredSessions(dbClient, DEFAULT_TABLENAME);
         }
@@ -639,7 +639,7 @@ public static void DeleteExpiredSessions(AmazonDynamoDB dbClient)
         /// </summary>
         /// <param name="dbClient">The AmazonDynamoDB client used to find a delete expired sessions.</param>
         /// <param name="tableName">The table to search.</param>
-        public static void DeleteExpiredSessions(AmazonDynamoDB dbClient, string tableName)
+        public static void DeleteExpiredSessions(IAmazonDynamoDB dbClient, string tableName)
         {
             Table table = Table.LoadTable(dbClient, tableName, Table.DynamoDBConsumer.SessionStateProvider);
 
@@ -720,8 +720,10 @@ private Table CreateTable()
 
             CreateTableResponse response = this._ddbClient.CreateTable(createRequest);
 
-            DescribeTableRequest descRequest = new DescribeTableRequest()
-                .WithTableName(this._tableName);
+            DescribeTableRequest descRequest = new DescribeTableRequest
+            {
+                TableName = this._tableName
+            };
             descRequest.BeforeRequestEvent += this.UserAgentRequestEventHandler;
 
             // Wait till table is active
@@ -730,7 +732,7 @@ private Table CreateTable()
             {
                 Thread.Sleep(DESCRIBE_INTERVAL);
                 DescribeTableResponse descResponse = this._ddbClient.DescribeTable(descRequest);
-                string tableStatus = descResponse.DescribeTableResult.Table.TableStatus;
+                string tableStatus = descResponse.Table.TableStatus;
 
                 if (string.Equals(tableStatus, ACTIVE_STATUS, StringComparison.InvariantCultureIgnoreCase))
                     isActive = true;

AWS.Extensions/SessionProvider/Properties/AssemblyInfo.cs

@@ -1,11 +1,16 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("AWS.SessionProvider")]
+
+#if (NET35 ||NET40)
+[assembly: AssemblyTitle("AWS.SessionProvider (.NET 3.5)")]
+#else
+[assembly: AssemblyTitle("AWS.SessionProvider (.NET 4.5)")]
+#endif
 [assembly: AssemblyDescription("Amazon Web Services Session Provider Extensions")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Amazon.com, Inc")]
@@ -32,5 +37,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]

AWS.Extensions/TraceListener/AWS.TraceListener.csproj

@@ -10,35 +10,47 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Amazon</RootNamespace>
     <AssemblyName>AWS.TraceListener</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\$(Configuration) $(TargetFrameworkVersion)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\AWS.TraceListener.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration) $(TargetFrameworkVersion)\AWS.TraceListener.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\$(Configuration) $(TargetFrameworkVersion)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\AWS.TraceListener.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration) $(TargetFrameworkVersion)\AWS.TraceListener.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
+    <DefineConstants>NET35</DefineConstants>
+    <TargetFrameworkVersionNumber>3.5</TargetFrameworkVersionNumber>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">
+    <DefineConstants>NET40</DefineConstants>
+    <TargetFrameworkVersionNumber>4.0</TargetFrameworkVersionNumber>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">
+    <DefineConstants>NET45</DefineConstants>
+    <TargetFrameworkVersionNumber>4.5</TargetFrameworkVersionNumber>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -54,13 +66,24 @@
   <ItemGroup>
     <None Include="..\awssdk.dll.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\AWSSDK\AWSSDKSrc.csproj">
-      <Project>{40E91E2D-70F3-463D-9E3E-408AE2A70BA8}</Project>
-      <Name>AWSSDKSrc</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
+  <Choose>
+    <When Condition=" '$(TargetFrameworkVersionNumber)' == '3.5' Or '$(TargetFrameworkVersionNumber)' == '4.0' ">
+      <ItemGroup>
+        <ProjectReference Include="..\..\AWSSDK_DotNet35\AWSSDK_DotNet35.csproj">
+          <Project>{40e91e2d-70f3-463d-9e3e-408ae2a70ba8}</Project>
+          <Name>AWSSDK_DotNet35</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <ProjectReference Include="..\..\AWSSDK_DotNet45\AWSSDK_DotNet45.csproj">
+          <Project>{5685efe3-7072-4de9-9895-e89c1fb2c5b6}</Project>
+          <Name>AWSSDK_DotNet45</Name>
+        </ProjectReference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

AWS.Extensions/TraceListener/DynamoDBTraceListener.cs

@@ -486,7 +486,7 @@ private DateTime GetCurrentTimestamp()
             {
                 var diff = (now - lastTimestamp);
                 if (diff.TotalMilliseconds < 1)
-                    now += oneMillisecond;
+                    now = lastTimestamp + oneMillisecond;
                 lastTimestamp = now;
             }
             return now;

AWS.Extensions/TraceListener/Properties/AssemblyInfo.cs

@@ -5,7 +5,13 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("AWS.TraceListener")]
+
+#if (NET35 ||NET40) 
+[assembly: AssemblyTitle("AWS.TraceListener (.NET 3.5)")]
+#else
+[assembly: AssemblyTitle("AWS.TraceListener (.NET 4.5)")]
+#endif
+
 [assembly: AssemblyDescription("Amazon Web Services TraceListener Extensions")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Amazon.com, Inc")]
@@ -32,5 +38,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]