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

Jump to bottom

Delete ILCompiler.TypeSystem.ReadyToRun project #63313

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Delete ILCompiler.TypeSystem.ReadyToRun project #63313

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
2 changes: 1 addition & 1 deletion eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />

<ProjectToBuild Condition="'$(TargetArchitecture)' != 'x64' and '$(BuildArchitecture)' == 'x64'" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj"
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.TypeSystem.Tests\ILCompiler.TypeSystem.Tests.csproj"
Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Compiler.Tests\ILCompiler.Compiler.Tests.csproj"
Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.Diagnostics/ILCompiler.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ItemGroup>
<ProjectReference Include="..\ILCompiler.DependencyAnalysisFramework\ILCompiler.DependencyAnalysisFramework.csproj" />
<ProjectReference Include="..\ILCompiler.Diagnostics\ILCompiler.Diagnostics.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...oreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />
</ItemGroup>
</Project>
647 changes: 0 additions & 647 deletions ...oreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
View file
Open in desktop

This file was deleted.

0 ...s/ArchitectureSpecificFieldLayoutTests.cs → ...s/ArchitectureSpecificFieldLayoutTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ReadyToRun.Tests/CanonicalizationTests.cs → ...TypeSystem.Tests/CanonicalizationTests.cs
View file
Open in desktop
File renamed without changes.
0 ...peSystem.ReadyToRun.Tests/CastingTests.cs → ...Compiler.TypeSystem.Tests/CastingTests.cs
View file
Open in desktop
File renamed without changes.
0 ...yToRun.Tests/ConstraintsValidationTest.cs → ...System.Tests/ConstraintsValidationTest.cs
View file
Open in desktop
File renamed without changes.
0 ...ests/CoreTestAssembly/Canonicalization.cs → ...ests/CoreTestAssembly/Canonicalization.cs
View file
Open in desktop
File renamed without changes.
0 ...dyToRun.Tests/CoreTestAssembly/Casting.cs → ...eSystem.Tests/CoreTestAssembly/Casting.cs
View file
Open in desktop
File renamed without changes.
0 .../CoreTestAssembly/CoreTestAssembly.csproj → .../CoreTestAssembly/CoreTestAssembly.csproj
View file
Open in desktop
File renamed without changes.
0 ...un.Tests/CoreTestAssembly/GCPointerMap.cs → ...em.Tests/CoreTestAssembly/GCPointerMap.cs
View file
Open in desktop
File renamed without changes.
0 ...ts/CoreTestAssembly/GenericConstraints.cs → ...ts/CoreTestAssembly/GenericConstraints.cs
View file
Open in desktop
File renamed without changes.
0 ...un.Tests/CoreTestAssembly/GenericTypes.cs → ...em.Tests/CoreTestAssembly/GenericTypes.cs
View file
Open in desktop
File renamed without changes.
0 ...yToRun.Tests/CoreTestAssembly/Hashcode.cs → ...System.Tests/CoreTestAssembly/Hashcode.cs
View file
Open in desktop
File renamed without changes.
0 ...s/CoreTestAssembly/InstanceFieldLayout.cs → ...s/CoreTestAssembly/InstanceFieldLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...CoreTestAssembly/InterfaceArrangements.cs → ...CoreTestAssembly/InterfaceArrangements.cs
View file
Open in desktop
File renamed without changes.
0 ...Run.Tests/CoreTestAssembly/Marshalling.cs → ...tem.Tests/CoreTestAssembly/Marshalling.cs
View file
Open in desktop
File renamed without changes.
0 ...yToRun.Tests/CoreTestAssembly/Platform.cs → ...System.Tests/CoreTestAssembly/Platform.cs
View file
Open in desktop
File renamed without changes.
0 ...sts/CoreTestAssembly/StaticFieldLayout.cs → ...sts/CoreTestAssembly/StaticFieldLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...eTestAssembly/SyntheticVirtualOverride.cs → ...eTestAssembly/SyntheticVirtualOverride.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/CoreTestAssembly/TypeNameParsing.cs → ...Tests/CoreTestAssembly/TypeNameParsing.cs
View file
Open in desktop
File renamed without changes.
0 ...Assembly/ValueTypeShapeCharacteristics.cs → ...Assembly/ValueTypeShapeCharacteristics.cs
View file
Open in desktop
File renamed without changes.
0 ...reTestAssembly/VirtualFunctionOverride.cs → ...reTestAssembly/VirtualFunctionOverride.cs
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...dyToRun.Tests/DefType.FieldLayoutTests.cs → ...eSystem.Tests/DefType.FieldLayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

