Skip to content

Commit

Permalink
Merge pull request #62 from edtbot/from-tfs
Browse files Browse the repository at this point in the history
Merge changes from TFS
  • Loading branch information
jaredmoo committed Sep 9, 2015
2 parents 9afce73 + 6db9bc0 commit 4db42a4
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions Samples/Dapper/ElasticDapper.csproj
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"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{7B67F0A1-A5A9-477B-9B7E-FA2E16ED34DE}</ProjectGuid>
Expand Down Expand Up @@ -36,7 +36,7 @@
<Reference Include="$(NugetPack)\DapperExtensions.1.4.4\lib\net40\DapperExtensions.dll">
<Name>DapperExtensions</Name>
</Reference>
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -65,4 +65,4 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions Samples/Dapper/ElasticDapper.csproj.SamplesGallery
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Reference Include="..\packages\DapperExtensions.1.4.4\lib\net40\DapperExtensions.dll">
<Name>DapperExtensions</Name>
</Reference>
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -72,4 +72,4 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions Samples/Dapper/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapper" version="1.36" targetFramework="net45" />
<package id="DapperExtensions" version="1.4.4" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.1.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Reference Include="$(NugetPack)\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll">
<Name>EntityFramework.SqlServer</Name>
</Reference>
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="$(NugetPack)\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Reference Include="..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll">
<Name>EntityFramework.SqlServer</Name>
</Reference>
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll">
Expand Down
2 changes: 1 addition & 1 deletion Samples/EFCodeFirst/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
<package id="EntityFramework" version="6.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.1.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Reference Include="$(NugetPack)\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll">
<Name>EntityFramework.SqlServer</Name>
</Reference>
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="$(NugetPack)\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Reference Include="..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll">
<Name>EntityFramework.SqlServer</Name>
</Reference>
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll">
Expand Down
2 changes: 1 addition & 1 deletion Samples/EFMultiTenant/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
<package id="EntityFramework" version="6.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.1.0" targetFramework="net45" />
</packages>
6 changes: 3 additions & 3 deletions Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj
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"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
Expand Down Expand Up @@ -30,7 +30,7 @@
<Reference Include="$(NugetPack)\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll">
<Name>Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data</Name>
</Reference>
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -65,4 +65,4 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Reference Include="..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll">
<Name>Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data</Name>
</Reference>
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/ElasticScaleStarterKit/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.1.0" targetFramework="net45" />
</packages>
6 changes: 3 additions & 3 deletions Samples/ShardSqlCmd/ShardSqlCmd.csproj
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"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
Expand All @@ -24,7 +24,7 @@
- $(NugetPack) must be replaced with ..\packages
-->
<ItemGroup>
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="$(NugetPack)\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand All @@ -41,4 +41,4 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion Samples/ShardSqlCmd/ShardSqlCmd.csproj.SamplesGallery
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.0.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Reference Include="..\packages\Microsoft.Azure.SqlDatabase.ElasticScale.Client.1.1.0\lib\net45\Microsoft.Azure.SqlDatabase.ElasticScale.Client.dll">
<Name>Microsoft.Azure.SqlDatabase.ElasticScale.Client</Name>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/ShardSqlCmd/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.SqlDatabase.ElasticScale.Client" version="1.1.0" targetFramework="net45" />
</packages>

0 comments on commit 4db42a4

Please sign in to comment.