Skip to content

Commit

Permalink
Make package copyright more manageable
Browse files Browse the repository at this point in the history
This puts the copyright notice extenral to main project file and
friendlier to eyes and version control management (fewer chances of
merge conflicts). It also takes care of an annoying problem where
Visual Studio would re-encoding the `&morelinq#169;` to the copyright
symbol whenever the project file would be opened in the IDE and
which would show up as artificial changes ready for commit to the
version control repository.
  • Loading branch information
atifaziz committed Mar 23, 2018
1 parent 0ccc5b8 commit 5ad653b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/

Expand Down
2 changes: 1 addition & 1 deletion MoreLinq.Test/MoreLinq.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\dotnet-netfx-mono.props" />
<Import Project="..\bld\DotNetSdkMono.props" />

<PropertyGroup>
<AssemblyTitle>MoreLinq.Test</AssemblyTitle>
Expand Down
5 changes: 3 additions & 2 deletions MoreLinq/MoreLinq.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\dotnet-netfx-mono.props" />
<Import Project="..\bld\DotNetSdkMono.props" />
<Import Project="..\bld\Copyright.props" />

<PropertyGroup>
<Title>MoreLINQ</Title>
Expand Down Expand Up @@ -99,7 +100,7 @@
- ZipShortest
</Description>
<Description>$([System.Text.RegularExpressions.Regex]::Replace($(Description), `\s+`, ` `).Trim().Replace(` - `, `, `).Replace(`:,`, `:`))</Description>
<Copyright>&#169; 2008 Jonathan Skeet. Portions &#169; 2009 Atif Aziz, Chris Ammerman, Konrad Rudolph. Portions &#169; 2010 Johannes Rudolph, Leopold Bushkin. Portions &#169; 2015 Felipe Sateler, &#8220;sholland&#8221;. Portions &#169; 2016 Andreas Gullberg Larsen, Leandro F. Vieira (leandromoh). Portions &#169; 2017 Jonas Nyrup (jnyrup). Portions &#169; Microsoft. All rights reserved.</Copyright>
<Copyright>$([System.Text.RegularExpressions.Regex]::Replace($(Copyright), `\s+`, ` `).Trim())</Copyright>
<AssemblyTitle>MoreLINQ</AssemblyTitle>
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>3.0.0</VersionPrefix>
Expand Down
13 changes: 13 additions & 0 deletions bld/Copyright.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<PropertyGroup>
<Copyright>
&#169; 2008 Jonathan Skeet.
Portions &#169; 2009 Atif Aziz, Chris Ammerman, Konrad Rudolph.
Portions &#169; 2010 Johannes Rudolph, Leopold Bushkin.
Portions &#169; 2015 Felipe Sateler, &#8220;sholland&#8221;.
Portions &#169; 2016 Andreas Gullberg Larsen, Leandro F. Vieira (leandromoh).
Portions &#169; 2017 Jonas Nyrup (jnyrup).
Portions &#169; Microsoft. All rights reserved.
</Copyright>
</PropertyGroup>
</Project>
File renamed without changes.

0 comments on commit 5ad653b

Please sign in to comment.