Merge branch 'main' into Enji/shadwing

microsoft · Aug 20, 2024 · bda5505 · bda5505
2 parents 9963d1a + 019b8be
commit bda5505
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/...rationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/IgnoreExitCodeTests.cs b/...rationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/IgnoreExitCodeTests.cs
@@ -20,6 +20,7 @@ public class IgnoreExitCodeTests : AcceptanceTestBase
     <UseAppHost>true</UseAppHost>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
+    <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...rosoft.Testing.Platform.Acceptance.IntegrationTests/MSBuild.KnownExtensionRegistration.cs b/...rosoft.Testing.Platform.Acceptance.IntegrationTests/MSBuild.KnownExtensionRegistration.cs
@@ -68,6 +68,8 @@ public async Task Microsoft_Testing_Platform_Extensions_ShouldBe_Correctly_Regis
         <Nullable>enable</Nullable>
         <LangVersion>preview</LangVersion>
         <OutputType>Exe</OutputType>
+        <!-- Do not warn about package downgrade. NuGet uses alphabetical sort as ordering so -dev or -ci are considered downgrades of -preview. -->
+        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.GenerateEntryPoint.cs b/...Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.GenerateEntryPoint.cs
@@ -180,6 +180,7 @@ private async Task GenerateAndVerifyLanguageSpecificEntryPoint(string assetName,
         <Nullable>enable</Nullable>
         <LangVersion>preview</LangVersion>
         <OutputType>Exe</OutputType>
+        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -267,6 +268,7 @@ internal sealed class Capabilities : ITestFrameworkCapabilities
     <PropertyGroup>
         <TargetFramework>$TargetFrameworks$</TargetFramework>
         <OutputType>Exe</OutputType>
+        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -393,6 +395,7 @@ End Namespace
         <TargetFramework>$TargetFrameworks$</TargetFramework>
         <LangVersion>preview</LangVersion>
         <OutputType>Exe</OutputType>
+        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...egrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs b/...egrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs
@@ -228,7 +228,6 @@ public async Task InvokeTestingPlatform_Target_Showing_Error_And_Do_Not_Capture_
         <LangVersion>preview</LangVersion>
         <GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>
         <RootNamespace>MSBuildTests</RootNamespace>
-        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="$MicrosoftTestingPlatformVersion$" />

diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
@@ -95,6 +95,8 @@ public static async Task<DotnetMuxerResult> RunAsync(
                 args += " /warnaserror";
             }
 
+            args += " /p:SuppressNETCoreSdkPreviewMessage=true";
+
             if (DoNotRetry)
             {
                 return await CallTheMuxerAsync(args, environmentVariables, workingDirectory, timeoutInSeconds, failIfReturnValueIsNotZero);

diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/TempDirectory.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/TempDirectory.cs
@@ -168,9 +168,7 @@ internal static (string BaseDirectory, string FinalDirectory) CreateUniqueDirect
 <Project>
     <PropertyGroup>
       <RepoRoot>{System.IO.Path.GetDirectoryName(currentDirectory)}/</RepoRoot>
-      <!--
-        Do not warn about package downgrade. NuGet uses alphabetical sort as ordering so -dev or -ci are considered downgrades of -preview.
-        -->
+      <!-- Do not warn about package downgrade. NuGet uses alphabetical sort as ordering so -dev or -ci are considered downgrades of -preview. -->
       <NoWarn>NU1605</NoWarn>
       <RunAnalyzers>false</RunAnalyzers>
     </PropertyGroup>