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

Commit 3d0cdaa

Browse files
authored
Merge branch 'main' into update-droidx-browser-dep
2 parents d2bef4a + 77ad3c9 commit 3d0cdaa

File tree

20 files changed

+42
-68
lines changed

20 files changed

+42
-68
lines changed

DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<PackageReference Include="xunit" Version="2.4.1" />
2828
<PackageReference Include="xunit.runner.devices" Version="2.5.25" />
2929
<PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
30-
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
3130
<ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj" />
3231
</ItemGroup>
3332
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">

PRODUCT-FEEDBACK.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
We'd love to hear your thoughts on Xamarin.Essentials. Here are a few links to help get you to the right place:
44

55
### Setup and Common Questions
6-
* Read through our full [Getting Started with Xamarin.Essetials Guide](https://docs.microsoft.com/xamarin/essentials/get-started)
6+
* Read through our full [Getting Started with Xamarin.Essetials Guide](https://learn.microsoft.com/xamarin/essentials/get-started)
77
* [Frequently Asked Questions on our Wiki](https://github.com/xamarin/Essentials/wiki/FAQ-%7C-Essentials)
88

99
### Propose a Feature

README.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ iOS, Android, and UWP offer unique operating system and platform APIs that devel
66

77
## Questions
88

9-
Get your technical questions answered by experts on [Microsoft Q&A](https://docs.microsoft.com/answers/topics/dotnet-xamarinessentials.html?WT.mc_id=friends-0000-jamont).
9+
Get your technical questions answered by experts on [Microsoft Q&A](https://learn.microsoft.com/answers/topics/dotnet-xamarinessentials.html?WT.mc_id=friends-0000-jamont).
1010

1111
## Contribution Discussion
1212

@@ -16,15 +16,7 @@ Contributing to Xamarin.Essentials? Join our [Discord server](https://discord.co
1616

1717
| Build Server | Type | Platform | Status |
1818
|--------------|--------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
19-
| VSTS | Build | Windows | [![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/Xamarin/Components/Xamarin.Essentials?branchName=main)](https://dev.azure.com/xamarin/public/_build?definitionId=7&_a=summary) |
20-
| App Center | Sample App | Android | [![Build status](https://build.appcenter.ms/v0.1/apps/7a1f46ca-ba2f-477e-aacc-ff013c7d5f7a/branches/main/badge)](https://appcenter.ms) |
21-
| App Center | Sample App | iOS | [![Build status](https://build.appcenter.ms/v0.1/apps/43b39e9e-2b2b-482f-8afa-e9906334c85e/branches/main/badge)](https://appcenter.ms) |
22-
23-
## Sample App
24-
25-
Try out Xamarin.Essentials on your device!
26-
27-
* [Android Sample App](https://install.appcenter.ms/orgs/microsoft-liveplayer/apps/essentials-android/distribution_groups/public%20testers) via App Center.
19+
| Azure DevOps | Build | Windows | [![Build Status](https://dev.azure.com/xamarin/public/_apis/build/status/xamarin/Essentials/Xamarin.Essentials%20(Public)?repoName=xamarin%2FEssentials&branchName=main)](https://dev.azure.com/xamarin/public/_build/latest?definitionId=7&repoName=xamarin%2FEssentials&branchName=main) |
2820

2921
## Installation
3022

@@ -33,15 +25,15 @@ Xamarin.Essentials is available via NuGet & is included in every template:
3325
* NuGet Official Releases: [![NuGet](https://img.shields.io/nuget/vpre/Xamarin.Essentials.svg?label=NuGet)](https://www.nuget.org/packages/Xamarin.Essentials)
3426
* Nightly / CI Releases: https://aka.ms/xamarin-essentials-ci/index.json
3527

36-
Please read our [Getting Started with Xamarin.Essentials guide](https://docs.microsoft.com/xamarin/essentials/get-started?WT.mc_id=friends-0000-jamont) for full setup instructions.
28+
Please read our [Getting Started with Xamarin.Essentials guide](https://learn.microsoft.com/xamarin/essentials/get-started?WT.mc_id=friends-0000-jamont) for full setup instructions.
3729

3830
## Documentation
3931

40-
Browse our [full documentation for Xamarin.Essentials](https://docs.microsoft.com/xamarin/essentials?WT.mc_id=friends-0000-jamont), including feature guides, on how to use each feature.
32+
Browse our [full documentation for Xamarin.Essentials](https://learn.microsoft.com/xamarin/essentials?WT.mc_id=friends-0000-jamont), including feature guides, on how to use each feature.
4133

4234
## Supported Platforms
4335

44-
Platform support & feature support can be found on our [documentation](https://docs.microsoft.com/xamarin/essentials/platform-feature-support?WT.mc_id=friends-0000-jamont)
36+
Platform support & feature support can be found on our [documentation](https://learn.microsoft.com/xamarin/essentials/platform-feature-support?WT.mc_id=friends-0000-jamont)
4537

4638

4739
## Contributing

Samples/Sample.Server.WebAuthenticator/Sample.Server.WebAuthenticator.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AspNet.Security.OAuth.Apple" Version="3.0.0" />
8+
<PackageReference Include="AspNet.Security.OAuth.Apple" Version="3.1.8" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
910
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.2" />
1011
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.2" />
1112
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.2" />

Samples/Samples.Android/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.essentials" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
44
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
55
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

Samples/Samples.Android/Samples.Android.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
<Reference Include="System.Numerics.Vectors" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<PackageReference Include="Microsoft.AppCenter" Version="3.0.0" />
58-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
59-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
60-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="3.0.0" />
57+
<PackageReference Include="Microsoft.AppCenter" Version="4.5.3" />
58+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.3" />
59+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.3" />
60+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="4.5.3" />
6161
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
6262
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2083" />
6363
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

Samples/Samples.Mac/Samples.Mac.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
<Reference Include="OpenTK" />
5858
</ItemGroup>
5959
<ItemGroup>
60-
<PackageReference Include="Microsoft.AppCenter" Version="3.0.0" />
61-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
62-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
63-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="3.0.0" />
60+
<PackageReference Include="Microsoft.AppCenter" Version="4.5.3" />
61+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.3" />
62+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.3" />
63+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="4.5.3" />
6464
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
6565
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2083" />
6666
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

Samples/Samples.UWP/Samples.UWP.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
<Prefer32Bit>true</Prefer32Bit>
116116
</PropertyGroup>
117117
<ItemGroup>
118-
<PackageReference Include="Microsoft.AppCenter" Version="3.0.0" />
119-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
120-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
121-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="3.0.0" />
118+
<PackageReference Include="Microsoft.AppCenter" Version="4.5.3" />
119+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.3" />
120+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.3" />
121+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="4.5.3" />
122122
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
123123
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2083" />
124124
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />

Samples/Samples.iOS/Samples.iOS.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
<Reference Include="System.Numerics.Vectors" />
7777
</ItemGroup>
7878
<ItemGroup>
79-
<PackageReference Include="Microsoft.AppCenter" Version="3.0.0" />
80-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
81-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
82-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="3.0.0" />
79+
<PackageReference Include="Microsoft.AppCenter" Version="4.5.3" />
80+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.3" />
81+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.3" />
82+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="4.5.3" />
8383
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
8484
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2083" />
8585
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

Samples/Samples/Samples.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AppCenter" Version="3.0.0" />
15-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
16-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="3.0.0" />
14+
<PackageReference Include="Microsoft.AppCenter" Version="4.5.3" />
15+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.3" />
16+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.3" />
17+
<PackageReference Include="Microsoft.AppCenter.Distribute" Version="4.5.3" />
1818
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
1919
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2083" />
2020
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />

0 commit comments

Comments
 (0)