Skip to content
This repository was archived by the owner on Dec 16, 2024. It is now read-only.

Commit eaa8951

Browse files
krdmllrkrdmllr
committed
Update to netstandard2.0
1 parent f8fbdd1 commit eaa8951

7 files changed

Lines changed: 55 additions & 172 deletions

File tree

‎src/MvvmNano.Core/MvvmNano.Core.csproj‎

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
7-
<ProjectGuid>{20702C2E-24BF-417E-9EFB-B68CEC360FA3}</ProjectGuid>
3+
<TargetFrameworks>netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
84
<OutputType>Library</OutputType>
95
<RootNamespace>MvvmNano</RootNamespace>
106
<AssemblyName>MvvmNano.Core</AssemblyName>
11-
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<OutputPath>bin\Debug</OutputPath>
19-
<DefineConstants>DEBUG;</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
22-
<ConsolePause>false</ConsolePause>
7+
<Version>3.2.0</Version>
8+
<Authors>Thomas Bandt</Authors>
9+
<RepositoryUrl>https://github.com/aspnetde/MvvmNano</RepositoryUrl>
10+
<PackageProjectUrl>https://github.com/aspnetde/MvvmNano</PackageProjectUrl>
11+
<PackageLicenseUrl>https://github.com/aspnetde/MvvmNano/blob/master/LICENSE</PackageLicenseUrl>
12+
<Copyright>Copyright 2016-2017 Thomas Bandt</Copyright>
13+
<Description>The small and smart MVVM framework made with ❤ for Xamarin.Forms.</Description>
14+
<PackageTags>MVVM MvvmNano Xamarin.Forms</PackageTags>
15+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2316
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>full</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release</OutputPath>
28-
<ErrorReport>prompt</ErrorReport>
29-
<WarningLevel>4</WarningLevel>
30-
<ConsolePause>false</ConsolePause>
31-
<DocumentationFile>bin\Release\MvvmNano.Core.xml</DocumentationFile>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Compile Include="IMvvmNanoIoCAdapter.cs" />
35-
<Compile Include="Properties\AssemblyInfo.cs" />
36-
<Compile Include="IPresenter.cs" />
37-
<Compile Include="IViewModel.cs" />
38-
<Compile Include="IView.cs" />
39-
<Compile Include="MvvmNanoViewModel.cs" />
40-
<Compile Include="MvvmNanoCommand.cs" />
41-
<Compile Include="MvvmNanoIoC.cs" />
42-
<Compile Include="MvvmNanoException.cs" />
43-
<Compile Include="IMessage.cs" />
44-
<Compile Include="IMessenger.cs" />
45-
</ItemGroup>
46-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
47-
<ItemGroup>
48-
<None Include="MvvmNano.Core.nuspec" />
49-
</ItemGroup>
17+
<PropertyGroup Condition="'$(TargetFramework)' == 'portable-net45+win8+wpa81+wp8'">
18+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
19+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
20+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
21+
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile259</NugetTargetMoniker>
22+
<LanguageTargets>$(MSBuildProgramFiles32)\MSBuild\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
23+
</PropertyGroup>
5024
</Project>

‎src/MvvmNano.Core/MvvmNano.Core.nuspec‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/MvvmNano.Core/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/MvvmNano.Forms/MvvmNano.Forms.csproj‎

