diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 571a8443945..f04552ae25e 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -83,6 +83,7 @@ extends: suppression: suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress settings: + networkIsolationPolicy: Permissive,CFSClean skipBuildTagsForGitHubPullRequests: true stages: - template: /build-tools/automation/yaml-templates/build-macos.yaml@self diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 23efd8699c9..5bc61d88ff5 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -80,6 +80,9 @@ variables: value: true - name: DOTNET_GENERATE_ASPNET_CERTIFICATE value: false +# XBD Google Maven mirror support: https://github.com/dotnet/android-libraries/commit/4fe06d57f3ef7905fab0257d7246c97464d29e74 +- name: XamarinBuildDownloadGoogleMavenRepository + value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-maven/maven/v1 # Fix network isolation requirements # See https://devdiv.visualstudio.com/DevDiv/_git/Xamarin.yaml-templates/pullrequest/750402 - name: DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE diff --git a/external/debugger-libs b/external/debugger-libs index f2572777467..e7fbb713d15 160000 --- a/external/debugger-libs +++ b/external/debugger-libs @@ -1 +1 @@ -Subproject commit f2572777467b3dc19a2febc3642a87bd737b8bc0 +Subproject commit e7fbb713d156d11193ed404783ad6fe9c4042a6d diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj b/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj index 9c1ac59b358..1160f499c72 100644 --- a/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj +++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj @@ -20,6 +20,9 @@ + + PreserveNewest + diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs index 4a82bed3d48..ca37d954819 100644 --- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs +++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs @@ -16,6 +16,8 @@ public class Test : CSharpAnalyzerTest public List Analyzers => analyzers; public Test () { + ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies; + SolutionTransforms.Add ((solution, projectId) => { var project = solution.GetProject (projectId); var compilationOptions = project.CompilationOptions; diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs index 310409b7090..141f5934b28 100644 --- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs +++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeFixVerifier`2+Test.cs @@ -11,6 +11,8 @@ public class Test : CSharpCodeFixTest { public Test () { + ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies; + SolutionTransforms.Add ((solution, projectId) => { var compilationOptions = solution.GetProject (projectId).CompilationOptions; compilationOptions = compilationOptions.WithSpecificDiagnosticOptions ( @@ -22,4 +24,3 @@ public Test () } } } - diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs index 7beb164e48f..5e1db64cb44 100644 --- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs +++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs @@ -8,6 +8,8 @@ public class Test : CSharpCodeRefactoringTest { public Test () { + ReferenceAssemblies = CSharpVerifierHelper.DefaultReferenceAssemblies; + SolutionTransforms.Add ((solution, projectId) => { var compilationOptions = solution.GetProject (projectId).CompilationOptions; compilationOptions = compilationOptions.WithSpecificDiagnosticOptions ( diff --git a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs index bdeb56f1724..3a2b1eae3ac 100644 --- a/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs +++ b/src/Microsoft.Android.Sdk.Analysis/Tests/Verifiers/CSharpVerifierHelper.cs @@ -1,10 +1,15 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Testing; using System; using System.Collections.Immutable; +using System.IO; internal static class CSharpVerifierHelper { + internal static ReferenceAssemblies DefaultReferenceAssemblies { get; } = + ReferenceAssemblies.Default.WithNuGetConfigFilePath (Path.Combine (AppContext.BaseDirectory, "NuGet.config")); + /// /// By default, the compiler reports diagnostics for nullable reference types at /// , and the analyzer test framework defaults to only validating diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 94cc8fa27a6..27501ae7768 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -658,6 +658,7 @@ public void DuplicateRJavaOutput () new Package { Id = "Xamarin.GooglePlayServices.Base", Version = "118.2.0.5" }, new Package { Id = "Xamarin.GooglePlayServices.Basement", Version = "118.2.0.5" }, new Package { Id = "Xamarin.GooglePlayServices.Tasks", Version = "118.0.2.6" }, + KnownPackages.Xamarin_Build_Download, } }; using (var b = CreateApkBuilder ()) { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs index 11b95dcc3a7..615f3ff32b5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs @@ -127,7 +127,7 @@ public static class KnownPackages }; public static Package Xamarin_Build_Download = new Package { Id = "Xamarin.Build.Download", - Version = "0.11.4", + Version = "0.11.6", }; public static Package NuGet_Build_Packaging = new Package { Id = "NuGet.Build.Packaging",