Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Uno Support #3495

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
93a55d3
Improving TFM switching for developers
nickrandolph Jul 6, 2019
2506eb4
Adding MvvmCross.uno project
nickrandolph Jul 9, 2019
5101841
Adding playground for uno
nickrandolph Jul 9, 2019
9db6a74
Droid uno working. Wasm builds and runs but doesn't display mvvmcross…
nickrandolph Jul 14, 2019
f0ac4e7
Fixing sample and startup to prevent blocking
nickrandolph Jul 15, 2019
9eb343d
Fixing issue with threading (thanks to team at Uno)
nickrandolph Aug 13, 2019
e9f66a6
Adding packageid and other meta data
nickrandolph Aug 13, 2019
748b091
Fixing codefactor issues
nickrandolph Sep 17, 2019
50f06b6
Adding Uno reference to UWP and updating to latest preview build for …
nickrandolph Sep 17, 2019
51479f7
Reverting to known version of uno
nickrandolph Sep 18, 2019
7fad9fd
Upgrading Uno reference
nickrandolph May 3, 2020
8cd9704
Bump Uno version
Cheesebaron May 23, 2020
1252729
Fix Android Playground after migration to AndroidX (#3781)
Cheesebaron May 24, 2020
fc5d4fc
Fix EXC_BAD_ACCESS on MvxPathSourceStep.ClearPathSourceBinding
May 27, 2020
5168eb5
Merge pull request #3785 from MauryZ/bugfix/gh3784-lock
martijn00 May 28, 2020
ecc1103
Bump AsyncFixer from 1.1.6 to 1.3.0 (#3786)
dependabot-preview[bot] May 28, 2020
c5578dc
Bump Xamarin.AndroidX.Lifecycle.LiveData from 2.1.0 to 2.2.0 (#3782)
dependabot-preview[bot] May 28, 2020
8cc5d8a
Bump Microsoft.CodeAnalysis from 3.5.0 to 3.6.0 (#3776)
dependabot-preview[bot] May 28, 2020
1d18be0
Pushing version bump for Uno
nickrandolph May 28, 2020
d757a94
Fixed up compilation and support for wasm and ios
nickrandolph May 29, 2020
097ed96
Bump xunit.runner.visualstudio from 2.4.1 to 2.4.2 (#3788)
dependabot-preview[bot] Jun 3, 2020
abb6cfb
Fix issues after migration to AndroidX (#3802)
alexshikov Jun 9, 2020
f84d120
Bump Xamarin.AndroidX.AppCompat from 1.1.0 to 1.1.0.1 (#3792)
dependabot-preview[bot] Jun 16, 2020
9f2af98
Bump Xamarin.AndroidX.Lifecycle.LiveData from 2.2.0 to 2.2.0.1 (#3791)
dependabot-preview[bot] Jun 16, 2020
734a69a
Bump Xamarin.AndroidX.SwipeRefreshLayout from 1.0.0 to 1.0.0.1 (#3793)
dependabot-preview[bot] Jun 16, 2020
10e0136
Bump Xamarin.Google.Android.Material from 1.0.0 to 1.0.0.1 (#3795)
dependabot-preview[bot] Jun 16, 2020
149afd9
Bump Xamarin.AndroidX.Leanback from 1.0.0 to 1.0.0.1 (#3797)
dependabot-preview[bot] Jun 16, 2020
f27045c
Bump Xamarin.AndroidX.RecyclerView from 1.1.0 to 1.1.0.1 (#3798)
dependabot-preview[bot] Jun 16, 2020
c06e391
Bump Xamarin.AndroidX.ExifInterface from 1.1.0 to 1.1.0.1 (#3799)
dependabot-preview[bot] Jun 16, 2020
f002261
Bump Xamarin.AndroidX.ViewPager from 1.0.0 to 1.0.0.1 (#3800)
dependabot-preview[bot] Jun 16, 2020
db3be52
Bump Xamarin.AndroidX.CardView from 1.0.0 to 1.0.0.1 (#3796)
dependabot-preview[bot] Jun 16, 2020
97fca40
Bump Xamarin.AndroidX.Legacy.Support.V4 from 1.0.0 to 1.0.0.1 (#3794)
dependabot-preview[bot] Jun 16, 2020
0b9e502
Add SonarQube analysis to build pipeline (#3787)
Cheesebaron Jun 16, 2020
14608ee
UAP ViewModel ViewCreated isn't being called (#3767)
PradeepPappuAto Jun 16, 2020
6e17e09
Bump Xamarin.Forms to AndroidX version
Cheesebaron Jun 16, 2020
8296787
Update to Material TabLayout and AndroidX Toolbar
Cheesebaron Jun 16, 2020
50bba91
Bump cake
Cheesebaron Jun 16, 2020
eb08fad
Fix Sonar reporting for PRs
Cheesebaron Jun 16, 2020
ac7598a
Bump Moq from 4.14.1 to 4.14.2 (#3809)
dependabot-preview[bot] Jun 17, 2020
cc8f1a6
Bump Xamarin.AndroidX.Fragment from 1.2.4 to 1.2.4.1 (#3807)
dependabot-preview[bot] Jun 17, 2020
954ee3c
Bump Xamarin.AndroidX.Preference from 1.1.1 to 1.1.1.1 (#3808)
dependabot-preview[bot] Jun 17, 2020
f7a64ab
Merge pull request #3806 from MvvmCross/bugfix/forms-playground-droid
martijn00 Jun 17, 2020
37145a9
Use dedicated object to acquire lock (#3810)
Cheesebaron Jun 17, 2020
1fa3bc3
Bump Xamarin.AndroidX.MediaRouter from 1.1.0 to 1.1.0.1 (#3812)
dependabot-preview[bot] Jun 18, 2020
cf420e2
Bump Moq from 4.14.2 to 4.14.3 (#3813)
dependabot-preview[bot] Jun 19, 2020
2497363
Bump Moq from 4.14.3 to 4.14.4 (#3815)
dependabot-preview[bot] Jun 25, 2020
675856e
Update .mailmap for Tomasz Cielecki (#3822)
Cheesebaron Jul 6, 2020
2a84ae3
Bump Moq from 4.14.4 to 4.14.5 (#3818)
dependabot-preview[bot] Jul 6, 2020
4cf2f37
Update MvxSuspensionManager.cs (#3821)
pinkysek Jul 6, 2020
23819a3
Use PR number, not ID from Azure Pipelines (#3823)
Cheesebaron Jul 6, 2020
08af6fb
Fix iOS Modal ViewController closing issue
oloastrickland Jul 7, 2020
8b66b34
Merge pull request #3827 from Gaisuru/bugfix/3826-ios-view-controller…
martijn00 Jul 8, 2020
64f90e9
Rename to capital of Direcotry.Build.props and Direcotry.Build.tagets…
andres-gimenez Jul 10, 2020
e496024
FXCop-no mark literals as localized.
andres-gimenez Jul 16, 2020
578b936
End of file.
andres-gimenez Jul 16, 2020
c6e8eaa
Include Blazor in feature request.
andres-gimenez Jul 17, 2020
abb1d4c
Merge pull request #3835 from andrechi1/develop-feature-template
martijn00 Jul 18, 2020
58f8bbc
Merge pull request #3832 from andrechi1/develop-no-localized
martijn00 Jul 18, 2020
ccb6a1e
Bump Xamarin.GooglePlayServices.Basement from 71.1620.2 to 71.1620.4 …
dependabot-preview[bot] Jul 20, 2020
6a834f6
Bump Xamarin.GooglePlayServices.Location from 71.1600.1 to 71.1600.4 …
dependabot-preview[bot] Jul 20, 2020
63cae3f
Bump MSBuild.Sdk.Extras from 2.0.54 to 2.1.2 (#3848)
dependabot-preview[bot] Jul 24, 2020
b7c5454
Not user the exception class to lauch a exception.
andres-gimenez Jul 24, 2020
712274c
Factor in bottom safe area when showing keyboard
Hackmodford Jul 24, 2020
46a3cd9
Merge pull request #3849 from andres-gimenez/develop-not-exception
martijn00 Jul 27, 2020
77c382c
Add iOS 11 version check
Hackmodford Jul 27, 2020
38a57b6
fix for bracket followed by empty line
Hackmodford Jul 27, 2020
f7a525e
Merge pull request #3850 from Hackmodford/develop-ios-adjust-keyboard…
martijn00 Jul 27, 2020
4451262
Bump xunit.runner.visualstudio from 2.4.2 to 2.4.3 (#3856)
dependabot-preview[bot] Aug 4, 2020
70185f7
hint for confusing multiple App classes
mashbrno Aug 6, 2020
6827950
Merge pull request #3858 from mashbrno/develop
martijn00 Aug 6, 2020
3361c0d
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 3.0.0 to 3.3.0 (#3864)
dependabot-preview[bot] Aug 11, 2020
d11050c
Bump github-pages version (#3865)
Cheesebaron Aug 11, 2020
647dc35
Bump Microsoft.CodeAnalysis from 3.6.0 to 3.7.0 (#3859)
dependabot-preview[bot] Aug 11, 2020
eb7d0a4
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0 (#3860)
dependabot-preview[bot] Aug 11, 2020
62d9b96
Improving TFM switching for developers
nickrandolph Jul 6, 2019
0eff546
Adding MvvmCross.uno project
nickrandolph Jul 9, 2019
5f60749
Adding playground for uno
nickrandolph Jul 9, 2019
6aec585
Droid uno working. Wasm builds and runs but doesn't display mvvmcross…
nickrandolph Jul 14, 2019
24d00f3
Fixing sample and startup to prevent blocking
nickrandolph Jul 15, 2019
a5280ab
Fixing issue with threading (thanks to team at Uno)
nickrandolph Aug 13, 2019
1033678
Adding packageid and other meta data
nickrandolph Aug 13, 2019
e652c42
Fixing codefactor issues
nickrandolph Sep 17, 2019
6c53483
Adding Uno reference to UWP and updating to latest preview build for …
nickrandolph Sep 17, 2019
5db362c
Reverting to known version of uno
nickrandolph Sep 18, 2019
7de8a6c
Upgrading Uno reference
nickrandolph May 3, 2020
51c4b9c
Bump Uno version
Cheesebaron May 23, 2020
cc85c22
Pushing version bump for Uno
nickrandolph May 28, 2020
5e5cdcb
Fixed up compilation and support for wasm and ios
nickrandolph May 29, 2020
3f753df
Fixing rebase merge
nickrandolph Aug 11, 2020
0f5568b
Updating Uno version and playground app
nickrandolph Sep 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.2",
"commands": [
"dotnet-cake"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.5.8",
"commands": [
"reportgenerator"
]
}
}
}
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,9 @@ csharp_new_line_before_members_in_anonymous_types = true

# Braces after if
csharp_prefer_braces = false

#FxCop
[*.{cs,vb}]

# CA1303: Do not pass literals as localized parameters
dotnet_diagnostic.CA1303.severity = none
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/c-feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ about: Want to see something new included in the Framework? Submit it!
- [ ] :apple: MacOS
- [ ] :tv: tvOS
- [ ] :monkey: Xamarin.Forms
- [ ] :🌍: Blazor
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Martijn van Dijk <mhvdijk@gmail.com> Marrtijn van Dijk
Tomasz Cielecki <tomasz@ostebaronen.dk>
Tomasz Cielecki <tomasz@ostebaronen.dk> Tomasz
Tomasz Cielecki <tomasz@ostebaronen.dk> <tomasz.cielecki@bksv.com>
Tomasz Cielecki <tomasz@ostebaronen.dk> <tomasz.cielecki@7digital.com>
Tomasz Cielecki <tomasz@ostebaronen.dk> <tci@trackman.com>

Jonathan Stoneman <jon@stoneman.me.uk> <github@jonstoneman.org>
Jonathan Stoneman <jon@stoneman.me.uk> <jonathan@stoneman.me.uk>
Expand Down
207 changes: 106 additions & 101 deletions Directory.build.props → Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,101 +1,106 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<PackageLicenseExpression>MS-PL</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/MvvmCross/MvvmCross</PackageProjectUrl>
<PackageIconUrl>http://i.imgur.com/Baucn8c.png</PackageIconUrl>
<!--<PackageIcon>icon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)icon.png</PackageIconFullPath>-->
<Authors>.NET Foundation and Contributors</Authors>
<Owners>MvvmCross;slodge;cheesebaron;martijn00</Owners>
<PackageTags>mvvm;mvvmcross;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;wpf;net;net45;uwp;tizen</PackageTags>
<PackageReleaseNotes>https://github.com/MvvmCross/MvvmCross/blob/develop/CHANGELOG.md</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<NeutralLanguage>en-US</NeutralLanguage>
<MinClientVersion>2.12</MinClientVersion>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RepositoryUrl>https://github.com/MvvmCross/MvvmCross</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>7.0.0</Version>

<!--<Nullable>enable</Nullable>-->
<LangVersion>8.0</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
<Platform>AnyCPU</Platform>

<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
<IsLibraryProject>$(MSBuildProjectName.Contains('MvvmCross'))</IsLibraryProject>
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<IncludeSymbols>true</IncludeSymbols>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<DesignTimeBuild>false</DesignTimeBuild>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup Condition="'$(IsTestProject)' != 'true' and '$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<Deterministic>true</Deterministic>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<TargetsToBuild>All</TargetsToBuild>
<!--<TargetsToBuild>Android</TargetsToBuild>-->
<!--<TargetsToBuild>Uap</TargetsToBuild>-->
<!--<TargetsToBuild>iOS</TargetsToBuild>-->
<!--<TargetsToBuild>Tizen</TargetsToBuild>-->
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
<TargetsToBuild>All</TargetsToBuild>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AsyncFixer" Version="1.1.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<PackageLicenseExpression>MS-PL</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/MvvmCross/MvvmCross</PackageProjectUrl>
<PackageIconUrl>http://i.imgur.com/Baucn8c.png</PackageIconUrl>
<!--<PackageIcon>icon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)icon.png</PackageIconFullPath>-->
<Authors>.NET Foundation and Contributors</Authors>
<Owners>MvvmCross;slodge;cheesebaron;martijn00</Owners>
<PackageTags>mvvm;mvvmcross;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;wpf;net;net45;uwp;tizen</PackageTags>
<PackageReleaseNotes>https://github.com/MvvmCross/MvvmCross/blob/develop/CHANGELOG.md</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<NeutralLanguage>en-US</NeutralLanguage>
<MinClientVersion>2.12</MinClientVersion>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RepositoryUrl>https://github.com/MvvmCross/MvvmCross</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>7.0.0</Version>

<!--<Nullable>enable</Nullable>-->
<LangVersion>8.0</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
<Platform>AnyCPU</Platform>

<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
<IsLibraryProject>$(MSBuildProjectName.Contains('MvvmCross'))</IsLibraryProject>
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
<IsUno>$(MSBuildProjectName.Contains('.Uno'))</IsUno>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<IncludeSymbols>true</IncludeSymbols>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<DesignTimeBuild>false</DesignTimeBuild>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup Condition="'$(IsTestProject)' != 'true' and '$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<Deterministic>true</Deterministic>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup Condition="'$(IsLibraryProject)' == 'true' and '$(IsUno)' == 'false' ">
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
<TargetsToBuildDeveloperOverride>All</TargetsToBuildDeveloperOverride>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<TargetsToBuild>$(TargetsToBuildDeveloperOverride)</TargetsToBuild>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
<TargetsToBuild>All</TargetsToBuild>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AsyncFixer" Version="1.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
92 changes: 46 additions & 46 deletions Directory.build.targets → Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<Project>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;MAC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.tvos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.watchos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;WATCHOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('monoandroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid10.0'">
<DefineConstants>$(DefineConstants);MONO;ANDROID;__ANDROID_29__;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCORE;NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp3.'))">
<DefineConstants>$(DefineConstants);WPF</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
<TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<Import Project="XamarinForms.targets" Condition="'$(IsXamarinForms)' == 'true'"/>
<Project>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;MAC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.tvos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.watchos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;WATCHOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('monoandroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid10.0'">
<DefineConstants>$(DefineConstants);MONO;ANDROID;__ANDROID_29__;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCORE;NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp3.'))">
<DefineConstants>$(DefineConstants);WPF</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
<TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>

<Import Project="XamarinForms.targets" Condition="'$(IsXamarinForms)' == 'true'"/>
</Project>
1 change: 1 addition & 0 deletions LaunchVS.All.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LaunchVS.bat All
1 change: 1 addition & 0 deletions LaunchVS.Android.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LaunchVS.bat Android
1 change: 1 addition & 0 deletions LaunchVS.Uap.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LaunchVS.bat Uap
2 changes: 2 additions & 0 deletions LaunchVS.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
powershell -Command "(gc Directory.build.props) -replace '<TargetsToBuildDeveloperOverride>[a-zA-Z]*</TargetsToBuildDeveloperOverride>', '<TargetsToBuildDeveloperOverride>%~1</TargetsToBuildDeveloperOverride> ' | Out-File -encoding ASCII Directory.build.props"
start MvvmCross.%~1.slnf
1 change: 1 addition & 0 deletions LaunchVS.iOS.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LaunchVS.bat iOS
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This package contains the 'Code Analysis' analyzers and code fixes for MvvmCross
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions MvvmCross.DroidX/Leanback/MvvmCross.DroidX.Leanback.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ This package contains AndroidX Leanback support for MvvmCross.</Description>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Leanback" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0" />
<PackageReference Include="Xamarin.AndroidX.Leanback" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MvvmCross.DroidX/Material/MvvmCross.DroidX.Material.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This package contains Support v7 Design support for MvvmCross.</Description>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This package contains AndroidX RecyclerView support for MvvmCross.</Description>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down