From 6101c31ba82f258c6686ec1e3eb7fe8c088dae72 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:11:44 -0700
Subject: [PATCH] Fix imports issue with test project

---
 src/SourceBuild/content/test/Directory.Build.props |  5 +++++
 .../Microsoft.DotNet.UnifiedBuild.Tests/Config.cs  |  8 ++++----
 .../Microsoft.DotNet.UnifiedBuild.Tests.csproj     |  5 ++---
 .../Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs

diff --git a/src/SourceBuild/content/test/Directory.Build.props b/src/SourceBuild/content/test/Directory.Build.props
index 8c119d541..fca27833a 100644
--- a/src/SourceBuild/content/test/Directory.Build.props
+++ b/src/SourceBuild/content/test/Directory.Build.props
@@ -1,2 +1,7 @@
 <Project>
+  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
+  <PropertyGroup>
+
+
+  </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
index 76b81ec38..261863f18 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
@@ -18,10 +18,10 @@ public class Config : IDisposable
     public Config(IMessageSink sink)
     {
         _sink = sink;
-        UbBuildVersion = (string)AppContext.GetData(BuildVersionSwitch);
-        TargetRid = (string)AppContext.GetData(TargetRidSwitch);
-        PortableRid = (string)AppContext.GetData(PortableRidSwitch);
-        UbSdkArchivePath = (string)AppContext.GetData(UbSdkArchivePathSwitch);
+        UbBuildVersion = (string)(AppContext.GetData(BuildVersionSwitch) ?? throw new InvalidOperationException("Unified Build version must be specified"));
+        TargetRid = (string)(AppContext.GetData(TargetRidSwitch) ?? throw new InvalidOperationException("Target RID must be specified"));
+        PortableRid = (string)(AppContext.GetData(PortableRidSwitch) ?? throw new InvalidOperationException("Portable RID must be specified"));
+        UbSdkArchivePath = (string)(AppContext.GetData(UbSdkArchivePathSwitch) ?? throw new InvalidOperationException("Unified Build SDK archive path must be specified"));
         TargetArchitecture = TargetRid.Split('-')[1];
         MsftSdkArchivePath = AppContext.GetData(MsftSdkArchivePathSwitch) as string ?? DownloadMsftSdkArchive().Result;
     }
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
index 6e47edcf5..ca51f3738 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-  <Import Project="../../Directory.Build.props" />
-  <Import Project="../../Directory.Build.targets" />
+
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
@@ -36,5 +36,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs
new file mode 100644
index 000000000..f37b17e45
--- /dev/null
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.DotNet.UnifiedBuild.Tests
+{
+    internal enum SdkKind
+    {
+        Microsoft,
+        UnifiedBuild
+    }
+}