using Xunit;

Expand Down
0 ....ReadyToRun.Tests/ExceptionStringTests.cs → ....TypeSystem.Tests/ExceptionStringTests.cs
View file
Open in desktop
File renamed without changes.
0 ...tem.ReadyToRun.Tests/GCPointerMapTests.cs → ...ler.TypeSystem.Tests/GCPointerMapTests.cs
View file
Open in desktop
File renamed without changes.
0 ...yToRun.Tests/GenericTypeAndMethodTests.cs → ...System.Tests/GenericTypeAndMethodTests.cs
View file
Open in desktop
File renamed without changes.
0 ...eSystem.ReadyToRun.Tests/HashcodeTests.cs → ...ompiler.TypeSystem.Tests/HashcodeTests.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...mpiler.TypeSystem.ReadyToRun.Tests.csproj → ....Tests/ILCompiler.TypeSystem.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>ILCompiler.TypeSystem.ReadyToRun.Tests</AssemblyName>
<AssemblyName>ILCompiler.TypeSystem.Tests</AssemblyName>
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
<Configurations>Debug;Release;Checked</Configurations>
<!-- This seems to be required for supporting assemblies to be copied into the output -->
Expand All @@ -24,7 +24,7 @@

<ItemGroup>
<ProjectReference Include="..\ILCompiler.ReadyToRun\ILCompiler.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />
<!-- Make sure the test data gets built -->
<ProjectReference Include="CoreTestAssembly\CoreTestAssembly.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Expand Down
0 ...m.ReadyToRun.Tests/ILDisassemblerTests.cs → ...r.TypeSystem.Tests/ILDisassemblerTests.cs
View file
Open in desktop
File renamed without changes.
0 ...un.Tests/ILTestAssembly/ILDisassembler.il → ...em.Tests/ILTestAssembly/ILDisassembler.il
View file
Open in desktop
File renamed without changes.
0 ...ests/ILTestAssembly/ILTestAssembly.ilproj → ...ests/ILTestAssembly/ILTestAssembly.ilproj
View file
Open in desktop
File renamed without changes.
0 ...sts/ILTestAssembly/InstanceFieldLayout.il → ...sts/ILTestAssembly/InstanceFieldLayout.il
View file
Open in desktop
File renamed without changes.
0 ...TestAssembly/MDArrayFunctionResolution.il → ...TestAssembly/MDArrayFunctionResolution.il
View file
Open in desktop
File renamed without changes.
0 ...m.ReadyToRun.Tests/ILTestAssembly/Main.il → ...r.TypeSystem.Tests/ILTestAssembly/Main.il
View file
Open in desktop
File renamed without changes.
0 ...sts/ILTestAssembly/MethodImplOverride1.il → ...sts/ILTestAssembly/MethodImplOverride1.il
View file
Open in desktop
File renamed without changes.
0 ...dyToRun.Tests/ILTestAssembly/Signature.il → ...eSystem.Tests/ILTestAssembly/Signature.il
View file
Open in desktop
File renamed without changes.
0 ...Tests/ILTestAssembly/StaticFieldLayout.il → ...Tests/ILTestAssembly/StaticFieldLayout.il
View file
Open in desktop
File renamed without changes.
0 ...ILTestAssembly/VirtualFunctionOverride.il → ...ILTestAssembly/VirtualFunctionOverride.il
View file
Open in desktop
File renamed without changes.
0 ...dyToRun.Tests/InstanceFieldLayoutTests.cs → ...eSystem.Tests/InstanceFieldLayoutTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ystem.ReadyToRun.Tests/InterfacesTests.cs → ...piler.TypeSystem.Tests/InterfacesTests.cs
View file
Open in desktop
File renamed without changes.
0 ...tem.ReadyToRun.Tests/MarshalUtilsTests.cs → ...ler.TypeSystem.Tests/MarshalUtilsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...oRun.Tests/RuntimeDeterminedTypesTests.cs → ...stem.Tests/RuntimeDeterminedTypesTests.cs
View file
Open in desktop
File renamed without changes.
0 ...System.ReadyToRun.Tests/SignatureTests.cs → ...mpiler.TypeSystem.Tests/SignatureTests.cs
View file
Open in desktop
File renamed without changes.
0 ...eadyToRun.Tests/StaticFieldLayoutTests.cs → ...ypeSystem.Tests/StaticFieldLayoutTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ticVirtualOverrideTests.DiagnosticName.cs → ...ticVirtualOverrideTests.DiagnosticName.cs
View file
Open in desktop
File renamed without changes.
0 ...un.Tests/SyntheticVirtualOverrideTests.cs → ...em.Tests/SyntheticVirtualOverrideTests.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/TestMetadataFieldLayoutAlgorithm.cs → ...Tests/TestMetadataFieldLayoutAlgorithm.cs
View file
Open in desktop
File renamed without changes.
0 ...ReadyToRun.Tests/TestTypeSystemContext.cs → ...TypeSystem.Tests/TestTypeSystemContext.cs
View file
Open in desktop
File renamed without changes.
0 ....ReadyToRun.Tests/TypeNameParsingTests.cs → ....TypeSystem.Tests/TypeNameParsingTests.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/UniversalGenericFieldLayoutTests.cs → ...Tests/UniversalGenericFieldLayoutTests.cs
View file
Open in desktop
File renamed without changes.
0 ...sts/ValueTypeShapeCharacteristicsTests.cs → ...sts/ValueTypeShapeCharacteristicsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...Run.Tests/VirtualFunctionOverrideTests.cs → ...tem.Tests/VirtualFunctionOverrideTests.cs
View file
Open in desktop
File renamed without changes.
0 ...em.ReadyToRun.Tests/WellKnownTypeTests.cs → ...er.TypeSystem.Tests/WellKnownTypeTests.cs
View file
Open in desktop
File renamed without changes.
77 changes: 40 additions & 37 deletions src/coreclr/tools/aot/crossgen2.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.DependencyAnalys
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.ReadyToRun", "ILCompiler.ReadyToRun\ILCompiler.ReadyToRun.csproj", "{83A832DE-BF4A-44C4-B361-90F5F88B979B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun", "ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj", "{751583CD-E880-49E1-B3E2-8B1990114CAC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun.Tests", "ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj", "{1043373D-8C14-4224-9E2B-75F0DE645E7E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Diagnostics", "ILCompiler.Diagnostics\ILCompiler.Diagnostics.csproj", "{3EACD929-4725-4173-A845-734936BBDF87}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{0BB34BA1-1B3A-445C-9C04-0D710D1983F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem", "ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj", "{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.Tests", "ILCompiler.TypeSystem.Tests\ILCompiler.TypeSystem.Tests.csproj", "{9E65EC58-B500-4C4A-B57D-BF242129A3C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Checked|Any CPU = Checked|Any CPU
Expand Down Expand Up @@ -74,39 +74,6 @@ Global
{83A832DE-BF4A-44C4-B361-90F5F88B979B}.Release|x64.Build.0 = Release|x64
{83A832DE-BF4A-44C4-B361-90F5F88B979B}.Release|x86.ActiveCfg = Release|x86
{83A832DE-BF4A-44C4-B361-90F5F88B979B}.Release|x86.Build.0 = Release|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Checked|Any CPU.ActiveCfg = Checked|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Checked|x64.ActiveCfg = Checked|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Checked|x64.Build.0 = Checked|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Checked|x86.ActiveCfg = Checked|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Checked|x86.Build.0 = Checked|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Debug|Any CPU.ActiveCfg = Debug|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Debug|x64.ActiveCfg = Debug|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Debug|x64.Build.0 = Debug|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Debug|x86.ActiveCfg = Debug|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Debug|x86.Build.0 = Debug|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Release|Any CPU.ActiveCfg = Release|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Release|x64.ActiveCfg = Release|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Release|x64.Build.0 = Release|x64
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Release|x86.ActiveCfg = Release|x86
{751583CD-E880-49E1-B3E2-8B1990114CAC}.Release|x86.Build.0 = Release|x86
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|Any CPU.Build.0 = Checked|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|x64.ActiveCfg = Checked|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|x64.Build.0 = Checked|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|x86.ActiveCfg = Checked|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Checked|x86.Build.0 = Checked|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|x64.ActiveCfg = Debug|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|x64.Build.0 = Debug|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|x86.ActiveCfg = Debug|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Debug|x86.Build.0 = Debug|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|Any CPU.Build.0 = Release|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|x64.ActiveCfg = Release|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|x64.Build.0 = Release|x64
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|x86.ActiveCfg = Release|Any CPU
{1043373D-8C14-4224-9E2B-75F0DE645E7E}.Release|x86.Build.0 = Release|Any CPU
{3EACD929-4725-4173-A845-734936BBDF87}.Checked|Any CPU.ActiveCfg = Debug|x86
{3EACD929-4725-4173-A845-734936BBDF87}.Checked|x64.ActiveCfg = Debug|x64
{3EACD929-4725-4173-A845-734936BBDF87}.Checked|x64.Build.0 = Debug|x64
Expand Down Expand Up @@ -142,6 +109,42 @@ Global
{0BB34BA1-1B3A-445C-9C04-0D710D1983F0}.Release|x64.Build.0 = Release|x64
{0BB34BA1-1B3A-445C-9C04-0D710D1983F0}.Release|x86.ActiveCfg = Release|Any CPU
{0BB34BA1-1B3A-445C-9C04-0D710D1983F0}.Release|x86.Build.0 = Release|Any CPU
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|Any CPU.ActiveCfg = Checked|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|Any CPU.Build.0 = Checked|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|x64.ActiveCfg = Checked|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|x64.Build.0 = Checked|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|x86.ActiveCfg = Checked|x86
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Checked|x86.Build.0 = Checked|x86
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|Any CPU.ActiveCfg = Debug|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|Any CPU.Build.0 = Debug|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|x64.ActiveCfg = Debug|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|x64.Build.0 = Debug|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|x86.ActiveCfg = Debug|x86
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Debug|x86.Build.0 = Debug|x86
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|Any CPU.ActiveCfg = Release|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|Any CPU.Build.0 = Release|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|x64.ActiveCfg = Release|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|x64.Build.0 = Release|x64
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|x86.ActiveCfg = Release|x86
{C07EE795-01F1-49F5-A4EE-F8235A1F3F7A}.Release|x86.Build.0 = Release|x86
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|x64.ActiveCfg = Checked|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|x64.Build.0 = Checked|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|x86.ActiveCfg = Checked|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Checked|x86.Build.0 = Checked|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|x64.ActiveCfg = Debug|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|x64.Build.0 = Debug|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|x86.ActiveCfg = Debug|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Debug|x86.Build.0 = Debug|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|Any CPU.Build.0 = Release|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|x64.ActiveCfg = Release|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|x64.Build.0 = Release|x64
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|x86.ActiveCfg = Release|Any CPU
{9E65EC58-B500-4C4A-B57D-BF242129A3C6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/crossgen2/crossgen2.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<ProjectReference Include="..\ILCompiler.DependencyAnalysisFramework\ILCompiler.DependencyAnalysisFramework.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />
<ProjectReference Include="..\ILCompiler.ReadyToRun\ILCompiler.ReadyToRun.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj" />
<ProjectReference Include="../aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj" />
<ProjectReference Include="../aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
Expand Down
39 changes: 21 additions & 18 deletions src/coreclr/tools/dotnet-pgo/dotnet-pgo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-pgo", "dotnet-pgo.csproj", "{7DA4CC22-F01D-4505-845F-57C06E5C3F9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{ED3FE303-74EB-43D1-BEA1-14484A14B22E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun", "..\aot\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj", "{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem", "..\aot\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj", "{8A811180-D605-469B-9693-EC3915B3E0DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -58,21 +58,24 @@ Global
{ED3FE303-74EB-43D1-BEA1-14484A14B22E}.Release|x64.Build.0 = Release|x64
{ED3FE303-74EB-43D1-BEA1-14484A14B22E}.Release|x86.ActiveCfg = Release|Any CPU
{ED3FE303-74EB-43D1-BEA1-14484A14B22E}.Release|x86.Build.0 = Release|Any CPU
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Checked|Any CPU.ActiveCfg = Checked|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Checked|x64.ActiveCfg = Checked|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Checked|x64.Build.0 = Checked|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Checked|x86.ActiveCfg = Checked|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Checked|x86.Build.0 = Checked|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Debug|Any CPU.ActiveCfg = Debug|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Debug|x64.ActiveCfg = Debug|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Debug|x64.Build.0 = Debug|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Debug|x86.ActiveCfg = Debug|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Debug|x86.Build.0 = Debug|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Release|Any CPU.ActiveCfg = Release|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Release|x64.ActiveCfg = Release|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Release|x64.Build.0 = Release|x64
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Release|x86.ActiveCfg = Release|x86
{D6BA6C4F-F7DF-4414-94BE-8E124CDDDEE6}.Release|x86.Build.0 = Release|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|Any CPU.ActiveCfg = Checked|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|Any CPU.Build.0 = Checked|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|x64.ActiveCfg = Checked|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|x64.Build.0 = Checked|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|x86.ActiveCfg = Checked|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Checked|x86.Build.0 = Checked|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|Any CPU.ActiveCfg = Debug|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|Any CPU.Build.0 = Debug|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|x64.ActiveCfg = Debug|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|x64.Build.0 = Debug|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|x86.ActiveCfg = Debug|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Debug|x86.Build.0 = Debug|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|Any CPU.ActiveCfg = Release|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|Any CPU.Build.0 = Release|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|x64.ActiveCfg = Release|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|x64.Build.0 = Release|x64
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|x86.ActiveCfg = Release|x86
{8A811180-D605-469B-9693-EC3915B3E0DC}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
39 changes: 21 additions & 18 deletions src/coreclr/tools/r2rdump/R2RDump.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29703.146
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R2RDump", "R2RDump.csproj", "{00CCF6D0-5905-428E-A2A2-2A6D09D8C257}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.ReadyToRun", "..\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj", "{E2A577E5-7AF3-49B3-BA78-7071B75ED64B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Diagnostics", "..\aot\ILCompiler.Diagnostics\ILCompiler.Diagnostics.csproj", "{4E9512BA-F963-472A-B689-37D4D32456F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.ReadyToRun", "..\aot\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj", "{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem", "..\aot\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj", "{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -76,21 +76,24 @@ Global
{4E9512BA-F963-472A-B689-37D4D32456F3}.Release|x64.Build.0 = Release|Any CPU
{4E9512BA-F963-472A-B689-37D4D32456F3}.Release|x86.ActiveCfg = Release|x86
{4E9512BA-F963-472A-B689-37D4D32456F3}.Release|x86.Build.0 = Release|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Checked|Any CPU.ActiveCfg = Checked|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Checked|x64.ActiveCfg = Checked|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Checked|x64.Build.0 = Checked|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Checked|x86.ActiveCfg = Checked|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Checked|x86.Build.0 = Checked|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Debug|Any CPU.ActiveCfg = Debug|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Debug|x64.ActiveCfg = Debug|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Debug|x64.Build.0 = Debug|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Debug|x86.ActiveCfg = Debug|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Debug|x86.Build.0 = Debug|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Release|Any CPU.ActiveCfg = Release|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Release|x64.ActiveCfg = Release|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Release|x64.Build.0 = Release|x64
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Release|x86.ActiveCfg = Release|x86
{F9CC5645-9E5D-41EE-ACD3-120F661DDA51}.Release|x86.Build.0 = Release|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|Any CPU.ActiveCfg = Checked|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|Any CPU.Build.0 = Checked|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|x64.ActiveCfg = Checked|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|x64.Build.0 = Checked|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|x86.ActiveCfg = Checked|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Checked|x86.Build.0 = Checked|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|Any CPU.ActiveCfg = Debug|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|Any CPU.Build.0 = Debug|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|x64.ActiveCfg = Debug|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|x64.Build.0 = Debug|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|x86.ActiveCfg = Debug|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Debug|x86.Build.0 = Debug|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|Any CPU.ActiveCfg = Release|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|Any CPU.Build.0 = Release|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|x64.ActiveCfg = Release|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|x64.Build.0 = Release|x64
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|x86.ActiveCfg = Release|x86
{99581B2F-ECF1-46A9-B4BC-AE6A54C1BC3C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down