Skip to content

update with main #1

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.

Sign up for GitHub

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

Merged
mos379 merged 4 commits into from
May 18, 2022
Merged

update with main #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d053db8
[ci] Fixed cake version to be used
May 18, 2022
ca9e692
[CI] Use dotnet v6.0.300
May 18, 2022
b9db241
Updated cgmanifest.json file
Mar 7, 2022
f144c8f
Updated global.json to use dotnet v6.0.300
May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ trigger:
- refs/tags/*

variables:
DotNetVersion: 6.0.201
DotNetVersion: 6.0.300
# NOTE: there wasn't a public release of 16.11 for macOS
LegacyXamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/4941337/d16-11/7776c9f1c8fac303c3aa57867825990850be0384/xamarin.android-11.4.0.5.pkg
LegacyXamarinAndroidVsix: https://download.visualstudio.microsoft.com/download/pr/7372b89a-b719-426c-9916-c33cbc6c7a61/45c38957fdcacfbee95be95ee40c4f5a4cc9ace69416625ad26e2da83b176941/Xamarin.Android.Sdk-11.4.0.5.vsix
Expand Down Expand Up @@ -37,7 +37,13 @@ jobs:

areaPath: 'DevDiv\VS Client - Runtime SDKs'
xcode: 13.2
cake: '0.33.0'
initSteps:
# Cake v0.33.0 uses this version
- task: UseDotNet@2
displayName: Install .NET 2.1.818
inputs:
version: '2.1.818'
- task: UseDotNet@2
displayName: install .NET $(DotNetVersion)
inputs:
Expand All @@ -61,7 +67,7 @@ jobs:
displayName: Install .NET 6 Android Workload
condition: ne(variables['System.JobName'], 'linux')
- pwsh: |
dotnet workload install ios
dotnet workload install ios --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.3xx.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json --source https://api.nuget.org/v3/index.json
displayName: Install .NET 6 iOS Workload
condition: eq(variables['System.JobName'], 'macos')

Expand Down
153 changes: 53 additions & 100 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Maven": {
"ArtifactId": "facebook-android-sdk",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -16,7 +16,7 @@
"Maven": {
"ArtifactId": "facebook-core",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -26,7 +26,7 @@
"Maven": {
"ArtifactId": "facebook-common",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -36,7 +36,7 @@
"Maven": {
"ArtifactId": "facebook-login",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -46,17 +46,7 @@
"Maven": {
"ArtifactId": "facebook-share",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "facebook-places",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -66,7 +56,7 @@
"Maven": {
"ArtifactId": "facebook-applinks",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
Expand All @@ -76,140 +66,103 @@
"Maven": {
"ArtifactId": "facebook-messenger",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
"Version": "11.2.0"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "facebook-livestreaming",
"ArtifactId": "facebook-gamingservices",
"GroupId": "com.facebook.android",
"Version": "4.36.0"
"Version": "11.2.0"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "facebook-loginkit",
"ArtifactId": "audience-network-sdk",
"GroupId": "com.facebook.android",
"Version": "4.36.0"
"Version": "6.6.0"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "facebook-marketing",
"GroupId": "com.facebook.android",
"Version": "5.11.2"
}
}
},
"Component": {
"Type": "other",
"Other": {
"Name": "FBAudienceNetwork",
"Version": "6.9.0",
"DownloadUrl": "https://developers.facebook.com/resources/FBAudienceNetwork-6.9.0.zip"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "account-kit-sdk",
"GroupId": "com.facebook.android",
"Version": "5.4.0"
"Type": "Pod",
"Pod": {
"Name": "FBSDKCoreKit",
"Version": "12.2.0"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "audience-network-sdk",
"GroupId": "com.facebook.android",
"Version": "5.6.0"
"Type": "Pod",
"Pod": {
"Name": "FBSDKCoreKit_Basics",
"Version": "12.2.0"
}
}
},
{
"Component": {
"Type": "Maven",
"Maven": {
"ArtifactId": "notifications",
"GroupId": "com.facebook.android",
"Version": "1.0.2"
"Type": "Pod",
"Pod": {
"Name": "FBAEMKit",
"Version": "12.2.0"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "AccountKit",
"version": "5.4.0",
"downloadUrl": "https://github.com/facebook/facebook-objc-sdk/releases/download/v5.4.0/AccountKit.zip"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "FBAudienceNetwork",
"version": "5.5.1",
"downloadUrl": "https://developers.facebook.com/resources/FBAudienceNetwork-5.5.1.zip"
}
}
},
{
"component": {
"type": "git",
"git": {
"name": "FBSDSKCoreKit",
"repositoryUrl": "https://github.com/facebook/facebook-objc-sdk.git",
"commitHash": "cf9e0d837f9596223b05cb25faf0edf54d6347a2"
}
}
},
{
"component": {
"type": "git",
"git": {
"name": "FBSDSKLoginKit",
"repositoryUrl": "https://github.com/facebook/facebook-objc-sdk.git",
"commitHash": "cf9e0d837f9596223b05cb25faf0edf54d6347a2"
"Component": {
"Type": "Pod",
"Pod": {
"Name": "FBSDKLoginKit",
"Version": "12.2.0"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "FBSDSKMarketingKit",
"version": "5.5.0",
"downloadUrl": "https://github.com/facebook/facebook-objc-sdk/releases/download/v5.5.0/FBSDKMarketingKit.zip"
"Component": {
"Type": "Pod",
"Pod": {
"Name": "FBSDKShareKit",
"Version": "12.2.0"
}
}
},
{
"component": {
"type": "git",
"git": {
"name": "FBSDSKPlacesKit",
"repositoryUrl": "https://github.com/facebook/facebook-objc-sdk.git",
"commitHash": "cf9e0d837f9596223b05cb25faf0edf54d6347a2"
"Component": {
"Type": "Pod",
"Pod": {
"Name": "FBSDKGamingServicesKit",
"Version": "12.2.0"
}
}
},
{
"component": {
"type": "git",
"git": {
"name": "FBSDSKShareKit",
"repositoryUrl": "https://github.com/facebook/facebook-objc-sdk.git",
"commitHash": "cf9e0d837f9596223b05cb25faf0edf54d6347a2"
"Component": {
"Type": "Pod",
"Pod": {
"Name": "FacebookGamingServices",
"Version": "12.2.0"
}
}
}
}
],
"Version": 1
}
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.201",
"version": "6.0.300",
"rollForward": "latestPatch"
},
"msbuild-sdks": {
"Xamarin.Legacy.Sdk": "0.1.2-alpha6"
}
}
}