Permalink
Browse files

Added .NET 4.5 support [SPRNETREST-26]

  • Loading branch information...
1 parent c916a24 commit 5232b8d8977d500e272291aab7776f99d448d877 @bbaia bbaia committed Sep 18, 2012
Showing with 1,229 additions and 12 deletions.
  1. +40 −0 Spring.Rest.2012-NET45.sln
  2. +13 −0 Spring.Rest.build
  3. +65 −0 doc/api/src/Spring.Rest-net-4.0.shfbproj
  4. +10 −9 doc/api/src/Spring.Rest.shfbproj
  5. +1 −1 doc/reference/src/http-messageconversion.xml
  6. +1 −1 doc/reference/src/index.xml
  7. +4 −0 doc/reference/src/introduction.xml
  8. +20 −0 examples/Spring.HttpMessageConverterQuickStart/Spring.HttpMessageConverterQuickStart.2012-NET45.sln
  9. +76 −0 ...src/Spring.HttpMessageConverterQuickStart/Spring.HttpMessageConverterQuickStart.2012-NET45.csproj
  10. +22 −0 examples/Spring.RestQuickStart/Spring.RestQuickStart.2012-NET45.sln
  11. +88 −0 examples/Spring.RestQuickStart/src/Spring.RestQuickStart/Spring.RestQuickStart.2012-NET45.csproj
  12. +28 −0 examples/Spring.TestingQuickStart/Spring.TestingQuickStart.2012-NET45.sln
  13. +58 −0 ...ples/Spring.TestingQuickStart/src/Spring.RestBucksClient/Spring.RestBucksClient.2012-NET45.csproj
  14. +70 −0 ...estingQuickStart/test/Spring.RestBucksClient.Tests/Spring.RestBucksClient.Tests.2012-NET45.csproj
  15. +3 −1 readme.txt
  16. +3 −0 setup/NuGet/src/Spring.Http.Converters.NJson.nuspec
  17. +3 −0 setup/NuGet/src/Spring.Rest.Testing.nuspec
  18. +3 −0 setup/NuGet/src/Spring.Rest.nuspec
  19. +124 −0 src/Spring.Http.Converters.NJson/Spring.Http.Converters.NJson.2012-NET45.csproj
  20. +135 −0 src/Spring.Rest.Testing/Spring.Rest.Testing.2012-NET45.csproj
  21. +253 −0 src/Spring.Rest/Spring.Rest.2012-NET45.csproj
  22. +209 −0 test/Spring.Rest.Tests/Spring.Rest.Tests.2012-NET45.csproj
