Skip to content

Commit

Permalink
- v10.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
eben-roux committed Jul 4, 2018
1 parent e92ffed commit 695d7f9
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 13 deletions.
13 changes: 7 additions & 6 deletions Shuttle.Core.Data.Tests/Shuttle.Core.Data.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject />
Expand All @@ -17,12 +17,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Moq" Version="4.8.1" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="Moq" Version="4.8.3" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Binary file modified Shuttle.Core.Data/.build/Shuttle.MSBuild.dll
Binary file not shown.
1 change: 1 addition & 0 deletions Shuttle.Core.Data/.build/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<licenseUrl>https://github.com/shuttle/Shuttle.Core.Data/raw/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/shuttle/Shuttle.Core.Data</projectUrl>
<iconUrl>https://raw.githubusercontent.com/Shuttle/Shuttle.Core.Data/master/.media/logo.png</iconUrl>
<repository type="git" url="https://github.com/Shuttle/Shuttle.Core.Data.git" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Provides an abstraction over ADO.NET.</description>
<releaseNotes/>
Expand Down
8 changes: 6 additions & 2 deletions Shuttle.Core.Data/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@
[assembly: AssemblyTitle(".NET Core 2.0")]
#endif

#if NETCOREAPP2_1
[assembly: AssemblyTitle(".NET Core 2.1")]
#endif

#if NETSTANDARD2_0
[assembly: AssemblyTitle(".NET Standard 2.0")]
#endif

[assembly: AssemblyVersion("10.0.5.0")]
[assembly: AssemblyVersion("10.0.6.0")]
[assembly: AssemblyCopyright("Copyright © Eben Roux 2017")]
[assembly: AssemblyProduct("Shuttle.Core.Data")]
[assembly: AssemblyCompany("Shuttle")]
[assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyInformationalVersion("10.0.5")]
[assembly: AssemblyInformationalVersion("10.0.6")]
[assembly: ComVisible(false)]
11 changes: 6 additions & 5 deletions Shuttle.Core.Data/Shuttle.Core.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;net461;net462;net47;net471;netstandard2.0;netcoreapp2.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFrameworks>net461;net462;net47;net471;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,10 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Shuttle.Core.Configuration" Version="10.0.0" />
<PackageReference Include="Shuttle.Core.Container" Version="10.0.6" />
<PackageReference Include="Shuttle.Core.Logging" Version="10.0.1" />
<PackageReference Include="Shuttle.Core.Configuration" Version="10.0.1" />
<PackageReference Include="Shuttle.Core.Container" Version="10.0.8" />
<PackageReference Include="Shuttle.Core.Logging" Version="10.0.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 695d7f9

Please sign in to comment.