Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move shared unit test code to a shared assembly #9420

Merged
merged 11 commits into from
Feb 20, 2024
Merged

Move shared unit test code to a shared assembly #9420

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d63f7d0
Assemble test library files shared in test projects from src\Shared\U…
GangWang01 Oct 31, 2023
a11ee21
Replace linked shared files with project reference
GangWang01 Nov 9, 2023
56dfc78
Modify shared test code file path in deprecated test projects
GangWang01 Nov 15, 2023
7965db6
Make test libraries public
GangWang01 Jan 8, 2024
1f49bfd
Extract the common key and key file into the same property group for …
GangWang01 Jan 9, 2024
2050b14
Change back the variable name
GangWang01 Jan 9, 2024
b5ab72f
Comment on the xunit package version not set in eng/Packages.props file
GangWang01 Jan 9, 2024
5715244
Remove targetframework for Mono build since the support was dropped
GangWang01 Jan 16, 2024
dcf87a1
Add test library project to Dev solution filter
GangWang01 Feb 19, 2024
10a14db
Merge branch 'main' into test-sharedcode
GangWang01 Feb 20, 2024
ec28dcb
Remove mono configuration of shared test library project
GangWang01 Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions MSBuild.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StringTools.Benchmark", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuild.VSSetup.Arm64", "src\Package\MSBuild.VSSetup.Arm64\MSBuild.VSSetup.Arm64.csproj", "{71E59632-D644-491B-AF93-22BC93167C56}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.UnitTests.Shared", "src\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj", "{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}"
GangWang01 marked this conversation as resolved.
Show resolved Hide resolved
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1342,6 +1344,46 @@ Global
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x64.Build.0 = Release-MONO|x64
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|ARM64.ActiveCfg = Debug|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|ARM64.Build.0 = Debug|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|x64.ActiveCfg = Debug|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|x64.Build.0 = Debug|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|x86.ActiveCfg = Debug|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug|x86.Build.0 = Debug|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|Any CPU.ActiveCfg = Debug-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|Any CPU.Build.0 = Debug-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|ARM64.ActiveCfg = Debug-MONO|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|ARM64.Build.0 = Debug-MONO|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|x64.ActiveCfg = Debug-MONO|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|x64.Build.0 = Debug-MONO|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|x86.ActiveCfg = Debug-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Debug-MONO|x86.Build.0 = Debug-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|ARM64.ActiveCfg = MachineIndependent|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|ARM64.Build.0 = MachineIndependent|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|x64.ActiveCfg = MachineIndependent|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|x64.Build.0 = MachineIndependent|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|Any CPU.Build.0 = Release|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|ARM64.ActiveCfg = Release|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|ARM64.Build.0 = Release|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x64.ActiveCfg = Release|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x64.Build.0 = Release|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x86.ActiveCfg = Release|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x86.Build.0 = Release|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|Any CPU.ActiveCfg = Release-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|Any CPU.Build.0 = Release-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|ARM64.ActiveCfg = Release-MONO|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|ARM64.Build.0 = Release-MONO|arm64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|x64.ActiveCfg = Release-MONO|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|x64.Build.0 = Release-MONO|x64
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
17 changes: 1 addition & 16 deletions src/Build.OM.UnitTests/Microsoft.Build.Engine.OM.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,9 @@
<Compile Include="..\Shared\EncodingStringWriter.cs">
<Link>EncodingStringWriter.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\ObjectModelHelpers.cs" />
<Compile Include="..\Shared\UnitTests\MockLogger.cs" />
<Compile Include="..\Shared\ErrorUtilities.cs" />
<Compile Include="..\Shared\FileDelegates.cs" />
<Compile Include="..\Shared\ResourceUtilities.cs" />
<Compile Include="..\Shared\UnitTests\EngineTestEnvironment.cs">
<Link>EngineTestEnvironment.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\TestEnvironment.cs">
<Link>TestEnvironment.cs</Link>
</Compile>
<Compile Include="..\Shared\BuildEnvironmentHelper.cs">
<Link>BuildEnvironmentHelper.cs</Link>
</Compile>
Expand All @@ -55,15 +47,7 @@
<Compile Include="..\Shared\EscapingUtilities.cs" />
<Compile Include="..\Shared\FileUtilitiesRegex.cs" />
<Compile Include="..\Shared\ExceptionHandling.cs" />
<Compile Include="..\Shared\UnitTests\TestData\GlobbingTestData.cs">
<Link>TestData\GlobbingTestData.cs</Link>
</Compile>
<Compile Include="..\Shared\ProcessExtensions.cs" />
<Compile Include="..\UnitTests.Shared\EnvironmentProvider.cs" />
<Compile Include="..\UnitTests.Shared\RunnerUtilities.cs" />
<Compile Include="..\UnitTests.Shared\DriveMapping.cs" />
<Compile Include="..\UnitTests.Shared\DummyMappedDrive.cs" />
<Compile Include="..\UnitTests.Shared\DummyMappedDriveUtils.cs"/>
<None Include="..\Shared\UnitTests\App.config">
<Link>App.config</Link>
<SubType>Designer</SubType>
Expand All @@ -79,6 +63,7 @@
<ProjectReference Include="..\Utilities\Microsoft.Build.Utilities.csproj" />
<ProjectReference Include="..\Tasks\Microsoft.Build.Tasks.csproj" />
<ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
<ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
26 changes: 1 addition & 25 deletions src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<ProjectReference Include="..\Tasks\Microsoft.Build.Tasks.csproj" />
<ProjectReference Include="..\Utilities\Microsoft.Build.Utilities.csproj" />
<ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
<ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />

