Skip to content

Commit 2b6274d

Browse files
DrutolDrutol
committed
Upgrading to Net Standard WIP
1 parent ece6093 commit 2b6274d

File tree

54 files changed

+649
-1107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+649
-1107
lines changed

‎ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>ExpressionBuilder</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

‎MALClient.Adapters/MALClient.Adapters.csproj

Lines changed: 7 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{9F8E953E-47A6-4F72-A2FE-BEF7A2DAE850}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>MALClient.Adapters</RootNamespace>
12-
<AssemblyName>MALClient.Adapters</AssemblyName>
13-
<DefaultLanguage>en-US</DefaultLanguage>
14-
<FileAlignment>512</FileAlignment>
15-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16-
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
17-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AndroidDebug|AnyCPU'">
37-
<DebugSymbols>true</DebugSymbols>
38-
<OutputPath>bin\AndroidDebug\</OutputPath>
39-
<DefineConstants>DEBUG;TRACE</DefineConstants>
40-
<DebugType>full</DebugType>
41-
<PlatformTarget>AnyCPU</PlatformTarget>
42-
<ErrorReport>prompt</ErrorReport>
43-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AndroidRelease|AnyCPU'">
46-
<OutputPath>bin\AndroidRelease\</OutputPath>
47-
<DefineConstants>TRACE</DefineConstants>
48-
<Optimize>true</Optimize>
49-
<DebugType>pdbonly</DebugType>
50-
<PlatformTarget>AnyCPU</PlatformTarget>
51-
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53-
</PropertyGroup>
54-
<ItemGroup>
55-
<Compile Include="Credentials\IPasswordVault.cs" />
56-
<Compile Include="IDispatcherAdapter.cs" />
57-
<Compile Include="IApplicationDataService.cs" />
58-
<Compile Include="ICalendarExportProvider.cs" />
59-
<Compile Include="IChangeLogProvider.cs" />
60-
<Compile Include="IClipboardProvider.cs" />
61-
<Compile Include="IConnectionInfoProvider.cs" />
62-
<Compile Include="ICssManager.cs" />
63-
<Compile Include="IDataCache.cs" />
64-
<Compile Include="IImageDownloaderService.cs" />
65-
<Compile Include="ILiveTilesManager.cs" />
66-
<Compile Include="IMessageDialogProvider.cs" />
67-
<Compile Include="INotificationsTaskManager.cs" />
68-
<Compile Include="IPinTileService.cs" />
69-
<Compile Include="ISchdeuledJobsManger.cs" />
70-
<Compile Include="ISnackbarProvider.cs" />
71-
<Compile Include="ISyetemControlLuancherService.cs" />
72-
<Compile Include="ITelemetryProvider.cs" />
73-
<Compile Include="Properties\AssemblyInfo.cs" />
74-
</ItemGroup>
75-
<ItemGroup>
76-
<ProjectReference Include="..\MALClient.Models\MALClient.Models.csproj">
77-
<Project>{9948a48d-1cfc-40e5-9bfa-6f93fe4c44a0}</Project>
78-
<Name>MALClient.Models</Name>
79-
</ProjectReference>
80-
</ItemGroup>
81-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
82-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
83-
Other similar extension points exist, see Microsoft.Common.targets.
84-
<Target Name="BeforeBuild">
85-
</Target>
86-
<Target Name="AfterBuild">
87-
</Target>
88-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<ProjectReference Include="..\MALClient.Models\MALClient.Models.csproj" />
7+
</ItemGroup>
898
</Project>

‎MALClient.Adapters/Properties/AssemblyInfo.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
using System.Resources;
2-
using System.Reflection;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
1+
//using System.Resources;
2+
//using System.Reflection;
3+
//using System.Runtime.CompilerServices;
4+
//using System.Runtime.InteropServices;
55