Lines changed: 25 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
7-
<ProjectGuid>{DB140B3E-0A15-4923-A07E-AD0C73523E27}</ProjectGuid>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
84
<OutputType>Library</OutputType>
9-
<RootNamespace>MvvmNano.Forms</RootNamespace>
10-
<AssemblyName>MvvmNano.Forms</AssemblyName>
11-
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<NuGetPackageImportStamp>
14-
</NuGetPackageImportStamp>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug</OutputPath>
21-
<DefineConstants>DEBUG;</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<ConsolePause>false</ConsolePause>
5+
<AssemblyName>MvvmNano.Forms</AssemblyName>
6+
<Version>3.2.0</Version>
7+
<Authors>Thomas Bandt</Authors>
8+
<Copyright>Copyright 2016-2017 Thomas Bandt</Copyright>
9+
<Description>The small and smart MVVM framework made with ❤ for Xamarin.Forms.</Description>
10+
<PackageTags>MVVM MvvmNano Xamarin.Forms</PackageTags>
11+
<RepositoryUrl>https://github.com/aspnetde/MvvmNano</RepositoryUrl>
12+
<PackageProjectUrl>https://github.com/aspnetde/MvvmNano</PackageProjectUrl>
13+
<PackageLicenseUrl>https://github.com/aspnetde/MvvmNano/blob/master/LICENSE</PackageLicenseUrl>
14+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2515
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>full</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release</OutputPath>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<ConsolePause>false</ConsolePause>
33-
<DocumentationFile>bin\Release\MvvmNano.Forms.xml</DocumentationFile>
16+
17+
<PropertyGroup Condition="'$(TargetFramework)' == 'portable-net45+win8+wpa81+wp8'">
18+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
19+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
20+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
21+
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile259</NugetTargetMoniker>
22+
<LanguageTargets>$(MSBuildProgramFiles32)\MSBuild\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
3423
</PropertyGroup>
24+
3525
<ItemGroup>
36-
<Compile Include="Internals\ViewViewModelHelper.cs" />
37-
<Compile Include="MasterDetail\MvvmNanoDefaultMasterDetailPage.cs" />
38-
<Compile Include="MasterDetail\MvvmNanoMasterDetailData.cs" />
39-
<Compile Include="MasterDetail\MvvmNanoMasterDetailPage.cs" />
40-
<Compile Include="MasterDetail\MvvmNanoMasterDetailPageBase.cs" />
41-
<Compile Include="Properties\Annotations.cs" />
42-
<Compile Include="Properties\AssemblyInfo.cs" />
43-
<Compile Include="MvvmNanoContentPage.cs" />
44-
<Compile Include="MvvmNanoFormsPresenter.cs" />
45-
<Compile Include="MvvmNanoNavigationPage.cs" />
46-
<Compile Include="MvvmNanoFormsPresenterException.cs" />
47-
<Compile Include="MvvmNanoApplication.cs" />
48-
<Compile Include="MvvmNanoFormsMessenger.cs" />
49-
<Compile Include="MvvmNanoTabbedPage.cs" />
50-
</ItemGroup>
51-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
52-
<Import Project="..\packages\Xamarin.Forms.2.1.0.6529\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.1.0.6529\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
53-
<ItemGroup>
54-
<ProjectReference Include="..\MvvmNano.Core\MvvmNano.Core.csproj">
55-
<Project>{20702C2E-24BF-417E-9EFB-B68CEC360FA3}</Project>
56-
<Name>MvvmNano.Core</Name>
57-
</ProjectReference>
58-
</ItemGroup>
59-
<ItemGroup>
60-
<None Include="MvvmNano.Forms.nuspec" />
61-
<None Include="packages.config">
62-
<SubType>Designer</SubType>
63-
</None>
26+
<PackageReference Include="Xamarin.Forms" Version="2.5.0.91635" />
6427
</ItemGroup>
28+
6529
<ItemGroup>
66-
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
68-
</Reference>
69-
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
71-
</Reference>
72-
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
74-
</Reference>
30+
<ProjectReference Include="..\MvvmNano.Core\MvvmNano.Core.csproj" />
7531
</ItemGroup>
76-
<Import Project="..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
77-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
78-
<PropertyGroup>
79-
<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>
80-
</PropertyGroup>
81-
<Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
82-
</Target>
32+
8333
</Project>

‎src/MvvmNano.Forms/MvvmNano.Forms.nuspec‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/MvvmNano.Forms/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/MvvmNano.sln‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.16
4+
VisualStudioVersion = 15.0.27004.2009
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNano.Core", "MvvmNano.Core\MvvmNano.Core.csproj", "{20702C2E-24BF-417E-9EFB-B68CEC360FA3}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNano.Core", "MvvmNano.Core\MvvmNano.Core.csproj", "{20702C2E-24BF-417E-9EFB-B68CEC360FA3}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNano.Forms", "MvvmNano.Forms\MvvmNano.Forms.csproj", "{DB140B3E-0A15-4923-A07E-AD0C73523E27}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNano.Forms", "MvvmNano.Forms\MvvmNano.Forms.csproj", "{DB140B3E-0A15-4923-A07E-AD0C73523E27}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNano.Ninject", "MvvmNano.Ninject\MvvmNano.Ninject.csproj", "{4C6EFDD3-14DA-410E-8026-AB452C5E1E44}"
1111
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNano.TinyIoC", "MvvmNano.TinyIoC\MvvmNano.TinyIoC.csproj", "{4EFFA859-2D5B-4AE8-88FA-96A62CEEFEA2}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Any CPU = Debug|Any CPU
@@ -27,8 +29,15 @@ Global
2729
{4C6EFDD3-14DA-410E-8026-AB452C5E1E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
2830
{4C6EFDD3-14DA-410E-8026-AB452C5E1E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
2931
{4C6EFDD3-14DA-410E-8026-AB452C5E1E44}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{4EFFA859-2D5B-4AE8-88FA-96A62CEEFEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{4EFFA859-2D5B-4AE8-88FA-96A62CEEFEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{4EFFA859-2D5B-4AE8-88FA-96A62CEEFEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{4EFFA859-2D5B-4AE8-88FA-96A62CEEFEA2}.Release|Any CPU.Build.0 = Release|Any CPU
3036
EndGlobalSection
3137
GlobalSection(SolutionProperties) = preSolution
3238
HideSolutionNode = FALSE
3339
EndGlobalSection
40+
GlobalSection(ExtensibilityGlobals) = postSolution
41+
SolutionGuid = {ED637D0A-4ED6-4BD9-9551-037DEE8283AA}
42+
EndGlobalSection
3443
EndGlobal

0 commit comments

Comments
 (0)