Make SmokeTests use repo infrastructure

This allows the test project to just be invoked with
`dotnet test` or `dotnet build /t:Test` after the
VMR is built.

1. Stop depending on environment variables for state
   instead use RuntimeConfiguration values same
   as UnifiedBuild test project. Allow facts and
   theories to be conditioned based on boolean
   values instead of env vars.
2. Update the README with the new msbuild property
   switch names
3. Delete dead-code and the checked-in .sln file

Author: ViktorHofer

src/SourceBuild/content/.gitignore

@@ -3,7 +3,4 @@
 /artifacts
 /prereqs/packages
 /src/nuget-client/NuGet.config
-/test/Microsoft.DotNet.SourceBuild.SmokeTests/bin
-/test/Microsoft.DotNet.SourceBuild.SmokeTests/obj
-/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
 *.binlog

src/SourceBuild/content/Directory.Build.props

@@ -213,6 +213,7 @@
     <PoisonMarkerFile>.prebuilt.xml</PoisonMarkerFile>
     <PoisonReportDataFile>$(PackageReportDir)poison-catalog.xml</PoisonReportDataFile>
     <PoisonedReportFile>$(PackageReportDir)poisoned.txt</PoisonedReportFile>
+    <PoisonUsageReportFile>$(PackageReportDir)poison-usage.xml</PoisonUsageReportFile>
   </PropertyGroup>
 
   <Import Project="$(GitInfoAllRepoPropsFile)" />

src/SourceBuild/content/eng/build.sourcebuild.targets

@@ -1,13 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <SmokeTestsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'test', 'Microsoft.DotNet.SourceBuild.SmokeTests'))</SmokeTestsDir>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(EnablePoison)' == 'true'">
-    <PoisonUsageReportFile>$(PackageReportDir)poison-usage.xml</PoisonUsageReportFile>
-  </PropertyGroup>
-
   <!-- After building, generate a prebuilt usage report. -->
   <Target Name="ReportPrebuiltUsage"
           AfterTargets="Build"
@@ -121,70 +113,6 @@
     </Touch>
   </Target>
 
-  <Target Name="RunSmokeTest">
-    <ItemGroup>
-      <SdkTarballItem Include="$(ArtifactsAssetsDir)dotnet-sdk*$(ArchiveExtension)" />
-      <SourceBuiltArtifactsItem Include="$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).*$(ArchiveExtension)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <CustomTestEnvVars Condition="'$(EnablePoison)' == 'true'">SMOKE_TESTS_POISON_REPORT_PATH=$(PoisonUsageReportFile);</CustomTestEnvVars>
-      <SdkTarballPath>%(SdkTarballItem.Identity)</SdkTarballPath>
-      <SourceBuiltArtifactsPath>%(SourceBuiltArtifactsItem.Identity)</SourceBuiltArtifactsPath>
-      <SmokeTestConsoleVerbosity Condition="'$(SmokeTestConsoleVerbosity)' == ''">normal</SmokeTestConsoleVerbosity>
-    </PropertyGroup>
-
-    <!-- Multiple loggers are specified so that results are captured in trx and pipelines can fail with AzDO pipeline warnings -->
-    <!-- Workaround https://github.com/dotnet/source-build/issues/4003 by disabling VSTestUseMSBuildOutput -->
-    <Exec Command="$(DotnetTool) test $(SmokeTestsDir) --logger:trx --logger:'console;verbosity=$(SmokeTestConsoleVerbosity)' -c $(Configuration) -p:VSTestUseMSBuildOutput=false"
-          IgnoreStandardErrorWarningFormat="true"
-          EnvironmentVariables="
-            SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath);
-            SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH=$(SourceBuiltArtifactsPath);
-            SMOKE_TESTS_TARGET_RID=$(TargetRid);
-            SMOKE_TESTS_PORTABLE_RID=$(PortableRid);
-            SMOKE_TESTS_CUSTOM_PACKAGES_PATH=$(CustomSourceBuiltPackagesPath);
-            $(CustomTestEnvVars)" />
-  </Target>
-
-  <Target Name="CreateSmokeTestPrereqsTarball"
-          AfterTargets="RunSmokeTest"
-          Condition="'$(SkipSmokeTestPrereqsTarballCreation)' != 'true'"
-          DependsOnTargets="
-            CheckIfCreateSmokeTestPrereqsExistToPack;
-            CreateSmokeTestPrereqsTarballIfPrereqsExist"/>
-
-  <Target Name="CheckIfCreateSmokeTestPrereqsExistToPack">
-    <PropertyGroup>
-      <SmokeTestsArtifactsDir>$(SmokeTestsDir)bin/$(Configuration)/$(NetCurrent)/</SmokeTestsArtifactsDir>
-      <SmokeTestsPackagesDir>$(SmokeTestsArtifactsDir)packages/</SmokeTestsPackagesDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <SmokeTestsPrereqs Include="$(SmokeTestsPackagesDir)**/*.nupkg" />
-    </ItemGroup>
-
-    <Message Text="Found @(SmokeTestsPrereqs->Count()) prereqs in '$(SmokeTestsPackagesDir)'." Importance="High" />
-  </Target>
-
-  <Target Name="CreateSmokeTestPrereqsTarballIfPrereqsExist"
-          DependsOnTargets="DetermineSourceBuiltSdkVersion"
-          Condition="'@(SmokeTestsPrereqs->Count())' != '0'">
-    <PropertyGroup>
-      <SmokeTestPrereqsTarball>$(ArtifactsAssetsDir)dotnet-smoke-test-prereqs.$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</SmokeTestPrereqsTarball>
-      <SmokeTestsPrereqPackagesDir>$(SmokeTestsArtifactsDir)prereq-packages/</SmokeTestsPrereqPackagesDir>
-    </PropertyGroup>
-
-    <Copy SourceFiles="@(SmokeTestsPrereqs)"
-          DestinationFolder="$(SmokeTestsPrereqPackagesDir)" />
-
-    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(SmokeTestPrereqsTarball)'))" />
-    <Exec Command="tar --numeric-owner -czf $(SmokeTestPrereqsTarball) ."
-          WorkingDirectory="$(SmokeTestsPrereqPackagesDir)"/>
-
-    <Message Importance="High" Text="Packaged smoke-test prereqs in '$(SmokeTestPrereqsTarball)'" />
-  </Target>
-
   <Target Name="CreatePrebuiltsTarball"
           AfterTargets="Build"
           DependsOnTargets="

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs

