From d053db8d1062b54156f2bab27fb7265ef4833ec9 Mon Sep 17 00:00:00 2001 From: Israel Soto Date: Wed, 18 May 2022 00:50:45 -0500 Subject: [PATCH 1/4] [ci] Fixed cake version to be used --- azure-pipelines.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 83a82dab..b523142c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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: @@ -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') From ca9e692e1c80c9efdb4806cf5a64d7a5bf0cefc4 Mon Sep 17 00:00:00 2001 From: Israel Soto Date: Wed, 18 May 2022 00:53:00 -0500 Subject: [PATCH 2/4] [CI] Use dotnet v6.0.300 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b523142c..031d08d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 From b9db2417f3aea08ebd2b60031e6f0cf0555e3344 Mon Sep 17 00:00:00 2001 From: Israel Soto Date: Mon, 7 Mar 2022 17:29:20 -0600 Subject: [PATCH 3/4] Updated cgmanifest.json file --- cgmanifest.json | 153 +++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 100 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 6a942b46..46dce43f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "Maven": { "ArtifactId": "facebook-android-sdk", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -16,7 +16,7 @@ "Maven": { "ArtifactId": "facebook-core", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -26,7 +26,7 @@ "Maven": { "ArtifactId": "facebook-common", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -36,7 +36,7 @@ "Maven": { "ArtifactId": "facebook-login", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -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" } } }, @@ -66,7 +56,7 @@ "Maven": { "ArtifactId": "facebook-applinks", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -76,7 +66,7 @@ "Maven": { "ArtifactId": "facebook-messenger", "GroupId": "com.facebook.android", - "Version": "5.11.2" + "Version": "11.2.0" } } }, @@ -84,9 +74,9 @@ "Component": { "Type": "Maven", "Maven": { - "ArtifactId": "facebook-livestreaming", + "ArtifactId": "facebook-gamingservices", "GroupId": "com.facebook.android", - "Version": "4.36.0" + "Version": "11.2.0" } } }, @@ -94,122 +84,85 @@ "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 } \ No newline at end of file From f144c8f29a45a550c0f1213425ecb81bff930044 Mon Sep 17 00:00:00 2001 From: Israel Soto Date: Wed, 18 May 2022 01:07:19 -0500 Subject: [PATCH 4/4] Updated global.json to use dotnet v6.0.300 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 89e9417d..660b778e 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.201", + "version": "6.0.300", "rollForward": "latestPatch" }, "msbuild-sdks": { "Xamarin.Legacy.Sdk": "0.1.2-alpha6" } -} \ No newline at end of file +}