6-
// General Information about an assembly is controlled through the following
7-
// set of attributes. Change these attribute values to modify the information
8-
// associated with an assembly.
9-
[assembly: AssemblyTitle("MALClient.Adapters")]
10-
[assembly: AssemblyDescription("")]
11-
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("")]
13-
[assembly: AssemblyProduct("MALClient.Adapters")]
14-
[assembly: AssemblyCopyright("Copyright © 2016")]
15-
[assembly: AssemblyTrademark("")]
16-
[assembly: AssemblyCulture("")]
17-
[assembly: NeutralResourcesLanguage("en")]
6+
//// General Information about an assembly is controlled through the following
7+
//// set of attributes. Change these attribute values to modify the information
8+
//// associated with an assembly.
9+
//[assembly: AssemblyTitle("MALClient.Adapters")]
10+
//[assembly: AssemblyDescription("")]
11+
//[assembly: AssemblyConfiguration("")]
12+
//[assembly: AssemblyCompany("")]
13+
//[assembly: AssemblyProduct("MALClient.Adapters")]
14+
//[assembly: AssemblyCopyright("Copyright © 2016")]
15+
//[assembly: AssemblyTrademark("")]
16+
//[assembly: AssemblyCulture("")]
17+
//[assembly: NeutralResourcesLanguage("en")]
1818

19-
// Version information for an assembly consists of the following four values:
20-
//
21-
// Major Version
22-
// Minor Version
23-
// Build Number
24-
// Revision
25-
//
26-
// You can specify all the values or you can default the Build and Revision Numbers
27-
// by using the '*' as shown below:
28-
// [assembly: AssemblyVersion("1.0.*")]
29-
[assembly: AssemblyVersion("1.0.0.0")]
30-
[assembly: AssemblyFileVersion("1.0.0.0")]
19+
//// Version information for an assembly consists of the following four values:
20+
////
21+
//// Major Version
22+
//// Minor Version
23+
//// Build Number
24+
//// Revision
25+
////
26+
//// You can specify all the values or you can default the Build and Revision Numbers
27+
//// by using the '*' as shown below:
28+
//// [assembly: AssemblyVersion("1.0.*")]
29+
//[assembly: AssemblyVersion("1.0.0.0")]
30+
//[assembly: AssemblyFileVersion("1.0.0.0")]

‎MALClient.Adapters/packages.config

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="CommonServiceLocator" version="2.0.2" targetFramework="portable45-net45+win8+wpa81" />
4+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="portable45-net45+win8+wpa81" />
5+
<package id="Microsoft.NETCore.Targets" version="1.1.0" targetFramework="portable45-net45+win8+wpa81" />
6+
<package id="MvvmLightLibs" version="5.4.1" targetFramework="portable45-net45+win8+wpa81" />
7+
<package id="NETStandard.Library" version="1.6.1" targetFramework="portable45-net45+win8+wpa81" />
8+
<package id="runtime.native.System" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
9+
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
10+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
11+
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
12+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
13+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
14+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
15+
<package id="System.Globalization" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
16+
<package id="System.IO" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
17+
<package id="System.IO.Compression" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
18+
<package id="System.Linq" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
19+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
20+
<package id="System.Net.Http" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
21+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
22+
<package id="System.ObjectModel" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
23+
<package id="System.Reflection" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
24+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
25+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
26+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
27+
<package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
28+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
29+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
30+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
31+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
32+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
33+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
34+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
35+
<package id="System.Threading" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
36+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
37+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
38+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
39+
</packages>

‎MALClient.Android.Adapters/MALClient.Android.Adapters.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
2222
</PropertyGroup>

‎MALClient.Android.Adapters/MALClient.Android.Adapters.csproj.bak

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.props')" />
3+
<Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
2222
</PropertyGroup>
@@ -86,8 +86,8 @@
8686
</Reference>
8787
<Reference Include="Mono.Android" />
8888
<Reference Include="mscorlib" />
89-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
89+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
9191
</Reference>
9292
<Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9393
<HintPath>..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
@@ -140,12 +140,12 @@
140140
<PropertyGroup>
141141
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
142142
</PropertyGroup>
143-
<Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.props'))" />
144-
<Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets'))" />
145143
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
144+
<Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props'))" />
145+
<Error Condition="!Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets'))" />
146146
</Target>
147-
<Import Project="..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets')" />
148147
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
148+
<Import Project="..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" />
149149
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
150150
Other similar extension points exist, see Microsoft.Common.targets.
151151
<Target Name="BeforeBuild">

‎MALClient.Android.Adapters/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎MALClient.Android/AndroidBindings/Binding_CircularFloatingActionMenu/Binding_CircularFloatingActionMenu.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AssemblyName>Binding_CircularFloatingActionMenu</AssemblyName>
1515
<FileAlignment>512</FileAlignment>
1616
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
17-
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
1818
<AndroidClassParser>jar2xml</AndroidClassParser>
1919
<NuGetPackageImportStamp>
2020
</NuGetPackageImportStamp>

0 commit comments

Comments
 (0)