projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95d1a87)
Cherry pick Tizen project changes to 3.6.0 and modify SLN changes VS makes (#6407)
authorShane Neuville <shneuvil@microsoft.com>
Tue, 4 Jun 2019 23:47:21 +0000 (17:47 -0600)
committerGitHub <noreply@github.com>
Tue, 4 Jun 2019 23:47:21 +0000 (17:47 -0600)
* [Tizen] Add TFM identifier and version explictly for vs2019 16.1 (#6304)

* sln changes that vs wants to apply

EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj patch | blob | history
PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj patch | blob | history
Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj patch | blob | history
Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj patch | blob | history
Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj patch | blob | history
Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj patch | blob | history
Xamarin.Forms.sln patch | blob | history

diff --git a/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj b/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj
index 37925dd..f358da8 100644 (file)
--- a/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj
+++ b/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj b/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj
index 9dd5fb2..e49e74b 100644 (file)
--- a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj
+++ b/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <XFDisableTargetsValidation>True</XFDisableTargetsValidation>
   </PropertyGroup>
 
diff --git a/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
index f3ac6c0..c9ad03a 100644 (file)
--- a/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
+++ b/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
@@ -2,6 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AssemblyName>Xamarin.Forms.Platform</AssemblyName>
     <DefineConstants>TIZEN4_0</DefineConstants>
     <OutputType>Library</OutputType>
diff --git a/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj b/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
index a100732..edb20bb 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
+++ b/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
index fb20f50..fc84534 100644 (file)
--- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj
index c6de1ab..4c91d60 100644 (file)
--- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj
+++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj
@@ -4,6 +4,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index b0f0068..f40d3c0 100644 (file)
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -880,6 +880,18 @@ Global
                {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.ActiveCfg = Release|Any CPU
                {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Build.0 = Release|Any CPU
                {5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Deploy.0 = Release|Any CPU
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.ActiveCfg = Debug|ARM
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Build.0 = Debug|ARM
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Deploy.0 = Debug|ARM
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhone.ActiveCfg = Debug|x86
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.ActiveCfg = Debug|x64
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Build.0 = Debug|x64
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Deploy.0 = Debug|x64
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.ActiveCfg = Debug|x86
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Build.0 = Debug|x86
+               {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Deploy.0 = Debug|x86
                {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.ActiveCfg = Release|x86
                {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Build.0 = Release|x86
                {95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Deploy.0 = Release|x86
@@ -1137,6 +1149,18 @@ Global
                {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x64.Build.0 = Release|iPhoneSimulator
                {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.ActiveCfg = Release|iPhoneSimulator
                {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.Build.0 = Release|iPhoneSimulator
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.ActiveCfg = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Build.0 = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Deploy.0 = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhone.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.ActiveCfg = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Build.0 = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Deploy.0 = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Build.0 = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Deploy.0 = Debug|x86
                {73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.ActiveCfg = Release|x86
                {73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Build.0 = Release|x86
                {73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Deploy.0 = Release|x86
@@ -1574,6 +1598,7 @@ Global
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Build.0 = Release|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Deploy.0 = Release|Any CPU
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+               {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|ARM.ActiveCfg = Debug|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.ActiveCfg = Debug|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.Build.0 = Debug|iPhone
@@ -1589,7 +1614,6 @@ Global
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|x64.ActiveCfg = Release|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|x86.ActiveCfg = Release|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|Any CPU.ActiveCfg = Debug|x86
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.ActiveCfg = Debug|ARM
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.Build.0 = Debug|ARM
Domain: Dotnet / UI;