diff options
| author | vitek-karas <vitek.karas@microsoft.com> | 2019-11-29 17:35:30 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-11-30 11:48:41 +0300 |
| commit | 774a0b175a99b2302881d8ff4b0d051e7f2246f4 (patch) | |
| tree | 9be0003a8569488cc4630dbbf87d3f069f9d5a48 /test/Mono.Linker.Tests | |
| parent | cf0087516e9f15bb880938aec5223598d0676007 (diff) | |
Fix the illink.sln so that it loads in VS on Win
The trick is apprently adding the Configurations property.
The rest of the changes in the projects is more of a cleanup (moving general property groups up top).
Also renamed the ILLink.Tasks tests to match the folder and the product names.
VS on Windows forced rewrite of the illink.sln file unfortunately - trying to go back to the original ordering doesn't help - VS will overwrite it next time it opens it.
But it's really just order changes and project type GUIDs.
Diffstat (limited to 'test/Mono.Linker.Tests')
| -rw-r--r-- | test/Mono.Linker.Tests/Mono.Linker.Tests.csproj | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj b/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj index fb0938649..af6f2b840 100644 --- a/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj +++ b/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj @@ -1,27 +1,28 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup Condition=" $(Configuration.StartsWith('illink')) "> + <PropertyGroup> + <IsTestProject>true</IsTestProject> + <Configurations>Debug;Release;illink_Debug;illink_Release</Configurations> + </PropertyGroup> + + <PropertyGroup Condition="$(Configuration.StartsWith('illink'))"> <TargetFramework>netcoreapp3.0</TargetFramework> <ILLinkBuild>true</ILLinkBuild> <DefineConstants>$(DefineConstants);ILLINK</DefineConstants> - <DefineConstants Condition=" '$(Configuration)' == 'illink_Debug' ">$(DefineConstants);DEBUG</DefineConstants> + <DefineConstants Condition="'$(Configuration)' == 'illink_Debug'">$(DefineConstants);DEBUG</DefineConstants> <!-- Simulate https://github.com/dotnet/sdk/pull/2073 until it ships. --> - <DefineConstants Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(DefineConstants);NETCOREAPP</DefineConstants> + <DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp3.0'">$(DefineConstants);NETCOREAPP</DefineConstants> - <DefineConstants Condition=" '$(ArcadeBuild)' == 'true' ">$(DefineConstants);ARCADE</DefineConstants> + <DefineConstants Condition="'$(ArcadeBuild)' == 'true'">$(DefineConstants);ARCADE</DefineConstants> <!-- Arcade's custom test imports assume that we are using xunit. --> - <DisableArcadeTestFramework Condition=" '$(ArcadeBuild)' == 'true' ">true</DisableArcadeTestFramework> + <DisableArcadeTestFramework Condition="'$(ArcadeBuild)' == 'true'">true</DisableArcadeTestFramework> </PropertyGroup> - <PropertyGroup Condition=" ! $(Configuration.StartsWith('illink')) "> + <PropertyGroup Condition="!$(Configuration.StartsWith('illink'))"> <TargetFramework>net471</TargetFramework> <ILLinkBuild>false</ILLinkBuild> </PropertyGroup> - <PropertyGroup> - <IsTestProject>true</IsTestProject> - </PropertyGroup> - <ItemGroup> <Folder Include="Properties\" /> <Folder Include="TestCasesRunner\" /> @@ -36,7 +37,7 @@ <ProjectReference Include="..\Mono.Linker.Tests.Cases.Expectations\Mono.Linker.Tests.Cases.Expectations.csproj" /> </ItemGroup> - <ItemGroup Condition=" $(ILLinkBuild) "> + <ItemGroup Condition="$(ILLinkBuild)"> <PackageReference Include="System.CodeDom" Version="4.5.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" /> @@ -51,22 +52,22 @@ <Target Name="PrepareTools" BeforeTargets="Build" - Condition=" $(ILLinkBuild) "> + Condition="$(ILLinkBuild)"> <!-- Restore ilasm using ilasm.ilproj. Restore must be done separately from copy with a different set of input properties, to force MSBuild to re-evaluate using new props and targets from the restored package. --> <PropertyGroup> <IlasmProject>$(MSBuildThisFileDirectory)../../eng/ilasm.ilproj</IlasmProject> - <IlasmDir Condition=" '$(ArcadeBuild)' == 'true' ">$(ArtifactsDir)tools</IlasmDir> - <IlasmDir Condition=" '$(ArcadeBuild)' != 'true' ">$(MSBuildThisFileDirectory)$(BaseIntermediateOutputPath)tools</IlasmDir> + <IlasmDir Condition="'$(ArcadeBuild)' == 'true'">$(ArtifactsDir)tools</IlasmDir> + <IlasmDir Condition="'$(ArcadeBuild)' != 'true'">$(MSBuildThisFileDirectory)$(BaseIntermediateOutputPath)tools</IlasmDir> </PropertyGroup> <MSBuild Projects="$(IlasmProject)" Targets="Restore" Properties="BaseIntermediateOutputPath=$(IlasmDir)" /> <MSBuild Projects="$(IlasmProject)" Targets="CopyILAsmTool" Properties="BaseIntermediateOutputPath=$(IlasmDir);__BuildPhase=Copy" /> </Target> - <ItemGroup Condition=" ! $(ILLinkBuild) "> + <ItemGroup Condition="!$(ILLinkBuild)"> <PackageReference Include="NUnit" Version="3.6.1" /> <PackageReference Include="NUnit.ConsoleRunner" Version="3.6.1" /> <PackageReference Include="NUnit.Extension.NUnitV2ResultWriter" Version="3.5.0" /> |