<ProjectReference Include="..\Samples\TaskWithDependency\TaskWithDependency.csproj" Private="false" ReferenceOutputAssembly="false" OutputItemType="TaskWithDependencyResolvedProjectReferencePath">
<SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">TargetFramework=$(FullFrameworkTFM)</SetTargetFramework>
Expand All @@ -50,27 +51,12 @@
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\UnitTests\BuildEventArgsExtension.cs" />
<Compile Include="..\Shared\UnitTests\EscapingUtilities_Tests.cs" />
<Compile Include="..\Shared\UnitTests\ErrorUtilities_Tests.cs" />
<Compile Include="..\Shared\UnitTests\PrintLineDebugger_Tests.cs" />
<Compile Include="..\Shared\UnitTests\FileUtilities_Tests.cs" />
<Compile Include="..\Shared\UnitTests\FileMatcher_Tests.cs" />
<Compile Include="..\Shared\UnitTests\MockEngine.cs" />
<Compile Include="..\Shared\UnitTests\MockLogger.cs" />
<Compile Include="..\Shared\UnitTests\ResourceUtilities_Tests.cs" />
<Compile Include="..\UnitTests.Shared\EnvironmentProvider.cs" />
<Compile Include="..\UnitTests.Shared\RunnerUtilities.cs" />
<Compile Include="..\UnitTests.Shared\DriveMapping.cs" />
<Compile Include="..\UnitTests.Shared\DummyMappedDrive.cs" />
<Compile Include="..\UnitTests.Shared\DummyMappedDriveUtils.cs" />
<Compile Include="..\Shared\UnitTests\StreamHelpers.cs" />
<Compile Include="..\Shared\UnitTests\EngineTestEnvironment.cs">
<Link>EngineTestEnvironment.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\TestEnvironment.cs">
<Link>TestEnvironment.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\TypeLoader_Tests.cs" />
<Compile Include="..\Shared\UnitTests\TypeLoader_Dependencies_Tests.cs" />
<Compile Include="..\Shared\UnitTests\XmakeAttributes_Tests.cs">
Expand All @@ -83,22 +69,12 @@
<Compile Include="..\Shared\UnitTests\TaskParameter_Tests.cs">
<Link>TaskParameter_Tests.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\ObjectModelHelpers.cs" />
<Compile Include="..\Shared\UnitTests\CopyOnWriteDictionary_Tests.cs">
<Link>Collections\CopyOnWriteDictionary_Tests.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\TestData\GlobbingTestData.cs">
<Link>TestData\GlobbingTestData.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\ImmutableDictionary_Tests.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(MSBuildRuntimeType)' == 'Full' and '$(MonoBuild)' != 'true'">
<Link>Collections\ImmutableDictionary_Tests.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\LongPathSupportDisabledFactAttribute.cs">
<Link>Shared\LongPathSupportDisabledFactAttribute.cs</Link>
</Compile>
<Compile Include="..\UnitTests.Shared\RequiresSymbolicLinksFactAttribute.cs">
<Link>RequiresSymbolicLinksFactAttribute.cs</Link>
</Compile>

