chore: Update to uno latest
This commit is contained in:
Jerome Laban
Родитель
c59e57b2f0
Коммит
2f3af7db44
|
|
@ -1,6 +1,11 @@
|
|||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
|
||||
# operating system junk files
|
||||
thumbs.db
|
||||
.DS_Store
|
||||
|
||||
|
||||
# User-specific files
|
||||
*.suo
|
||||
*.user
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
phases:
|
||||
- phase: Windows
|
||||
jobs:
|
||||
- job: Windows
|
||||
variables:
|
||||
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
|
||||
NUGET_HTTP_CACHE_PATH: $(Agent.WorkFolder)\.nuget-http-cache
|
||||
|
||||
|
||||
pool:
|
||||
vmImage: 'windows-2019'
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard1.0;xamarinios10;MonoAndroid71;netstandard2.0</TargetFrameworks>
|
||||
<Description>Uno-compatible MVVMLight .NET Standard 1.0. A lightweight framework to implement Model-View-ViewModel applications in WPF, Windows Store, Windows Phone, Silverlight, Xamarin.</Description>
|
||||
<TargetFrameworks>netstandard1.0;netstandard2.0;xamarinios10;MonoAndroid90;monoandroid10.0;xamarinmac20;uap10.0.17763</TargetFrameworks>
|
||||
<Description>Uno-compatible MVVMLight .NET Standard 2.0. A lightweight framework to implement Model-View-ViewModel applications in WPF, Windows Store, Windows Phone, Silverlight, Xamarin.</Description>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<Company>nventive</Company>
|
||||
<Authors>nventive</Authors>
|
||||
|
|
@ -29,17 +29,10 @@
|
|||
<DocumentationFile>bin\Release\netstandard1.0\GalaSoft.MvvmLight.xml</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'xamarinios10' ">
|
||||
<PackageReference Include="Uno.UI " Version="1.31.0-dev.8" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid71' ">
|
||||
<PackageReference Include="Uno.UI " Version="1.31.0-dev.8" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='MonoAndroid90' or '$(TargetFramework)'=='monoandroid10.0' or '$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='xamarinmac20'">
|
||||
<PackageReference Include="Uno.UI " Version="3.0.0-dev.1253" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\GalaSoft.MvvmLight (PCL)\Command\RelayCommand.cs" />
|
||||
|
|
@ -123,6 +116,4 @@
|
|||
<Content Update="..\GalaSoft.MvvmLight %28PCL%29\License.txt" Link="License.txt" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
<Project Sdk="MSBuild.Sdk.Extras/2.0.54" ToolsVersion="15.0">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>uap10.0;xamarinios10;MonoAndroid71;netstandard2.0;net45</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);4014;NU1701;NU1603</NoWarn>
|
||||
<TargetFrameworks>xamarinios10;MonoAndroid90;monoandroid10.0;netstandard2.0;xamarinmac20;uap10.0.17763;net47</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);4014;NU1701;NU1603;NU5104;Uno0001</NoWarn>
|
||||
<BuildForLiveUnitTesting>false</BuildForLiveUnitTesting>
|
||||
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
|
||||
<TreatSpecificWarningsAsErrors />
|
||||
|
|
@ -22,36 +22,30 @@
|
|||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.1" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.4.0" />
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.17763' ">
|
||||
<EmbeddedResource Include="Properties\GalaSoft.MvvmLight.Platform.rd.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'MonoAndroid71' or '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<PackageReference Include="Uno.UI " Version="1.31.0-dev.8" />
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)'=='monoandroid10.0' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'xamarinmac20' ">
|
||||
<PackageReference Include="Uno.UI " Version="3.0.0-dev.1253" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.17763'">
|
||||
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'MonoAndroid71' or '$(TargetFramework)' == 'netstandard2.0'">
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'xamarinios10' or '$(TargetFramework)' == 'MonoAndroid90' or '$(TargetFramework)'=='monoandroid10.0' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'xamarinmac20'">
|
||||
<DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
|
||||
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\External\NET45\System.Windows.Interactivity.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net47'">
|
||||
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\External\NET45\System.Windows.Interactivity.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\GalaSoft.MvvmLight.Platform %28NET45%29\Command\EventToCommand.cs">
|
||||
<Link>Command\EventToCommand.cs</Link>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27130.2024
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30323.103
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GalaSoft.MvvmLight", "GalaSoft.MvvmLight (STD10)\GalaSoft.MvvmLight.csproj", "{9E33963E-FC19-4CCB-A4F2-B0AECD8A092F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E4121525-1455-479F-9E23-398D78D27721}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Test (PNET45Std)", "Tests\PCL\GalaSoft.MvvmLight.Test (PNET45Std)\GalaSoft.MvvmLight.Test (PNET45Std).csproj", "{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GalaSoft.MvvmLight.Platform", "GalaSoft.MvvmLight.Platform\GalaSoft.MvvmLight.Platform.csproj", "{C7B99322-9663-495C-A3B0-FD886A6F6730}"
|
||||
EndProject
|
||||
Global
|
||||
|
|
@ -87,54 +83,6 @@ Global
|
|||
{9E33963E-FC19-4CCB-A4F2-B0AECD8A092F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9E33963E-FC19-4CCB-A4F2-B0AECD8A092F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9E33963E-FC19-4CCB-A4F2-B0AECD8A092F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|x64.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Ad-Hoc|x86.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|Any CPU.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|ARM.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|ARM.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|iPhone.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|x64.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|x64.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|x86.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.AppStore|x86.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|iPhone.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x64.Build.0 = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.Build.0 = Release|Any CPU
|
||||
{C7B99322-9663-495C-A3B0-FD886A6F6730}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C7B99322-9663-495C-A3B0-FD886A6F6730}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
|
||||
{C7B99322-9663-495C-A3B0-FD886A6F6730}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
|
||||
|
|
@ -187,9 +135,6 @@ Global
|
|||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6} = {E4121525-1455-479F-9E23-398D78D27721}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {29D172E5-0A9A-4C3F-8912-6E8526057547}
|
||||
EndGlobalSection
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>GalaSoft.MvvmLight.Test</RootNamespace>
|
||||
<AssemblyName>GalaSoft.MvvmLight.Test</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
|
||||
<IsCodedUITest>False</IsCodedUITest>
|
||||
<TestProjectType>UnitTest</TestProjectType>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче