Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream-master/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
deipax committed Sep 28, 2017
2 parents c4fb91f + a1eac1b commit efefcf4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ bld/
[Bb]in/
[Oo]bj/
*.out
*.ide

# MSTest test Results
[Tt]est[Rr]esult*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RootNamespace>CloneExtensions.UnitTests</RootNamespace>
<AssemblyName>CloneExtensions.UnitTests</AssemblyName>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<Version>1.4.1.1</Version>
<Version>1.4.2.0</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\CloneExtensions\CloneExtensions.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/CloneExtensions/CloneExtensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<RootNamespace>CloneExtensions</RootNamespace>
<AssemblyName>CloneExtensions</AssemblyName>
<TargetFrameworks>netstandard1.6</TargetFrameworks>
<Version>1.4.1.1</Version>
<TargetFrameworks>netstandard1.6;net45;net46</TargetFrameworks>
<Version>1.4.2.0</Version>
</PropertyGroup>
<PropertyGroup>
<Description>Performs fast, deep or shallow clone using simple assignment operations generated by Expression Tree runtime code compilation.</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/CloneExtensions/CloneExtensions.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>$id$</id>
<version>1.4.2</version>
<version>1.4.2.0</version>
<title>CloneExtensions</title>
<authors>Marcin Juraszek</authors>
<owners>Marcin Juraszek</owners>
Expand Down

0 comments on commit efefcf4

Please sign in to comment.