<None Include="..\Shared\UnitTests\App.config">
<Link>App.config</Link>
Expand Down
1 change: 1 addition & 0 deletions src/Build/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#endif
[assembly: InternalsVisibleTo("Microsoft.Build.Framework.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.Engine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.UnitTests.Shared, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.Conversion.Core, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: InternalsVisibleTo("Microsoft.Build.Conversion.Unittest, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.Tasks.Cop, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
Expand Down
4 changes: 2 additions & 2 deletions src/Deprecated/Conversion.UnitTests/XMakeConversionUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</PropertyGroup>
<ItemGroup>
<!-- Source Files -->
<Compile Include="..\..\shared\unittests\MockLogger.cs" />
<Compile Include="..\..\shared\unittests\ObjectModelHelpers.cs" />
<Compile Include="..\..\UnitTests.Shared\MockLogger.cs" />
<Compile Include="..\..\UnitTests.Shared\ObjectModelHelpers.cs" />
<Compile Include="OldVSProjectFileReader_Tests.cs" />
<Compile Include="ProjectFileConverter_Tests.cs" />
<!-- Assemblies Files we depend on -->
Expand Down
8 changes: 4 additions & 4 deletions src/Deprecated/Engine.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<Compile Include="..\Shared\UnitTests\ErrorUtilities_Tests.cs" />
<Compile Include="..\shared\unittests\FileUtilities_Tests.cs" />
<Compile Include="..\shared\unittests\FileMatcher_Tests.cs" />
<Compile Include="..\shared\unittests\ObjectModelHelpers.cs" />
<Compile Include="..\Shared\UnitTests\MockEngine.cs" />
<Compile Include="..\Shared\UnitTests\MockLogger.cs" />
<Compile Include="..\UnitTests.Shared\ObjectModelHelpers.cs" />
<Compile Include="..\UnitTests.Shared\MockEngine.cs" />
<Compile Include="..\UnitTests.Shared\MockLogger.cs" />
<Compile Include="..\shared\unittests\ResourceUtilities_Tests.cs" />
<Compile Include="..\Shared\UnitTests\SolutionParser_Tests.cs" />
<Compile Include="..\Shared\UnitTests\StreamHelpers.cs" />
<Compile Include="..\UnitTests.Shared\StreamHelpers.cs" />
<Compile Include="..\shared\unittests\TypeLoader_Tests.cs" />
<Compile Include="..\Shared\UnitTests\XmakeAttributes_Tests.cs">
<Link>XmakeAttributes_Tests.cs</Link>
Expand Down
4 changes: 3 additions & 1 deletion src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
<StrongNameKeyId>Microsoft</StrongNameKeyId>
</PropertyGroup>

<PropertyGroup Condition="'$(IsUnitTestProject)' == 'true'">
<PropertyGroup Condition="'$(IsTestLibrary)' == 'true' or '$(IsUnitTestProject)' == 'true'">
<StrongNameKeyId>MSBuildTest</StrongNameKeyId>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Test.snk</AssemblyOriginatorKeyFile>
<PublicKey>002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4</PublicKey>
<PublicKeyToken>9d77cc7ad39b68eb</PublicKeyToken>
</PropertyGroup>

<PropertyGroup Condition="'$(IsUnitTestProject)' == 'true'">
GangWang01 marked this conversation as resolved.
Show resolved Hide resolved
<!-- Set output type of test projects to EXE. This will allow us to run tests on .NET Core via F5 or "dotnet run" -->
<OutputType>Exe</OutputType>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
11 changes: 1 addition & 10 deletions src/Framework.UnitTests/Microsoft.Build.Framework.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\Shared\FileSystemSources.proj" />
<Import Project="..\Shared\DebuggingSources.proj" />

<PropertyGroup>
<TargetFrameworks>$(RuntimeOutputTargetFrameworks)</TargetFrameworks>
<PlatformTarget>$(RuntimeOutputPlatformTarget)</PlatformTarget>
Expand All @@ -22,24 +19,18 @@
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
<ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
<ProjectReference Include="..\StringTools\StringTools.csproj" />
<ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\UnitTests\TestEnvironment.cs" />
<Compile Include="..\Shared\FileUtilities.cs" />
<Compile Include="..\Shared\TempFileUtilities.cs" />
<Compile Include="..\Shared\ErrorUtilities.cs" />
<Compile Include="..\Shared\EscapingUtilities.cs" />
<Compile Include="..\Shared\BuildEnvironmentHelper.cs" />
<Compile Include="..\Shared\ProcessExtensions.cs" />
<Compile Include="..\Shared\ResourceUtilities.cs" />
<Compile Include="..\Shared\ExceptionHandling.cs" />
<Compile Include="..\Shared\FileUtilitiesRegex.cs" />
<Compile Include="..\Shared\UnitTests\AssemblyResources.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Framework/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
[assembly: InternalsVisibleTo("Microsoft.Build.Utilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.CommandLine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.Tasks.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
[assembly: InternalsVisibleTo("Microsoft.Build.UnitTests.Shared, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]

// This is the assembly-level GUID, and the GUID for the TypeLib associated with
// this assembly. We should specify this explicitly, as opposed to letting
Expand Down
10 changes: 1 addition & 9 deletions src/MSBuild.UnitTests/Microsoft.Build.CommandLine.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<ProjectReference Include="..\MSBuild\MSBuild.csproj" />
<ProjectReference Include="..\Utilities\Microsoft.Build.Utilities.csproj" />
<ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
<ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />

<!-- Tasks are needed for some tests -->
<ProjectReference Include="..\Tasks\Microsoft.Build.Tasks.csproj" />
Expand All @@ -33,18 +34,9 @@
<Compile Include="..\Shared\RegistryHelper.cs">
<Link>RegistryHelper.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\EngineTestEnvironment.cs" />
<Compile Include="..\Shared\UnitTests\TestEnvironment.cs">
<Link>TestEnvironment.cs</Link>
</Compile>
<Compile Include="..\Shared\VersionUtilities.cs">
<Link>VersionUtilities.cs</Link>
</Compile>
<Compile Include="..\Shared\UnitTests\MockEngine.cs" />
<Compile Include="..\Shared\UnitTests\MockLogger.cs" />
<Compile Include="..\Shared\UnitTests\ObjectModelHelpers.cs" />
<Compile Include="..\UnitTests.Shared\EnvironmentProvider.cs" />
<Compile Include="..\UnitTests.Shared\RunnerUtilities.cs" />

<EmbeddedResource Include="..\MSBuild\MSBuild\Microsoft.Build.Core.xsd">
<Link>Microsoft.Build.Core.xsd</Link>
Expand Down
Loading