.nuspec declares target frameworks

programcsharp · Jun 8, 2021 · bba34e5 · bba34e5
1 parent 5cb6634
commit bba34e5
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 29 deletions.
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.6.0")]
-[assembly: AssemblyFileVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyFileVersion("3.6.1")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]
diff --git a/Build/Griddly.Core.nuspec b/Build/Griddly.Core.nuspec
@@ -1,24 +1,37 @@
 <?xml version="1.0"?>
 <!-- http://www.jeremyskinner.co.uk/2011/01/12/automating-nuget-package-creation-with-msbuild-and-powershell/ -->
 <package>
-  <metadata>
-    <id>Griddly.Core</id>
-    <version></version>
-    <authors>Chris Hynes, Joel Potter</authors>
-    <projectUrl>https://github.com/programcsharp/griddly</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/programcsharp/griddly/master/Griddly/Content/griddly-32.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <description>Pagable sortable MVC enabled grid (core files only)</description>
-    <!--<summary></summary>-->
-    <language>en-US</language>
-    <dependencies> 
-      <group>
-        <dependency id="CsvHelper" version="6.1.1" />
-        <dependency id="Dapper" version="1.50.2" />
-        <dependency id="EPPlus" version="4.5.3" />
-        <dependency id="Newtonsoft.Json" version="11.0.2" />
-      </group>
-    </dependencies>
-  </metadata>
+	<metadata>
+		<id>Griddly.Core</id>
+		<version></version>
+		<authors>Chris Hynes, Joel Potter</authors>
+		<projectUrl>https://github.com/programcsharp/griddly</projectUrl>
+		<iconUrl>https://raw.githubusercontent.com/programcsharp/griddly/master/Griddly/Content/griddly-32.png</iconUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<license type="expression">MIT</license>
+		<description>Pagable sortable MVC enabled grid (core files only)</description>
+		<!--<summary></summary>-->
+		<language>en-US</language>
+
+		<dependencies>
+			<group targetFramework="net45">
+				<dependency id="CsvHelper" version="6.1.1" />
+				<dependency id="Dapper" version="1.50.2" />
+				<dependency id="EPPlus" version="4.5.3" />
+				<dependency id="Newtonsoft.Json" version="11.0.2" />
+			</group>
+			<group targetFramework="netcoreapp3.1">
+				<dependency id="CsvHelper" version="6.1.1" />
+				<dependency id="Dapper" version="1.50.2" />
+				<dependency id="EPPlus" version="4.5.3" />
+				<dependency id="Newtonsoft.Json" version="11.0.2" />
+			</group>
+			<group targetFramework="net5.0">
+				<dependency id="CsvHelper" version="6.1.1" />
+				<dependency id="Dapper" version="1.50.2" />
+				<dependency id="EPPlus" version="4.5.3" />
+				<dependency id="Newtonsoft.Json" version="11.0.2" />
+			</group>
+		</dependencies>
+	</metadata>
 </package>
diff --git a/Build/Griddly.nuspec b/Build/Griddly.nuspec
@@ -12,13 +12,21 @@
     <description>Pagable, sortable, MVC enabled grid</description>
     <language>en-US</language>
 	<dependencies> 
-      <group>
-        <dependency id="Griddly.Core" version="" />
-      </group>
+        <group targetFramework="net45">
+            <dependency id="Griddly.Core" version="" />
+        </group>
+        <group targetFramework="netcoreapp3.1">
+            <dependency id="Griddly.Core" version="" />
+        </group>
+		<group targetFramework="net5.0">
+			<dependency id="Griddly.Core" version="" />
+		</group>
     </dependencies>
 	<frameworkAssemblies>
-		<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework=".NETCoreApp3.1" />
-		<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework=".NETCoreApp3.1" />
+		<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework="netcoreapp3.1" />
+		<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework="netcoreapp3.1" />
+		<frameworkAssembly assemblyName="Griddly.NetCore.Razor" targetFramework="net5.0" />
+		<frameworkAssembly assemblyName="Griddly.NetCore.Razor.Views" targetFramework="net5.0" />
 	</frameworkAssemblies>
   </metadata>
 </package>
diff --git a/Build/build.proj b/Build/build.proj
@@ -49,8 +49,8 @@
 	<Copy SourceFiles="@(Content)" DestinationFolder="$(PackageDir)\Griddly\content\net45\%(RecursiveDir)" />
 	<Copy SourceFiles="@(Libs)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\net45\%(RecursiveDir)" />
 	<Copy SourceFiles="@(ContentCoreApp)" DestinationFolder="$(PackageDir)\Griddly\staticwebassets\%(RecursiveDir)" />
-	<Copy SourceFiles="@(LibsCoreApp)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\netcoreapp3.1\%(RecursiveDir)" />
-	<Copy SourceFiles="@(LibsCoreAppRazor)" DestinationFolder="$(PackageDir)\Griddly\lib\netcoreapp3.1\%(RecursiveDir)" />
+	<Copy SourceFiles="@(LibsCoreApp)" DestinationFolder="$(PackageDir)\Griddly.Core\lib\netcoreapp\%(RecursiveDir)" />
+	<Copy SourceFiles="@(LibsCoreAppRazor)" DestinationFolder="$(PackageDir)\Griddly\lib\netcoreapp\%(RecursiveDir)" />
 	<Copy SourceFiles="@(BuildCoreApp)" DestinationFolder="$(PackageDir)\Griddly\%(RecursiveDir)" />
 
     <!-- Get the version number of the main assembly to insert into the nuspec files -->