Skip to content

Commit c1d18f4

Browse files
glennblockglennblock
committed
Merge pull request #68 from WebApiContrib/dev
0.6.0 Release
2 parents 0386c2f + 296d635 commit c1d18f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+369
-503
lines changed

‎build.bat‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
@echo Off
2+
set config=%1
3+
if "%config%" == "" (
4+
set config=Release
5+
)
6+
7+
set version=1.0.0
8+
if not "%PackageVersion%" == "" (
9+
set version=%PackageVersion%
10+
)
11+
12+
set nuget=
13+
if "%nuget%" == "" (
14+
set nuget=nuget
15+
)
16+
17+
call %nuget% install src\WebApiContrib.Formatting.CollectionJson.Client\packages.config -OutputDirectory %cd%\src\packages -NonInteractive -NoCache -Verbosity Detailed
18+
call %nuget% install src\WebApiContrib.Formatting.CollectionJson.Server\packages.config -OutputDirectory %cd%\src\packages -NonInteractive -NoCache -Verbosity Detailed
19+
20+
call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\WebApiContrib.CollectionJson\WebApiContrib.CollectionJson.csproj /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
21+
call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\WebApiContrib.Formatting.CollectionJson.Client\WebApiContrib.Formatting.CollectionJson.Client.csproj /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
22+
call %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild src\WebApiContrib.Formatting.CollectionJson.Server\WebApiContrib.Formatting.CollectionJson.Server.csproj /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
23+
24+
mkdir Build
25+
call %nuget% pack "src\WebApiContrib.CollectionJson\WebApiContrib.CollectionJson.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"
26+
call %nuget% pack "src\WebApiContrib.Formatting.CollectionJson.Client\WebApiContrib.Formatting.CollectionJson.Client.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"
27+
call %nuget% pack "src\WebApiContrib.Formatting.CollectionJson.Server\WebApiContrib.Formatting.CollectionJson.Server.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"
28+
29+
pause

‎samples/friendapi/.nuget/NuGet.Config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎samples/friendapi/.nuget/NuGet.exe‎

-635 KB
Binary file not shown.

‎samples/friendapi/.nuget/NuGet.targets‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎samples/friendapi/FriendApi.csproj‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>FriendApi</RootNamespace>
1111
<AssemblyName>FriendApi</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -23,6 +24,7 @@
2324
<DefineConstants>DEBUG;TRACE</DefineConstants>
2425
<ErrorReport>prompt</ErrorReport>
2526
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2830
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,14 +34,16 @@
3234
<DefineConstants>TRACE</DefineConstants>
3335
<ErrorReport>prompt</ErrorReport>
3436
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
3538
</PropertyGroup>
3639
<ItemGroup>
3740
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
3841
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
42+
<HintPath>packages\Autofac.3.2.0\lib\net40\Autofac.dll</HintPath>
4043
</Reference>
41-
<Reference Include="Autofac.Integration.WebApi">
42-
<HintPath>packages\Autofac.WebApi.3.1.0\lib\net40\Autofac.Integration.WebApi.dll</HintPath>
44+
<Reference Include="Autofac.Integration.WebApi, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>packages\Autofac.WebApi2.3.2.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
4347
</Reference>
4448
<Reference Include="Newtonsoft.Json">
4549
<HintPath>packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -49,17 +53,20 @@
4953
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5054
<HintPath>packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
5155
</Reference>
52-
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
56+
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
5459
</Reference>
5560
<Reference Include="System.Net.Http.WebRequest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5661
<HintPath>packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
5762
</Reference>
58-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
63+
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
6066
</Reference>
61-
<Reference Include="System.Web.Http.SelfHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>packages\Microsoft.AspNet.WebApi.SelfHost.4.0.20918.0\lib\net40\System.Web.Http.SelfHost.dll</HintPath>
67+
<Reference Include="System.Web.Http.SelfHost, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>packages\Microsoft.AspNet.WebApi.SelfHost.5.2.0\lib\net45\System.Web.Http.SelfHost.dll</HintPath>
6370
</Reference>
6471
<Reference Include="System.Xml.Linq" />
6572
<Reference Include="System.Data.DataSetExtensions" />
@@ -101,7 +108,6 @@
101108
<None Include="packages.config" />
102109
</ItemGroup>
103110
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
105111
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106112
Other similar extension points exist, see Microsoft.Common.targets.
107113
<Target Name="BeforeBuild">

‎samples/friendapi/FriendApi.sln‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30501.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FriendApi", "FriendApi.csproj", "{EAB2A98D-2059-45B2-8DFF-42B8326D5531}"
57
EndProject
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6B005A23-F5E8-4D0F-98C9-3D260C2C80E3}"
7-
ProjectSection(SolutionItems) = preProject
8-
.nuget\NuGet.Config = .nuget\NuGet.Config
9-
.nuget\NuGet.exe = .nuget\NuGet.exe
10-
.nuget\NuGet.targets = .nuget\NuGet.targets
11-
EndProjectSection
12-
EndProject
138
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.CollectionJson", "..\..\src\WebApiContrib.CollectionJson\WebApiContrib.CollectionJson.csproj", "{B9F7BC64-7924-4928-910D-2E9E03DC682F}"
149
EndProject
1510
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.Formatting.CollectionJson.Client", "..\..\src\WebApiContrib.Formatting.CollectionJson.Client\WebApiContrib.Formatting.CollectionJson.Client.csproj", "{E86C985A-ECB3-4065-98C3-CBB2039C7170}"
@@ -38,6 +33,10 @@ Global
3833
{F606AFBF-1ADA-40C5-9CDE-5E6E9F2E3F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
3934
{F606AFBF-1ADA-40C5-9CDE-5E6E9F2E3F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
4035
{F606AFBF-1ADA-40C5-9CDE-5E6E9F2E3F77}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{7F98FD89-D157-4623-BB7A-D240BDCD99A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{7F98FD89-D157-4623-BB7A-D240BDCD99A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{7F98FD89-D157-4623-BB7A-D240BDCD99A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{7F98FD89-D157-4623-BB7A-D240BDCD99A0}.Release|Any CPU.Build.0 = Release|Any CPU
4140
EndGlobalSection
4241
GlobalSection(SolutionProperties) = preSolution
4342
HideSolutionNode = FALSE

‎samples/friendapi/app.config‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
20+
</dependentAssembly>
921
</assemblyBinding>
1022
</runtime>
11-
</configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

‎samples/friendapi/packages.config‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.1.1" targetFramework="net40" />
4-
<package id="Autofac.WebApi" version="3.1.0" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
6-
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
7-
<package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.20918.0" targetFramework="net40" />
8-
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
9-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
3+
<package id="Autofac" version="3.2.0" targetFramework="net45" />
4+
<package id="Autofac.WebApi2" version="3.2.0" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.0" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
9+
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
10+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1011
</packages>

‎src/.nuget/NuGet.Config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/.nuget/NuGet.exe‎

-635 KB
Binary file not shown.

0 commit comments

Comments
 (0)