Skip to content

Commit 64f3adc

Browse files
thomaslevesquethomaslevesque
committed
Fix up NuGet package for NuGet v3 and project.json
1 parent c42add3 commit 64f3adc

File tree

7 files changed

+156
-97
lines changed

7 files changed

+156
-97
lines changed

‎Linq.Extras.sln

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linq.Extras", "Linq.Extras\Linq.Extras.csproj", "{93E26A7D-E074-4B93-9B74-24414A12FB3B}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0179FA49-AFDB-429D-823D-F895E4C3393D}"
99
ProjectSection(SolutionItems) = preProject
1010
LICENSE.md = LICENSE.md
11-
NuGet\Linq.Extras.nuspec = NuGet\Linq.Extras.nuspec
1211
README.md = README.md
1312
EndProjectSection
1413
EndProject

‎Linq.Extras/Linq.Extras.csproj

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<DefaultLanguage>en-US</DefaultLanguage>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16-
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
17-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
17+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DebugSymbols>true</DebugSymbols>
@@ -123,6 +123,8 @@
123123
<Generator>TextTemplatingFileGenerator</Generator>
124124
<LastGenOutput>Infer.cs</LastGenOutput>
125125
</None>
126+
<None Include="Linq.Extras.nuspec" />
127+
<None Include="packages.config" />
126128
</ItemGroup>
127129
<ItemGroup>
128130
<Compile Include="XEnumerable.cs" />
@@ -146,11 +148,16 @@
146148
</EmbeddedResource>
147149
</ItemGroup>
148150
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
149-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
150-
Other similar extension points exist, see Microsoft.Common.targets.
151-
<Target Name="BeforeBuild">
152-
</Target>
153-
<Target Name="AfterBuild">
154-
</Target>
151+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
152+
Other similar extension points exist, see Microsoft.Common.targets.
153+
<Target Name="BeforeBuild">
154+
</Target>
155155
-->
156+
<Target Name="AfterBuild">
157+
<Copy SkipUnchangedFiles="true" SourceFiles="$(OutDir)$(TargetName).dll" DestinationFiles="$(OutDir)nupkg\lib\dotnet\$(TargetName).dll" />
158+
<Copy SkipUnchangedFiles="true" SourceFiles="$(OutDir)$(TargetName).xml" DestinationFiles="$(OutDir)nupkg\lib\dotnet\$(TargetName).xml" />
159+
<Copy SkipUnchangedFiles="true" SourceFiles="$(OutDir)$(TargetName).dll" DestinationFiles="$(OutDir)nupkg\lib\portable-net45+win8+wpa81+wp8\$(TargetName).dll" />
160+
<Copy SkipUnchangedFiles="true" SourceFiles="$(OutDir)$(TargetName).xml" DestinationFiles="$(OutDir)nupkg\lib\portable-net45+win8+wpa81+wp8\$(TargetName).xml" />
161+
<Exec Command="$(SolutionDir)packages\NuGet.CommandLine.2.8.6\tools\NuGet.exe pack Linq.Extras.nuspec -BasePath $(OutDir)nupkg -OutputDirectory $(OutDir)" WorkingDirectory="$(ProjectDir)" Outputs="$(OutDir)*.nupkg" />
162+
</Target>
156163
</Project>

‎Linq.Extras/Linq.Extras.nuspec

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Linq.Extras</id>
5+
<version>1.0.3</version>
6+
<title>Linq.Extras</title>
7+
<authors>Thomas Levesque</authors>
8+
<description>A set of helper and extension methods to complement the System.Linq namespace. NuGet 2.8.6 or later.</description>
9+
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
10+
<projectUrl>http://thomaslevesque.github.io/Linq.Extras/</projectUrl>
11+
<tags>linq</tags>
12+
<releaseNotes>
13+
- 1.0.3: fixed up NuGet package for compatibility with NuGet v3 and project.json (note: requires NuGet 2.8.6 or later)
14+
- 1.0.2: added GroupUntilChanged and GroupUntilChangedBy
15+
- 1.0.1: added ToArray and ToList with count parameter (perf optimization)
16+
- 1.0.0: initial release
17+
</releaseNotes>
18+
<dependencies>
19+
<group targetFramework="net" />
20+
<group targetFramework="win" />
21+
<group targetFramework="wp" />
22+
<group targetFramework="wpa" />
23+
<group targetFramework="MonoAndroid" />
24+
<group targetFramework="MonoTouch" />
25+
<group targetFramework="Xamarin.iOS" />
26+
<group targetFramework="portable-net45+win8+wpa81+wp8" />
27+
<group targetFramework="uap">
28+
<dependency id="System.Runtime" version="4.0.0.0" />
29+
<dependency id="System.Resources.ResourceManager" version="4.0.0.0" />
30+
<dependency id="System.Diagnostics.Debug" version="4.0.0.0" />
31+
<dependency id="System.Linq" version="4.0.0.0" />
32+
<dependency id="System.Collections" version="4.0.0.0" />
33+
<dependency id="System.Runtime.Extensions" version="4.0.0.0" />
34+
<dependency id="System.Linq.Expressions" version="4.0.0.0" />
35+
<dependency id="System.Diagnostics.Tools" version="4.0.0.0" />
36+
<dependency id="System.Globalization" version="4.0.0.0" />
37+
<dependency id="System.Reflection" version="4.0.0.0" />
38+
</group>
39+
<group targetFramework="dotnet">
40+
<dependency id="System.Runtime" version="4.0.0.0" />
41+
<dependency id="System.Resources.ResourceManager" version="4.0.0.0" />
42+
<dependency id="System.Diagnostics.Debug" version="4.0.0.0" />
43+
<dependency id="System.Linq" version="4.0.0.0" />
44+
<dependency id="System.Collections" version="4.0.0.0" />
45+
<dependency id="System.Runtime.Extensions" version="4.0.0.0" />
46+
<dependency id="System.Linq.Expressions" version="4.0.0.0" />
47+
<dependency id="System.Diagnostics.Tools" version="4.0.0.0" />
48+
<dependency id="System.Globalization" version="4.0.0.0" />
49+
<dependency id="System.Reflection" version="4.0.0.0" />
50+
</group>
51+
</dependencies>
52+
</metadata>
53+
</package>

‎Linq.Extras/Properties/Resources.Designer.cs

Lines changed: 82 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Linq.Extras/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NuGet.CommandLine" version="2.8.6" targetFramework="portable45-net45+win8+wp8+wpa81" />
4+
</packages>

‎NuGet/Linq.Extras.nuspec

-1.94 KB
Binary file not shown.

‎buildPackage.bat

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)