@@ -42,13 +42,9 @@ public ArtifactsSizeTest(ITestOutputHelper outputHelper) : base(outputHelper)
         }
     }
 
-    [SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)]
+    [ConditionalFact(typeof(Config), nameOf(IncludeArtifactsSize))]
     public void CompareArtifactsToBaseline()
     {
-        Utilities.ValidateNotNullOrWhiteSpace(Config.SourceBuiltArtifactsPath, Config.SourceBuiltArtifactsPathEnv);
-        Utilities.ValidateNotNullOrWhiteSpace(Config.SdkTarballPath, Config.SdkTarballPathEnv);
-        Utilities.ValidateNotNullOrWhiteSpace(Config.TargetRid, Config.TargetRidEnv);
-
         var tarEntries = ProcessSdkAndArtifactsTarballs();
         ScanForDifferences(tarEntries);
         UpdateBaselineFile();

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ConditionalFactAttribute.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.DotNet.SourceBuild.SmokeTests;
+
+/// <summary>
+/// A Fact that conditionally runs based on a type's boolean property member
+/// </summary>
+internal sealed class ConditionalFactAttribute : FactAttribute
+{
+    public ConditionalFactAttribute(Type calleeType, string memberName, string? reason = null)
+    {
+        EvaluateSkip(calleeType, memberName, reason, (skip) => Skip = skip);
+    }
+
+    internal static void EvaluateSkip(Type calleeType, string memberName, string? reason = null, Action<string> setSkip)
+    {
+        TypeInfo typeInfo = calleeType.GetTypeInfo();
+        bool shouldRun = (bool?)typeInfo.GetProperty(memberName)?.GetValue(null) ?? false;
+        if (!shouldRun)
+        {
+            setSkip(reason ?? "Skipped");
+        }
+    }
+}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ConditionalTheoryAttribute.cs

@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace Microsoft.DotNet.SourceBuild.SmokeTests;
+
+/// <summary>
+/// A Theory that conditionally runs based on a type's boolean property member.
+/// </summary>
+internal sealed class ConditionalTheoryAttribute : TheoryAttribute
+{
+    public ConditionalTheoryAttribute(Type calleeType, string memberName, string? reason = null)
+    {
+        ConditionalFactAttribute.EvaluateSkip(calleeType, memberName, reason, (skip) => Skip = skip);
+    }
+}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs

@@ -9,43 +9,28 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests;
 
 internal static class Config
 {
-    public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR";
-    public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP";
-    public const string IncludeArtifactsSizeEnv = "SMOKE_TESTS_INCLUDE_ARTIFACTSSIZE";
-    public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH";
-    public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH";
-    public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID";
-    public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH";
-    public const string CustomPackagesPathEnv = "SMOKE_TESTS_CUSTOM_PACKAGES_PATH";
-    public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH";
-    public const string SourceBuiltArtifactsPathEnv = "SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH";
-    public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID";
-    public const string WarnSdkContentDiffsEnv = "SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS";
-    public const string WarnLicenseScanDiffsEnv = "SMOKE_TESTS_WARN_LICENSE_SCAN_DIFFS";
-    public const string RunningInCIEnv = "SMOKE_TESTS_RUNNING_IN_CI";
-    public const string LicenseScanPathEnv = "SMOKE_TESTS_LICENSE_SCAN_PATH";
+    const string ConfigSwitchPrefix = "Microsoft.DotNet.SourceBuild.SmokeTests.";
 
-    public static string DotNetDirectory { get; } =
-        Environment.GetEnvironmentVariable(DotNetDirectoryEnv) ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet");
-    public static string? MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv);
-    public static string? PoisonReportPath { get; } = Environment.GetEnvironmentVariable(PoisonReportPathEnv);
-    public static string PortableRid { get; } = Environment.GetEnvironmentVariable(PortableRidEnv) ??
-        throw new InvalidOperationException($"'{Config.PortableRidEnv}' must be specified");
-    public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv);
-    public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv);
-    public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv);
-    public static string? SourceBuiltArtifactsPath { get; } = Environment.GetEnvironmentVariable(SourceBuiltArtifactsPathEnv);
-    public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ??
-        throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified");
-    public static string TargetArchitecture { get; } = TargetRid.Split('-')[1];
-    public static bool WarnOnSdkContentDiffs { get; } =
-        bool.TryParse(Environment.GetEnvironmentVariable(WarnSdkContentDiffsEnv), out bool warnOnSdkContentDiffs) && warnOnSdkContentDiffs;
-    public static bool WarnOnLicenseScanDiffs { get; } =
-        bool.TryParse(Environment.GetEnvironmentVariable(WarnLicenseScanDiffsEnv), out bool warnOnLicenseScanDiffs) && warnOnLicenseScanDiffs;
+    public static string DotNetDirectory => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(DotNetDirectory)) ?? throw new InvalidOperationException("DotNetDirectory must be specified");
+    public static string PortableRid => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(PortableRid)) ?? throw new InvalidOperationException("Portable RID must be specified");
+    public static string TargetRid => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(TargetRid)) ?? throw new InvalidOperationException("Target RID must be specified");
+
+    public static string? CustomPackagesPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(CustomPackagesPath));
+    public static bool ExcludeOmniSharpTests => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(ExcludeOmniSharpTests)), out bool excludeOmniSharpTests) && excludeOmniSharpTests;
+    public static bool IncludeArtifactsSize => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(IncludeArtifactsSize)), out bool includeArtifactsSize) && includeArtifactsSize;
+    public static string? LicenseScanPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(LicenseScanPath));
+    public static string? MsftSdkTarballPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(MsftSdkTarballPath));
+    public static string? PoisonReportPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(PoisonReportPath));
+    public static string? PrereqsPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(PrereqsPath));
+    public static string? SdkTarballPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SdkTarballPath));
+    public static string? SourceBuiltArtifactsPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SourceBuiltArtifactsPath));
+    public static bool WarnOnLicenseScanDiffs => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(WarnOnLicenseScanDiffs)), out bool warnOnLicenseScanDiffs) && warnOnLicenseScanDiffs;
+    public static bool WarnOnSdkContentDiffs => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(WarnOnSdkContentDiffs)), out bool warnOnSdkContentDiffs) && warnOnSdkContentDiffs;
 
     // Indicates whether the tests are being run in the context of a CI pipeline