View
@@ -0,0 +1,40 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Rest.2012-NET45", "src\Spring.Rest\Spring.Rest.2012-NET45.csproj", "{09E04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Rest.Tests.2012-NET45", "test\Spring.Rest.Tests\Spring.Rest.Tests.2012-NET45.csproj", "{3494CEE7-3897-A3BF-9946-5B4374F01821}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Http.Converters.NJson.2012-NET45", "src\Spring.Http.Converters.NJson\Spring.Http.Converters.NJson.2012-NET45.csproj", "{DF4EDAC0-651F-1D31-BBF4-09EF0C04F7BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Rest.Testing.2012-NET45", "src\Spring.Rest.Testing\Spring.Rest.Testing.2012-NET45.csproj", "{F3F79EFB-301F-11D3-BF4B-00CFAE04EC0C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {09E04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {09E04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {09E04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {09E04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3494CEE7-3897-A3BF-9946-5B4374F01821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3494CEE7-3897-A3BF-9946-5B4374F01821}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3494CEE7-3897-A3BF-9946-5B4374F01821}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3494CEE7-3897-A3BF-9946-5B4374F01821}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DF4EDAC0-651F-1D31-BBF4-09EF0C04F7BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DF4EDAC0-651F-1D31-BBF4-09EF0C04F7BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DF4EDAC0-651F-1D31-BBF4-09EF0C04F7BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DF4EDAC0-651F-1D31-BBF4-09EF0C04F7BC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F3F79EFB-301F-11D3-BF4B-00CFAE04EC0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F3F79EFB-301F-11D3-BF4B-00CFAE04EC0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F3F79EFB-301F-11D3-BF4B-00CFAE04EC0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F3F79EFB-301F-11D3-BF4B-00CFAE04EC0C}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ NAntAddinLastFileName = Spring.build
+ EndGlobalSection
+EndGlobal
View
@@ -113,6 +113,7 @@
<call target="build-net-2.0" />
<call target="build-net-3.5" />
<call target="build-net-4.0" />
+ <!--<call target="build-net-4.5" />-->
<call target="build-cf-3.5" />
<call target="build-sl-3.0" />
<call target="build-sl-4.0" />
@@ -157,6 +158,18 @@
<call target="test-assemblies"/>
</target>
+ <target name="build-net-4.5">
+ <echo message="Building for .NET 4.5 with '${project.buildconfiguration}' configuration" />
+ <property name="product.fullname" value="${product.fullname.temp} for .NET 4.5" />
+ <property name="project.framework" value="net-4.5"/>
+ <property name="project.version" value="${product.version}.${project.buildnumber}45" />
+ <property name="project.buildoutputdir" value="${bin.dir}\net\4.5\${project.buildconfiguration}" />
+ <property name="project.buildsolutionfile" value="${root.dir}\Spring.Rest.2012-NET45.sln" />
+ <call target="update-common-assemblyinfo" />
+ <call target="rebuild-solution"/>
+ <!--<call target="test-assemblies"/>-->
+ </target>
+
<target name="build-cf-3.5">
<echo message="Building for .NET Compact Framework 3.5 with '${project.buildconfiguration}' configuration" />
<property name="product.fullname" value="${product.fullname.temp} for .NET Compact Framework 3.5" />
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <!-- The configuration and platform will be used to determine which
+ assemblies to include from solution and project documentation
+ sources -->
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{580b01fb-2854-4c0f-9b27-d572de6e5bca}</ProjectGuid>
+ <SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
+ <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
+ Studio adds them anyway -->
+ <AssemblyName>Documentation</AssemblyName>
+ <RootNamespace>Documentation</RootNamespace>
+ <Name>Documentation</Name>
+ <!-- SHFB properties -->
+ <OutputPath>.\Help\</OutputPath>
+ <HtmlHelpName>Documentation</HtmlHelpName>
+ <Language>en-US</Language>
+ <FrameworkVersion>.NET 4.0</FrameworkVersion>
+ <HelpFileFormat>HtmlHelp1</HelpFileFormat>
+ <DocumentationSources>
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Http.Converters.NJson.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Http.Converters.NJson.xml" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.xml" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.Testing.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.Testing.xml" />
+ </DocumentationSources>
+ <PlugInConfigurations>
+ </PlugInConfigurations>
+ <SyntaxFilters>CSharp</SyntaxFilters>
+ <ComponentConfigurations>
+ </ComponentConfigurations>
+ <PresentationStyle>vs2005</PresentationStyle>
+ <KeepLogFile>True</KeepLogFile>
+ </PropertyGroup>
+ <!-- There are no properties for these groups. AnyCPU needs to appear in
+ order for Visual Studio to perform the build. The others are optional
+ common platform types that may appear. -->
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Common.Logging">
+ <HintPath>..\..\..\bin\net\4.0\Release\Common.Logging.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <!-- Import the SHFB build targets -->
+ <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+</Project>
@@ -18,23 +18,24 @@
<OutputPath>.\Help\</OutputPath>
<HtmlHelpName>spring-rest-api</HtmlHelpName>
<Language>en-US</Language>
- <FrameworkVersion>.NET 4.0.30319</FrameworkVersion>
+ <FrameworkVersion>.NET 4.5</FrameworkVersion>
<HelpFileFormat>HtmlHelp1</HelpFileFormat>
<DocumentationSources>
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Http.Converters.NJson.dll" />
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Http.Converters.NJson.xml" />
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.dll" />
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.xml" />
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.Testing.dll" />
- <DocumentationSource sourceFile="..\..\..\bin\net\4.0\Release\Spring.Rest.Testing.xml" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Http.Converters.NJson.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Http.Converters.NJson.xml" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Rest.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Rest.xml" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Rest.Testing.dll" />
+ <DocumentationSource sourceFile="..\..\..\bin\net\4.5\Release\Spring.Rest.Testing.xml" />
</DocumentationSources>
<PlugInConfigurations>
<PlugInConfig id="Version Builder" enabled="True">
<configuration>
- <currentProject label=".NET Framework" version="4.0 Client Profile" ripOldApis="False" />
+ <currentProject label=".NET Framework" version="4.5" ripOldApis="False" />
<versions>
<version label=".NET Framework" version="2.0" helpFileProject="Spring.Rest-net-2.0.shfbproj" />
<version label=".NET Framework" version="3.5 Client Profile" helpFileProject="Spring.Rest-net-3.5.shfbproj" />
+ <version label=".NET Framework" version="4.0 Client Profile" helpFileProject="Spring.Rest-net-4.0.shfbproj" />
<version label="Silverlight" version="3.0" helpFileProject="Spring.Rest-sl-3.0.shfbproj" />
<version label="Silverlight" version="4.0" helpFileProject="Spring.Rest-sl-4.0.shfbproj" />
<version label="Silverlight" version="5.0" helpFileProject="Spring.Rest-sl-5.0.shfbproj" />
@@ -125,7 +126,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging">
- <HintPath>..\..\..\bin\net\4.0\Release\Common.Logging.dll</HintPath>
+ <HintPath>..\..\..\bin\net\4.5\Release\Common.Logging.dll</HintPath>
</Reference>
</ItemGroup>
<!-- Import the SHFB build targets -->
@@ -56,7 +56,7 @@
</entry>
<entry align="center">
- <emphasis role="bold">.NET 4.0</emphasis>
+ <emphasis role="bold">.NET 4.x</emphasis>
</entry>
<entry align="center">
@@ -14,7 +14,7 @@
<!-- auto-generated -->
<copyright>Copyright 2012 SpringSource</copyright>
<!-- auto-generated -->
- <pubdate>Last Updated 9/15/2012</pubdate>
+ <pubdate>Last Updated 9/18/2012</pubdate>
<authorgroup>
<author>
<firstname>Arjen</firstname>
@@ -45,6 +45,10 @@
</listitem>
<listitem>
+ <para>.NET 4.5</para>
+ </listitem>
+
+ <listitem>
<para>.NET Compact Framework 3.5</para>
</listitem>
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.HttpMessageConverterQuickStart.2012-NET45", "src\Spring.HttpMessageConverterQuickStart\Spring.HttpMessageConverterQuickStart.2012-NET45.csproj", "{E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{E9D4F098-21BF-4FDC-85CE-7DB6A27D6179}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Spring.HttpMessageConverterQuickStart</RootNamespace>
+ <AssemblyName>Spring.HttpMessageConverterQuickStart</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Spring.Rest, Version=1.0.0.42, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\bin\net\4.5\Debug\Spring.Rest.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Converters\ImageHttpMessageConverter.cs" />
+ <Compile Include="Program.cs" />
+ </ItemGroup>
+ <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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -0,0 +1,22 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.RestQuickStart.2012-NET45", "src\Spring.RestQuickStart\Spring.RestQuickStart.2012-NET45.csproj", "{0974A622-4A48-4A2F-8AB9-BFF765B14806}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0974A622-4A48-4A2F-8AB9-BFF765B14806}.Debug|x86.ActiveCfg = Debug|x86
+ {0974A622-4A48-4A2F-8AB9-BFF765B14806}.Debug|x86.Build.0 = Debug|x86
+ {0974A622-4A48-4A2F-8AB9-BFF765B14806}.Release|x86.ActiveCfg = Release|x86
+ {0974A622-4A48-4A2F-8AB9-BFF765B14806}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ NAntAddinLastFileName = Spring.build
+ EndGlobalSection
+EndGlobal
Oops, something went wrong.

0 comments on commit 5232b8d

Please sign in to comment.