diff options
author | Michelle McDaniel <adiaaida@gmail.com> | 2016-05-13 08:15:20 -0700 |
---|---|---|
committer | Michelle McDaniel <adiaaida@gmail.com> | 2016-05-16 13:00:37 -0700 |
commit | 2c648cae7d94091ea4ae005dead77d6d6e474878 (patch) | |
tree | ff88b1a503fca1dfdc217f23eb2e63ac90769368 | |
parent | 4678ac883a8eafa45246fff978a4756483e0f067 (diff) | |
download | coreclr-2c648cae7d94091ea4ae005dead77d6d6e474878.tar.gz coreclr-2c648cae7d94091ea4ae005dead77d6d6e474878.tar.bz2 coreclr-2c648cae7d94091ea4ae005dead77d6d6e474878.zip |
Update sin projs with correct project includes
All of the xlang sin ilprojs were missing includes to the correct
references. This change updates the proj files with those
ProjectReferences. Additionally, this change updates the includes in the
il tests to match the name of sinlib assemblies.
Fixes #2442.
20 files changed, 40 insertions, 77 deletions
diff --git a/tests/issues.targets b/tests/issues.targets index 943c2e77dd..455ba36bda 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -151,30 +151,6 @@ <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd" > <Issue>2441</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_cs\_dbgsin_il_cs.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_cs\_odbgsin_il_cs.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_cs\_orelsin_il_cs.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_cs\_relsin_il_cs.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_il\_dbgsin_il_il.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_il\_odbgsin_il_il.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_il\_orelsin_il_il.cmd" > - <Issue>2442</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_il\_relsin_il_il.cmd" > - <Issue>2442</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd" > <Issue>2444</Issue> </ExcludeList> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj index 931d34535c..df020e3c92 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj @@ -45,7 +45,7 @@ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <ProjectReference Include="sinlib.csproj" /> + <ProjectReference Include="sinlib_cs.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj index d2a3bf03e3..f9252ab54e 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj @@ -35,7 +35,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sin.cs" /> - <ProjectReference Include="sinlib_il_d.ilproj" /> </ItemGroup> <ItemGroup> <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" /> @@ -44,6 +43,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <PropertyGroup> <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson> <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj index 6f5265ed8a..d4711a020a 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj @@ -37,6 +37,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_cs.csproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj index 591a8b9a4c..865d3a8b0e 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj @@ -37,6 +37,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj index 1e81a89d12..033a75790a 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj @@ -45,7 +45,7 @@ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <ProjectReference Include="sinlib.csproj" /> + <ProjectReference Include="sinlib_cs.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj index 5bed94ef53..bfa25bb29e 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj @@ -35,7 +35,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sin.cs" /> - <ProjectReference Include="sinlib_il_d.ilproj" /> </ItemGroup> <ItemGroup> <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" /> @@ -44,6 +43,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <PropertyGroup> <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson> <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj index 6f5265ed8a..d4711a020a 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj @@ -37,6 +37,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_cs.csproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj index 591a8b9a4c..865d3a8b0e 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj @@ -37,6 +37,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj index 227896d33b..9c03a0dd46 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj @@ -45,7 +45,7 @@ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <ProjectReference Include="sinlib.csproj" /> + <ProjectReference Include="sinlib_cs.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj index 860eb38f01..9a7f4b1f9f 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj @@ -35,7 +35,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sin.cs" /> - <ProjectReference Include="sinlib_il_r.ilproj" /> </ItemGroup> <ItemGroup> <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" /> @@ -44,6 +43,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <PropertyGroup> <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson> <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj index edde65b0bd..8916b606b1 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj @@ -36,6 +36,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_cs.csproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj index 1162194593..79c77d136d 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj @@ -36,6 +36,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj index 29ebd955b3..dfe600397e 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj @@ -45,7 +45,7 @@ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> </PropertyGroup> <ItemGroup> - <ProjectReference Include="sinlib.csproj" /> + <ProjectReference Include="sinlib_cs.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj index c50739b7f4..fe12df9c2c 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj @@ -35,7 +35,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sin.cs" /> - <ProjectReference Include="sinlib_il_r.ilproj" /> </ItemGroup> <ItemGroup> <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" /> @@ -44,6 +43,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <PropertyGroup> <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson> <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj index edde65b0bd..8916b606b1 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj @@ -36,6 +36,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_cs.csproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj index 1162194593..79c77d136d 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj @@ -36,6 +36,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="sinlib_il.ilproj" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/Boxing/xlang/sinlib.csproj b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj index 4c211abd8d..4c211abd8d 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/sinlib.csproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj diff --git a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il_r.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj index 379354ec64..379354ec64 100644 --- a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il_r.ilproj +++ b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj diff --git a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il_d.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il_d.ilproj deleted file mode 100644 index ccb6d3fb6a..0000000000 --- a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il_d.ilproj +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <AssemblyName>$(MSBuildProjectName)</AssemblyName> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Library</OutputType> - <CLRTestKind>BuildOnly</CLRTestKind> - <GenerateRunScript>false</GenerateRunScript> - <AppDesignerFolder>Properties</AppDesignerFolder> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - <PropertyGroup> - <DebugType>Full</DebugType> - </PropertyGroup> - <ItemGroup> - <Compile Include="sinlib.il" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> - </PropertyGroup> -</Project> |