-    public static bool RunningInCI { get; } =
-        bool.TryParse(Environment.GetEnvironmentVariable(RunningInCIEnv), out bool runningInCI) && runningInCI;
-    
-    public static string? LicenseScanPath { get; } = Environment.GetEnvironmentVariable(LicenseScanPathEnv);
+    public static bool RunningInCI => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_CI")) ||
+        !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT")) ||
+        !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("AGENT_OS"));
+
+    public static string TargetArchitecture => TargetRid.Split('-')[1];
 }

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Directory.Build.props

@@ -72,7 +72,7 @@ private static void InitNugetConfig()
             if (!Directory.Exists(Config.PrereqsPath))
             {
                 throw new InvalidOperationException(
-                    $"Prereqs path '{Config.PrereqsPath}' specified in {Config.PrereqsPathEnv} does not exist.");
+                    $"Prereqs path '{Config.PrereqsPath}' specified via /p:SmokeTestsPrereqsPath='...' does not exist.");
             }
 
             string nugetConfig = File.ReadAllText(nugetConfigPath);

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

@@ -112,13 +112,15 @@ public class LicenseScanTests : TestBase
 
     private readonly string _targetRepo;
 
+    public bool ShouldScanForLicenses => !string.IsNullOrWhiteSpace(Config.LicenseScanPath);
+
     public LicenseScanTests(ITestOutputHelper outputHelper) : base(outputHelper)
     {
         Assert.NotNull(Config.LicenseScanPath);
         _targetRepo = new DirectoryInfo(Config.LicenseScanPath).Name;
     }
 
-    [SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)]
+    [ConditionalFact(typeof(typeof(LicenseScanTests), nameof(ShouldScanForLicenses))]
     public void ScanForLicenses()
     {
         Assert.NotNull(Config.LicenseScanPath);