projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3900426)
Add targets/props into netstandard2.0
authorXianbing Teng <xb.teng@samsung.com>
Fri, 25 Feb 2022 08:49:38 +0000 (16:49 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Thu, 10 Mar 2022 08:03:31 +0000 (17:03 +0900)
pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.props [new file with mode: 0755] patch | blob
pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.targets [new file with mode: 0755] patch | blob
pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.props [moved from pkg/Tizen.NET.API10/build/Tizen.NET.API10.props with 62% similarity] patch | blob | history
pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.targets [moved from pkg/Tizen.NET.API10/build/Tizen.NET.API10.targets with 71% similarity] patch | blob | history
pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll patch | blob | history

diff --git a/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.props b/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.props
new file mode 100755 (executable)
index 0000000..6fdaccb
--- /dev/null
+++ b/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.props
@@ -0,0 +1,10 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.props')" />
+  </ImportGroup>
+</Project>
diff --git a/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.targets b/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.targets
new file mode 100755 (executable)
index 0000000..efd2617
--- /dev/null
+++ b/pkg/Tizen.NET.API10/build/netstandard2.0/Tizen.NET.API10.targets
@@ -0,0 +1,14 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_TizenNETCoreAppPackageVersion>3.0.0</_TizenNETCoreAppPackageVersion>
+  </PropertyGroup>
+
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.targets')" />
+  </ImportGroup>
+</Project>
diff --git a/pkg/Tizen.NET.API10/build/Tizen.NET.API10.props b/pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.props
similarity index 62%
rename from pkg/Tizen.NET.API10/build/Tizen.NET.API10.props
rename to pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.props
index 66436a9..84a74f0 100755 (executable)
--- a/pkg/Tizen.NET.API10/build/Tizen.NET.API10.props
+++ b/pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.props
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageConflictPlatformManifests Include="$(MSBuildThisFileDirectory)tizen10.0\PlatformManifest.txt" />
+    <PackageConflictPlatformManifests Include="$(MSBuildThisFileDirectory)PlatformManifest.txt" />
   </ItemGroup>
 
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Tizen.NUI.XamlBuild.props" Condition="Exists('$(MSBuildThisFileDirectory)..\buildTransitive\Tizen.NUI.XamlBuild.props')" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.props')" />
   </ImportGroup>
 </Project>
diff --git a/pkg/Tizen.NET.API10/build/Tizen.NET.API10.targets b/pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.targets
similarity index 71%
rename from pkg/Tizen.NET.API10/build/Tizen.NET.API10.targets
rename to pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.targets
index 0d5916f..03572f8 100755 (executable)
--- a/pkg/Tizen.NET.API10/build/Tizen.NET.API10.targets
+++ b/pkg/Tizen.NET.API10/build/tizen10.0/Tizen.NET.API10.targets
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="$(MSBuildThisFileDirectory)tizen10.0\ref\*.dll">
+    <Reference Include="$(MSBuildThisFileDirectory)ref\*.dll">
       <Private>false</Private>
       <Visible>false</Visible>
       <NuGetPackageId>Microsoft.NETCore.App.Ref</NuGetPackageId>
@@ -18,6 +18,6 @@
   </ItemGroup>
 
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Tizen.NUI.XamlBuild.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\buildTransitive\Tizen.NUI.XamlBuild.targets')" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildTransitive\Tizen.NUI.XamlBuild.targets')" />
   </ImportGroup>
 </Project>
diff --git a/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll b/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll
index 72e47b7..2e7d51f 100644 (file)
Binary files a/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll and b/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll differ
Domain: Dotnet / Frameworks;