mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix imports issue with test project

Browse source
This commit is contained in:
Jackson Schuster 2024-03-26 16:11:44 -07:00
parent 346f6347c5
commit 6101c31ba8
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/SourceBuild/content/test/Directory.Build.props
View file

@ -1,2 +1,7 @@
<Project>
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
<PropertyGroup>
</PropertyGroup>
</Project>

8
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
View file

@ -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;
}

5
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
View file

@ -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>

14
src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkKind.cs Normal file
View file

@ -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
}
}