Skip to content

Commit bba34e5

Browse files
jehhynesjehhynes
committed
.nuspec declares target frameworks
1 parent 5cb6634 commit bba34e5

File tree

4 files changed

+50
-29
lines changed

4 files changed

+50
-29
lines changed

‎Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("3.6.0")]
19-
[assembly: AssemblyFileVersion("3.6.0")]
18+
[assembly: AssemblyVersion("3.6.1")]
19+
[assembly: AssemblyFileVersion("3.6.1")]
2020
//[assembly: AssemblyInformationalVersion("2.5-filters")]

‎Build/Griddly.Core.nuspec

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,37 @@
11
<?xml version="1.0"?>
22
<!-- http://www.jeremyskinner.co.uk/2011/01/12/automating-nuget-package-creation-with-msbuild-and-powershell/ -->
33
<package>
4-
<metadata>
5-
<id>Griddly.Core</id>
6-
<version></version>
7-
<authors>Chris Hynes, Joel Potter</authors>
8-
<projectUrl>https://github.com/programcsharp/griddly</projectUrl>
9-
<iconUrl>https://raw.githubusercontent.com/programcsharp/griddly/master/Griddly/Content/griddly-32.png</iconUrl>
10-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11-
<license type="expression">MIT</license>
12-
<description>Pagable sortable MVC enabled grid (core files only)</description>
13-
<!--<summary></summary>-->
14-
<language>en-US</language>
15-
<dependencies>
16-
<group>
17-
<dependency id="CsvHelper" version="6.1.1" />
18-
<dependency id="Dapper" version="1.50.2" />
19-
<dependency id="EPPlus" version="4.5.3" />
20-
<dependency id="Newtonsoft.Json" version="11.0.2" />
21-
</group>
22-
</dependencies>
23-
</metadata>
4+
<metadata>
5+
<id>Griddly.Core</id>
6+
<version></version>
7+
<authors>Chris Hynes, Joel Potter</authors>
8+
<projectUrl>https://github.com/programcsharp/griddly</projectUrl>
9+
<iconUrl>https://raw.githubusercontent.com/programcsharp/griddly/master/Griddly/Content/griddly-32.png</iconUrl>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<license type="expression">MIT</license>
12+
<description>Pagable sortable MVC enabled grid (core files only)</description>
13+
<!--<summary></summary>-->
14+
<language>en-US</language>
15+
16+
<dependencies>
17+
<group targetFramework="net45">
18+
<dependency id="CsvHelper" version="6.1.1" />
19+
<dependency id="Dapper" version="1.50.2" />
20+
<dependency id="EPPlus" version="4.5.3" />
21+
<dependency id="Newtonsoft.Json" version="11.0.2" />
22+
</group>
23+
<group targetFramework="netcoreapp3.1">
24+
<dependency id="CsvHelper" version="6.1.1" />
25+
<dependency id="Dapper" version="1.50.2" />
26+
<dependency id="EPPlus" version="4.5.3" />
27+
<dependency id="Newtonsoft.Json" version="11.0.2" />
28+
</group>
29+
<group targetFramework="net5.0">
30+
<dependency id="CsvHelper" version="6.1.1" />
31+
<dependency id="Dapper" version="1.50.2" />
32+
<dependency id="EPPlus" version="4.5.3" />
33+
<dependency id="Newtonsoft.Json" version="11.0.2" />
34+
</group>
35+
</dependencies>
36+
</metadata>
2437
</package>

‎Build/Griddly.nuspec

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,21 @@
1212
<description>Pagable, sortable, MVC enabled grid</description>
1313
<language>en-US</language>
1414
<dependencies>
15-
<group>
16-
<dependency id="Griddly.Core" version="" />
17-
</group>
15+
<group targetFramework="net45">
16+
<dependency id="Griddly.Core" version="" />
17+
</group>
18+
<group targetFramework="netcoreapp3.1">
19+
<dependency id="Griddly.Core" version="" />
20+
</group>
21+
<group targetFramework="net5.0">
22+
<dependency id="Griddly.Core" version="" />
23+
</group>
1824
</dependencies>
1925
<frameworkAssemblies>
20-
<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework=".NETCoreApp3.1" />
21-
<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework=".NETCoreApp3.1" />
26+
<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework="netcoreapp3.1" />
27+
<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework="netcoreapp3.1" />
28+
<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework="net5.0" />
29+
<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework="net5.0" />
2230
</frameworkAssemblies>
2331
</metadata>
2432
</package>

‎Build/build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<Copy SourceFiles="@(Content)" DestinationFolder="$(PackageDir)\Griddly\content\net45\%(RecursiveDir)" />
5050
<Copy SourceFiles="@(Libs)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\net45\%(RecursiveDir)" />
5151
<Copy SourceFiles="@(ContentCoreApp)" DestinationFolder="$(PackageDir)\Griddly\staticwebassets\%(RecursiveDir)" />
52-
<Copy SourceFiles="@(LibsCoreApp)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\netcoreapp3.1\%(RecursiveDir)" />
53-
<Copy SourceFiles="@(LibsCoreAppRazor)" DestinationFolder="$(PackageDir)\Griddly\lib\netcoreapp3.1\%(RecursiveDir)" />
52+
<Copy SourceFiles="@(LibsCoreApp)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\netcoreapp\%(RecursiveDir)" />
53+
<Copy SourceFiles="@(LibsCoreAppRazor)" DestinationFolder="$(PackageDir)\Griddly\lib\netcoreapp\%(RecursiveDir)" />
5454
<Copy SourceFiles="@(BuildCoreApp)" DestinationFolder="$(PackageDir)\Griddly\%(RecursiveDir)" />
5555

5656
<!-- Get the version number of the main assembly to insert into the nuspec files -->

0 commit comments

Comments
 (0)