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

Revert "Fix dependencies.props import (#833)" #1109

Closed
wants to merge 1 commit into from
Closed

Revert "Fix dependencies.props import (#833)" #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions src/coreclr/dir.common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,28 @@

<!-- Common properties -->
<PropertyGroup>
<RootRepoDir>$(MSBuildThisFileDirectory)..\..\</RootRepoDir>
<ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>

<__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</__ProjectDir>
<ProjectDir>$(__ProjectDir)\</ProjectDir>
<RootRepoDir>$(ProjectDir)\..\..\</RootRepoDir>
<ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir>

<BaseIntermediateOutputPath>$(RootRepoDir)artifacts\obj\coreclr\$(MSBuildProjectName)\</BaseIntermediateOutputPath>

<SourceDir>$(ProjectDir)src\</SourceDir>
<RootBinDir>$(RootRepoDir)artifacts\</RootBinDir>
<BinDir>$(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\</BinDir>
<SourceDir>$(__SourceDir)\</SourceDir>
<SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir>

<RootBinDir>$(__RootBinDir)\</RootBinDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(RootRepoDir)artifacts\</RootBinDir>

<BinDir>$(__BinDir)\</BinDir>
<BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\</BinDir>

<!-- We don't append back slash because this path is used by nuget.exe as output directory and it
fails to write packages to it if the path contains the forward slash.
-->
<PackagesBinDir>$(BinDir).nuget\</PackagesBinDir>
<PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir>
<PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -113,5 +122,5 @@
</PropertyGroup>

<!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
<Import Project="$(MSBuildThisFileDirectory)dependencies.props" />
<Import Project="$(ProjectDir)dependencies.props" />
</Project>
13 changes: 8 additions & 5 deletions src/coreclr/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,20 @@

<!-- Common repo directories -->
<PropertyGroup>
<TestProjectDir>$(MSBuildThisFileDirectory)</TestProjectDir>
<TestSourceDir>$(MSBuildThisFileDirectory)src\</TestSourceDir>
<ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
<SourceDir>$(ProjectDir)src\</SourceDir>
</PropertyGroup>

<!-- Common properties -->
<PropertyGroup>
<RootBinDir>$(MSBuildThisFileDirectory)..\..\..\artifacts\</RootBinDir>
<BinDir>$(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
<RootBinDir>$(__RootBinDir)\</RootBinDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\..\..\artifacts\</RootBinDir>

<BinDir>$(__BinDir)\</BinDir>
<BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>

<TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir>
<TestWorkingDir>$(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
<TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>

<AltJitArch>$(__AltJitArch)</AltJitArch>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/publishdependency.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- These projects are individually restored in order. Each
subsequent restore only copies files that don't already exist
in CORE_ROOT, so assets from the first project file win. -->
<CoreRootProjectFiles Include="$(TestSourceDir)Common\test_dependencies\test_dependencies.csproj" />
<CoreRootProjectFiles Include="$(SourceDir)Common\test_dependencies\test_dependencies.csproj" />
</ItemGroup>

<PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/coreclr/tests/runtest.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set "__ProjectDir=%~dp0"
:: remove trailing slash
if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
set "__ProjectFilesDir=%__ProjectDir%"
set "__RootBinDir=%~dp0..\..\..\artifacts"
set "__RootBinDir=%__ProjectDir%\..\artifacts"
set "__LogsDir=%__RootBinDir%\log"
set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"
set __ToolsDir=%__ProjectDir%\..\Tools
Expand Down Expand Up @@ -185,7 +185,8 @@ if defined RunInUnloadableContext (
set __RuntestPyArgs=%__RuntestPyArgs% --run_in_context
)

set NEXTCMD=python "%~dp0runtest.py" %__RuntestPyArgs%
REM __ProjectDir is poorly named, it is actually <projectDir>/tests
set NEXTCMD=python "%__ProjectDir%\runtest.py" %__RuntestPyArgs%
echo !NEXTCMD!
!NEXTCMD!

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateRunScript>false</GenerateRunScript>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<ProjectAssetsFile>$(TestSourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json</ProjectAssetsFile>
<ProjectAssetsFile>$(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json</ProjectAssetsFile>
</PropertyGroup>
<ItemGroup>
<CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
Expand All @@ -28,6 +28,6 @@
<!-- This project depends on properties pulled in by Directory.Build.targets in the test/src directory,
which isn't usually imported for the tests/src/Common
projects. -->
<Import Project="$(TestSourceDir)\Directory.Build.targets" />
<Import Project="$(SourceDir)\Directory.Build.targets" />

</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProjectAssetsFile>$(TestSourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json</ProjectAssetsFile>
<ProjectAssetsFile>$(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json</ProjectAssetsFile>
<NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
<NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/Common/ilasm/ilasm.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<PropertyGroup>
<RuntimeIdentifier>$(TargetRid)</RuntimeIdentifier>
<ProjectAssetsFile>$(TestSourceDir)Common\ilasm\obj\project.assets.json</ProjectAssetsFile>
<ProjectAssetsFile>$(SourceDir)Common\ilasm\obj\project.assets.json</ProjectAssetsFile>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />

<PropertyGroup>
<ProjectAssetsFile>$(TestSourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
<ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
</PropertyGroup>

<Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="asurt_99893.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegatecombine1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegatecombineimpl.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegateequals1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegategethashcode1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegategetinvocationlist1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegateremove.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="delegateremoveimpl.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Compile Include="ng_standard.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="negativegenerics.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="nullabletypes.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="central.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...oreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Compile Include="co6010delegateequalstwo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
<ItemGroup>
<WarningLevel Include="1" />
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Compile Include="co6031gethashcode.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
<ItemGroup>
<WarningLevel Include="1" />
Expand Down
2 changes: 1 addition & 1 deletion ...oreclr/tests/src/CoreMangLib/system/delegate/regressions/Github_13160/Github_13160.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...eclr/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="ddb113347.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToInt64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletoint64.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToSingle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletosingle.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToType.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletotype.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint16.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletouint16.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint32.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletouint32.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="enumiconvertibletouint64.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...oreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="verificationagent.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateEquals.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="verificationagent.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...oreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="verificationagent.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion .../tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="verificationagent.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...lr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="marshalsizeof1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...lr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="marshalsizeof2.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...s/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="safehandlector_cti.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...oreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="safehandledangerousaddref.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...MangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="safehandledangerousgethandle.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...reMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="safehandledangerousrelease.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
</ItemGroup>
</Project>
Loading