Skip to content

Commit

Permalink
Use NETStandard 2.0
Browse files Browse the repository at this point in the history 
Change-Id: I5d6077141cad35d26af736e1af482a57b3c8d467
  • Loading branch information
@WonyoungChoi
WonyoungChoi committed Sep 7, 2017
1 parent 0f95fdb commit 65db8fd
Show file tree
Hide file tree
Showing 92 changed files with 97 additions and 232 deletions.
6 changes: 3 additions & 3 deletions build/build.dummy.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<Import Project="$(MSBuildThisFileDirectory)version.props" />

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDependencyFile>false</GenerateDependencyFile>
<DummyAssemblyVersion>$(VersionPrefix)</DummyAssemblyVersion>
<BaseIntermediateOutputPath>$(OutputBaseDir)obj\</BaseIntermediateOutputPath>
<OutDir>$(OutputDummyDir)</OutDir>
</PropertyGroup>

Expand All @@ -36,7 +35,7 @@
<Target Name="CopyFilesToOutputDirectory" />

<!-- Target for preparing reference lib directory -->
<Target Name="Prepare">
<Target Name="Prepare" DependsOnTargets="ResolveAssemblyReferences">
<ItemGroup>
<ReferencePath Include="@(TizenAssemblies)" />
</ItemGroup>
Expand Down Expand Up @@ -115,6 +114,7 @@
</Target>

<Target Name="AfterBuild" DependsOnTargets="Prepare;GenerateDummy">
<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
</Target>

</Project>
Expand Down
2 changes: 0 additions & 2 deletions build/common.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@

<Import Project="$(MSBuildThisFileDirectory)version.props" />

<Import Project="$(MSBuildThisFileDirectory)dependencies.props" />

</Project>
7 changes: 0 additions & 7 deletions build/dependencies.props
View file

This file was deleted.

12 changes: 6 additions & 6 deletions pkg/Tizen.NET.Private.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

<file src="pkg\build\**" target="build" />

<file src="Artifacts\bin\public\*.dll" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.pdb" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.xml" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.dll" target="lib\netstandard2.0" />
<file src="Artifacts\bin\public\*.pdb" target="lib\netstandard2.0" />
<file src="Artifacts\bin\public\*.xml" target="lib\netstandard2.0" />

<file src="Artifacts\bin\platform\*.dll" target="lib\netstandard1.6" />
<file src="Artifacts\bin\platform\*.pdb" target="lib\netstandard1.6" />
<file src="Artifacts\bin\platform\*.xml" target="lib\netstandard1.6" />
<file src="Artifacts\bin\platform\*.dll" target="lib\netstandard2.0" />
<file src="Artifacts\bin\platform\*.pdb" target="lib\netstandard2.0" />
<file src="Artifacts\bin\platform\*.xml" target="lib\netstandard2.0" />

</files>
</package>
6 changes: 3 additions & 3 deletions pkg/Tizen.NET.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
Please edit pkg/PublicModuleList.txt,
if want to add modules to Tizen.NET package.
-->
<file src="Artifacts\bin\public\*.dll" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.pdb" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.xml" target="lib\netstandard1.6" />
<file src="Artifacts\bin\public\*.dll" target="lib\netstandard2.0" />
<file src="Artifacts\bin\public\*.pdb" target="lib\netstandard2.0" />
<file src="Artifacts\bin\public\*.xml" target="lib\netstandard2.0" />

</files>
</package>
2 changes: 1 addition & 1 deletion src/ElmSharp.Wearable/ElmSharp.Wearable.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ElmSharp/ElmSharp.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Common/Tizen.Applications.Common.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Tizen.Applications.Common\Tizen.Applications.Common.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemPackageVersion)" PrivateAssets="All" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemPackageVersion)" PrivateAssets="All" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...pplications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Service/Tizen.Applications.Service.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.UI/Tizen.Applications.UI.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.CallManager/Tizen.CallManager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Content.Download/Tizen.Content.Download.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Context/Tizen.Context.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Convergence/Tizen.Convergence.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Location/Tizen.Location.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tizen.Log/Tizen.Log.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

</Project>
Loading

0 comments on commit 65db8fd

Please sign in to comment.