Skip to content
This repository has been archived by the owner on Jan 7, 2023. It is now read-only.

Commit

Permalink
Update Assemblies
Browse files Browse the repository at this point in the history
  • Loading branch information
@RickStrahl
RickStrahl committed Apr 1, 2015
1 parent 5eec949 commit 05076e4
Show file tree
Hide file tree
Showing 26 changed files with 164 additions and 128 deletions.
1 change: 1 addition & 0 deletions Samples/AlbumViewer/AlbumViewerAngular/AlbumViewerAngular.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
<Content Include="app\js\artistsController.js" />
<Content Include="app\js\artistService.js" />
<Content Include="app\js\artistServiceLocal.js" />
<Content Include="app\js\errorService.js" />
<Content Include="app\js\headerController.js" />
<Content Include="app\views\about.html" />
<Content Include="app\views\album.html" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/AlbumViewer/AlbumViewerAngular/Web.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=301880
Expand Down
4 changes: 2 additions & 2 deletions Samples/WestwindToolkitMvcWeb/WestwindToolkitMvcWeb.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion Samples/WestwindToolkitMvcWeb/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net451" />
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="jQuery" version="1.11.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net451" />
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net451" />
Expand Down
4 changes: 2 additions & 2 deletions Tests/Westwind.Data.Test/Westwind.Data.Test/Westwind.Data.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=1.10.0.62, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Westwind.Data.Test/Westwind.Data.Test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="mongocsharpdriver" version="1.10.0" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Tests/Westwind.Utilities.Test/Westwind.Utilities.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion Tests/Westwind.Utilities.Test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
</packages>
11 changes: 5 additions & 6 deletions WestWind.Data.Models/WestWind.Data.Models.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down Expand Up @@ -82,9 +83,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Westwind.Data\Westwind.Data.csproj">
Expand Down
2 changes: 1 addition & 1 deletion WestWind.Data.Models/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Westwind.Data.MongoDb/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.58.0")]
[assembly: AssemblyFileVersion("2.58.0")]
[assembly: AssemblyVersion("2.62.0")]
[assembly: AssemblyFileVersion("2.62.0")]
4 changes: 2 additions & 2 deletions Westwind.Data/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,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.61.0")]
[assembly: AssemblyFileVersion("2.61.0")]
[assembly: AssemblyVersion("2.62.0")]
[assembly: AssemblyFileVersion("2.62.0")]
4 changes: 2 additions & 2 deletions Westwind.Data/Westwind.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion Westwind.Data/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
</packages>
Binary file modified libs/Westwind.Data.MongoDb.dll
View file
Binary file not shown.
Binary file modified libs/Westwind.Data.dll
View file
Binary file not shown.
Binary file modified libs/Westwind.Utilities.dll
View file
Binary file not shown.
19 changes: 16 additions & 3 deletions libs/Westwind.Utilities.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified libs/Westwind.Web.Mvc.dll
View file
Binary file not shown.
Binary file modified libs/Westwind.Web.WebApi.dll
View file
Binary file not shown.
142 changes: 71 additions & 71 deletions libs/Westwind.Web.WebApi.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified libs/Westwind.Web.WebForms.dll
View file
Binary file not shown.
Binary file modified libs/Westwind.Web.dll
View file
Binary file not shown.
Loading

0 comments on commit 05076e4

Please sign in to comment.