Fix nuget packaging

diff --git a/src/OpenTK/OpenTK.Tizen.csproj b/src/OpenTK/OpenTK.Tizen.csproj
index 280fefd..ba8fdf7 100644 (file)
--- a/src/OpenTK/OpenTK.Tizen.csproj
+++ b/src/OpenTK/OpenTK.Tizen.csproj
@@ -9,6 +9,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <DefineConstants>TIZEN;OPENGLES;SDL2;__MOBILE__</DefineConstants>
     <NoWarn>$(NoWarn);CS3021</NoWarn>
   </PropertyGroup>
@@ -17,6 +18,14 @@
     <TizenNETVersion>5.0.0.14428</TizenNETVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NuspecFile>OpenTK.Tizen.nuspec</NuspecFile>
+    <NuspecBasePath>$(MSBuildThisFileDirectory)</NuspecBasePath>
+    <NuspecProperties>version=$(Version);configuration=$(Configuration);fxversion=$(TizenNETVersion)</NuspecProperties>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)" />
   </ItemGroup>
@@ -63,26 +72,8 @@
     <Compile Include="Platform/Tizen/*.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <PackDependsOn>
-      $(PackDependsOn);
-      _PreparePackForTizen
-    </PackDependsOn>
-  </PropertyGroup>
-
-  <Target Name="_PreparePackForTizen">
-    <PropertyGroup>
-      <IncludeBuildOutput>false</IncludeBuildOutput>
-      <NoPackageAnalysis>true</NoPackageAnalysis>
-      <NuspecBasePath>$(MSBuildThisFileDirectory)</NuspecBasePath>
-      <NuspecProperties>fxversion=$(TizenNETVersion);targetdir=$(OutDir)</NuspecProperties>
-      <NuspecFile>OpenTK.Tizen.nuspec</NuspecFile>
-    </PropertyGroup>
-  </Target>
-
   <!-- Rewrite OpenTK.dll after building -->
-  <Target Name="_AfterBuild" AfterTargets="Build"
-          Condition="'$(IsDummyBuild)' != 'True'">
+  <Target Name="_AfterBuild" AfterTargets="Build">
     <!-- Copy dependent files to output dir -->
     <ItemGroup>
       <_DependentFilesToCopy Include="@(ResolvedCompileFileDefinitions)" Condition="'%(NuGetPackageId)' == 'Tizen.NET.API5'" />

diff --git a/src/OpenTK/OpenTK.Tizen.nuspec b/src/OpenTK/OpenTK.Tizen.nuspec
index 833e0a0..93b94b5 100644 (file)
--- a/src/OpenTK/OpenTK.Tizen.nuspec
+++ b/src/OpenTK/OpenTK.Tizen.nuspec
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
+    <id>OpenTK.Tizen</id>
+    <version>$version$</version>
     <authors>The Open Toolkit Teams</authors>
     <owners>Samsung Electronics</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -19,7 +21,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="$targetdir$\ref\OpenTK.dll"  target="ref\tizen50" />
-    <file src="$targetdir$\OpenTK.xml"  target="ref\tizen50" />
+    <file src="bin\$configuration$\netstandard2.0\ref\OpenTK.dll" target="ref\tizen50" />
+    <file src="bin\$configuration$\netstandard2.0\OpenTK.xml" target="ref\tizen50" />
   </files>
 </package>