diff --git a/eng/Subsets.props b/eng/Subsets.props index f0bb31a28aea7..772fbfcb99532 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -243,7 +243,7 @@ - diff --git a/src/coreclr/tools/aot/ILCompiler.Diagnostics/ILCompiler.Diagnostics.csproj b/src/coreclr/tools/aot/ILCompiler.Diagnostics/ILCompiler.Diagnostics.csproj index 8fe3bd1982d47..97c97bb7de720 100644 --- a/src/coreclr/tools/aot/ILCompiler.Diagnostics/ILCompiler.Diagnostics.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Diagnostics/ILCompiler.Diagnostics.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 40f19bfefc78a..0f7b6edfb9e3f 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj index 86644068f3c17..b57b5be6d076b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj @@ -31,6 +31,6 @@ - + diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj deleted file mode 100644 index 86b9c06a6cf0d..0000000000000 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj +++ /dev/null @@ -1,647 +0,0 @@ - - - Library - Internal.TypeSystem - ILCompiler.TypeSystem.ReadyToRun - true - netstandard2.0 - false - x64;x86 - AnyCPU - false - true - $(DefineConstants);DISABLE_UNMANAGED_PDB_SYMBOLS - - - false - Debug;Release;Checked - - - - - Internal.TypeSystem.Strings.resources - - - - - - $(SystemReflectionMetadataVersion) - - - 1.3.0 - - - - - TypeSystem\Common\ArrayMethod.Diagnostic.cs - - - TypeSystem\Canon\ArrayType.Canon.cs - - - TypeSystem\Canon\ByRefType.Canon.cs - - - TypeSystem\Canon\CanonTypes.cs - - - TypeSystem\Canon\CanonTypes.Diagnostic.cs - - - TypeSystem\Canon\CanonTypes.Interop.cs - - - TypeSystem\Canon\CanonTypes.Sorting.cs - - - TypeSystem\Canon\FunctionPointerType.Canon.cs - - - TypeSystem\Canon\GenericParameterDesc.Canon.cs - - - TypeSystem\Canon\StandardCanonicalizationAlgorithm.cs - - - TypeSystem\Canon\DefType.Canon.cs - - - TypeSystem\Canon\InstantiatedMethod.Canon.cs - - - TypeSystem\Canon\InstantiatedType.Canon.cs - - - TypeSystem\Canon\MetadataType.Canon.cs - - - TypeSystem\Canon\MethodDelegator.Canon.cs - - - TypeSystem\Canon\MethodDesc.Canon.cs - - - TypeSystem\Canon\MethodForInstantiatedType.Canon.cs - - - TypeSystem\Canon\ParameterizedType.Canon.cs - - - TypeSystem\Canon\PointerType.Canon.cs - - - TypeSystem\Canon\SignatureVariable.Canon.cs - - - TypeSystem\Canon\TypeDesc.Canon.cs - - - TypeSystem\Canon\TypeSystemContext.Canon.cs - - - TypeSystem\CodeGen\FieldDesc.CodeGen.cs - - - TypeSystem\CodeGen\MethodDelegator.CodeGen.cs - - - TypeSystem\CodeGen\MethodDesc.CodeGen.cs - - - TypeSystem\CodeGen\TargetDetails.CodeGen.cs - - - TypeSystem\CodeGen\TypeDesc.CodeGen.cs - - - Utilities\AlignmentHelper.cs - - - Utilities\ArrayOfTRuntimeInterfacesAlgorithm.cs - - - TypeSystem\Common\CastingHelper.cs - - - TypeSystem\Common\ConstructedTypeRewritingHelpers.cs - - - TypeSystem\Common\ExplicitLayoutValidator.cs - - - TypeSystem\Common\FunctionPointerType.cs - - - TypeSystem\Common\IAssemblyDesc.cs - - - TypeSystem\Common\IModuleResolver.cs - - - TypeSystem\Common\Instantiation.cs - - - TypeSystem\Common\ModuleDesc.cs - - - TypeSystem\Common\NotFoundBehavior.cs - - - TypeSystem\Common\ResolutionFailure.cs - - - TypeSystem\Common\TypeSystemEntity.cs - - - TypeSystem\Common\TypeSystemException.cs - - - TypeSystem\Common\TypeSystemException.Resources.cs - - - TypeSystem\Common\ThrowHelper.cs - - - TypeSystem\Common\ThrowHelper.Common.cs - - - TypeSystem\Common\UniversalCanonLayoutAlgorithm.cs - - - Utilities\CustomAttributeTypeNameFormatter.cs - - - Utilities\CustomAttributeTypeNameParser.cs - - - Utilities\GCPointerMap.Algorithm.cs - - - Utilities\GCPointerMap.cs - - - Utilities\DebugNameFormatter.cs - - - Utilities\LockFreeReaderHashtable.cs - - - TypeSystem\Common\ArrayType.cs - - - TypeSystem\Common\BaseTypeRuntimeInterfacesAlgorithm.cs - - - TypeSystem\Common\ByRefType.cs - - - TypeSystem\Common\GenericParameterDesc.cs - - - TypeSystem\Common\GenericParameterDesc.Diagnostic.cs - - - TypeSystem\Common\ExceptionStringID.cs - - - TypeSystem\Common\FieldForInstantiatedType.cs - - - TypeSystem\Common\FieldDesc.cs - - - TypeSystem\Common\FieldDesc.ToString.cs - - - TypeSystem\Common\FieldDesc.FieldLayout.cs - - - TypeSystem\Common\FieldLayoutAlgorithm.cs - - - TypeSystem\Common\InstantiatedMethod.cs - - - TypeSystem\Common\InstantiatedMethod.Diagnostic.cs - - - TypeSystem\Common\InstantiatedType.cs - - - TypeSystem\Common\InstantiatedType.Diagnostic.cs - - - TypeSystem\Common\InstantiatedType.Interfaces.cs - - - TypeSystem\Common\InstantiatedType.MethodImpls.cs - - - TypeSystem\Common\LayoutInt.cs - - - TypeSystem\Common\LinqPoison.cs - - - TypeSystem\Common\MetadataType.cs - - - TypeSystem\Common\DefType.Diagnostic.cs - - - TypeSystem\Common\MetadataType.Interfaces.cs - - - TypeSystem\Common\MetadataType.MethodImpls.cs - - - TypeSystem\Common\MetadataFieldLayoutAlgorithm.cs - - - TypeSystem\Common\MetadataRuntimeInterfacesAlgorithm.cs - - - TypeSystem\Common\MetadataTypeSystemContext.cs - - - TypeSystem\Common\MethodForInstantiatedType.cs - - - TypeSystem\Common\MethodForInstantiatedType.Diagnostic.cs - - - TypeSystem\Common\ParameterizedType.cs - - - TypeSystem\Common\PointerType.cs - - - TypeSystem\Common\PropertySignature.cs - - - TypeSystem\Common\SignatureVariable.cs - - - TypeSystem\Common\TargetArchitecture.cs - - - TypeSystem\Common\TargetDetails.cs - - - TypeSystem\Common\TargetDetails.ToString.cs - - - TypeSystem\Common\ThreadSafeFlags.cs - - - TypeSystem\Common\TypeFlags.cs - - - TypeSystem\Common\TypeHashingAlgorithms.cs - - - TypeSystem\Common\TypeSystemConstraintsHelpers.cs - - - TypeSystem\Common\TypeSystemContext.cs - - - TypeSystem\Common\TypeSystemHelpers.cs - - - Utilities\ExceptionTypeNameFormatter.cs - - - Utilities\ExceptionTypeNameFormatter.Metadata.cs - - - Utilities\TypeNameFormatter.cs - - - TypeSystem\Common\WellKnownType.cs - - - TypeSystem\Common\VirtualMethodAlgorithm.cs - - - TypeSystem\Common\MethodDelegator.cs - - - TypeSystem\Common\MethodDelegator.Diagnostic.cs - - - TypeSystem\Common\MethodDesc.cs - - - TypeSystem\Common\MethodDesc.Diagnostic.cs - - - TypeSystem\Common\MethodDesc.ToString.cs - - - TypeSystem\Common\StandardVirtualMethodAlgorithm.cs - - - TypeSystem\Common\TypeDesc.cs - - - TypeSystem\Common\TypeDesc.ToString.cs - - - TypeSystem\Common\TypeDesc.Interfaces.cs - - - TypeSystem\Common\DefType.cs - - - TypeSystem\Common\DefType.FieldLayout.cs - - - TypeSystem\Common\RuntimeInterfacesAlgorithm.cs - - - Ecma\CustomAttributeTypeProvider.cs - - - Ecma\EcmaAssembly.cs - - - Ecma\EcmaAssembly.Symbols.cs - - - Ecma\EcmaField.Sorting.cs - - - Ecma\EcmaField.CodeGen.cs - - - Ecma\EcmaField.Serialization.cs - - - Ecma\EcmaGenericParameter.Sorting.cs - - - Ecma\EcmaMethod.Sorting.cs - - - Ecma\EcmaModule.Sorting.cs - - - Ecma\EcmaType.Serialization.cs - - - Ecma\EcmaType.Sorting.cs - - - Ecma\PrimitiveTypeProvider.cs - - - Ecma\EcmaModule.Symbols.cs - - - Ecma\SymbolReader\PdbSymbolReader.cs - - - Ecma\SymbolReader\PortablePdbSymbolReader.cs - - - Ecma\SymbolReader\UnmanagedPdbSymbolReader.cs - - - Ecma\EcmaField.cs - - - Ecma\EcmaGenericParameter.cs - - - Ecma\EcmaGenericParameter.Diagnostic.cs - - - Ecma\EcmaMethod.cs - - - Ecma\EcmaMethod.cs - - - Ecma\EcmaModule.cs - - - Ecma\EcmaSignatureParser.cs - - - Ecma\EcmaType.cs - - - Ecma\EcmaType.Diagnostic.cs - - - Ecma\EcmaType.MethodImpls.cs - - - Ecma\EcmaType.Interfaces.cs - - - Ecma\MetadataExtensions.cs - - - Ecma\IMetadataStringDecoderProvider.cs - - - Ecma\CachingMetadataStringDecoder.cs - - - IL\EcmaMethodIL.cs - - - IL\EcmaMethodIL.Symbols.cs - - - IL\MethodIL.cs - - - IL\MethodIL.Symbols.cs - - - IL\MethodILDebugView.cs - - - IL\ILDisassembler.cs - - - IL\InstantiatedMethodIL.cs - - - IL\ILStackHelper.cs - - - IL\ILOpcode.cs - - - IL\ILOpcodeHelper.cs - - - IL\Stubs\ILEmitter.cs - - - IL\Stubs\PInvokeTargetNativeMethod.cs - - - IL\Stubs\PInvokeTargetNativeMethod.Diagnostic.cs - - - IL\Stubs\PInvokeTargetNativeMethod.Mangling.cs - - - IL\Stubs\PInvokeTargetNativeMethod.Sorting.cs - - - TypeSystem\CodeGen\FieldDesc.Serialization.cs - - - TypeSystem\CodeGen\TypeDesc.Serialization.cs - - - TypeSystem\Sorting\FieldDesc.Sorting.cs - - - TypeSystem\Sorting\FieldForInstantiatedType.Sorting.cs - - - TypeSystem\Sorting\InstantiatedMethod.Sorting.cs - - - TypeSystem\Sorting\MethodDesc.Sorting.cs - - - TypeSystem\Sorting\MethodForInstantiatedType.Sorting.cs - - - TypeSystem\Interop\FieldDesc.Interop.cs - - - TypeSystem\Interop\InstantiatedType.Interop.cs - - - TypeSystem\Interop\MetadataType.Interop.cs - - - TypeSystem\Interop\MethodDelegator.Interop.cs - - - TypeSystem\Interop\MethodDesc.Interop.cs - - - TypeSystem\Interop\MarshalAsDescriptor.cs - - - TypeSystem\Mangling\IPrefixMangledMethod.cs - - - TypeSystem\Mangling\IPrefixMangledType.cs - - - TypeSystem\Mangling\IPrefixMangledSignature.cs - - - Utilities\ArrayBuilder.cs - - - TypeSystem\Common\LocalVariableDefinition.cs - - - TypeSystem\RuntimeDetermined\ArrayType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\ByRefType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\FieldDesc.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\FunctionPointerType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\MethodDesc.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\PointerType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\MethodForRuntimeDeterminedType.cs - - - TypeSystem\RuntimeDetermined\MethodForRuntimeDeterminedType.cs - - - TypeSystem\RuntimeDetermined\MethodForRuntimeDeterminedType.Sorting.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedCanonicalizationAlgorithm.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedFieldLayoutAlgorithm.cs - - - TypeSystem\RuntimeDetermined\DefType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\GenericParameterDesc.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\ParameterizedType.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedType.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedType.Diagnostic.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedType.Sorting.cs - - - TypeSystem\RuntimeDetermined\RuntimeDeterminedTypeUtilities.cs - - - TypeSystem\RuntimeDetermined\SignatureVariable.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\TypeDesc.RuntimeDetermined.cs - - - TypeSystem\RuntimeDetermined\TypeSystemContext.RuntimeDetermined.cs - - - Common\System\FormattingHelpers.cs - - - TypeSystem\Sorting\ArrayType.Sorting.cs - - - TypeSystem\Sorting\ByRefType.Sorting.cs - - - TypeSystem\Sorting\FunctionPointerType.Sorting.cs - - - TypeSystem\Sorting\InstantiatedType.Sorting.cs - - - TypeSystem\Sorting\MethodSignature.Sorting.cs - - - TypeSystem\Sorting\PointerType.Sorting.cs - - - TypeSystem\Sorting\SignatureVariable.Sorting.cs - - - TypeSystem\Sorting\TypeDesc.Sorting.cs - - - TypeSystem\Sorting\TypeSystemComparer.cs - - - diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ArchitectureSpecificFieldLayoutTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ArchitectureSpecificFieldLayoutTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ArchitectureSpecificFieldLayoutTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ArchitectureSpecificFieldLayoutTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CanonicalizationTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CanonicalizationTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CanonicalizationTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CanonicalizationTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CastingTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CastingTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CastingTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CastingTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ConstraintsValidationTest.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ConstraintsValidationTest.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ConstraintsValidationTest.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ConstraintsValidationTest.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Canonicalization.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Canonicalization.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Canonicalization.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Canonicalization.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Casting.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Casting.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Casting.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Casting.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/CoreTestAssembly.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/CoreTestAssembly.csproj similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/CoreTestAssembly.csproj rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/CoreTestAssembly.csproj diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GCPointerMap.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GCPointerMap.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GCPointerMap.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GCPointerMap.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GenericConstraints.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GenericConstraints.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GenericConstraints.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GenericConstraints.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GenericTypes.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GenericTypes.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/GenericTypes.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/GenericTypes.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Hashcode.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Hashcode.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Hashcode.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Hashcode.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/InstanceFieldLayout.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/InstanceFieldLayout.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/InstanceFieldLayout.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/InstanceFieldLayout.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/InterfaceArrangements.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/InterfaceArrangements.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/InterfaceArrangements.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/InterfaceArrangements.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Marshalling.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Marshalling.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Marshalling.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Marshalling.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Platform.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/Platform.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/Platform.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/StaticFieldLayout.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/StaticFieldLayout.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/StaticFieldLayout.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/StaticFieldLayout.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/SyntheticVirtualOverride.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/SyntheticVirtualOverride.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/SyntheticVirtualOverride.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/SyntheticVirtualOverride.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/TypeNameParsing.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/TypeNameParsing.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/TypeNameParsing.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/TypeNameParsing.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/ValueTypeShapeCharacteristics.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/ValueTypeShapeCharacteristics.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/ValueTypeShapeCharacteristics.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/ValueTypeShapeCharacteristics.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/VirtualFunctionOverride.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/VirtualFunctionOverride.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/CoreTestAssembly/VirtualFunctionOverride.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/CoreTestAssembly/VirtualFunctionOverride.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/DefType.FieldLayoutTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/DefType.FieldLayoutTests.cs similarity index 98% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/DefType.FieldLayoutTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/DefType.FieldLayoutTests.cs index c82f6c21a85be..f41f4a7ea6306 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/DefType.FieldLayoutTests.cs +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/DefType.FieldLayoutTests.cs @@ -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; diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ExceptionStringTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ExceptionStringTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ExceptionStringTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ExceptionStringTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/GCPointerMapTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/GCPointerMapTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/GCPointerMapTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/GCPointerMapTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/GenericTypeAndMethodTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/GenericTypeAndMethodTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/GenericTypeAndMethodTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/GenericTypeAndMethodTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/HashcodeTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/HashcodeTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/HashcodeTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/HashcodeTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILCompiler.TypeSystem.ReadyToRun.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj similarity index 95% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILCompiler.TypeSystem.ReadyToRun.Tests.csproj rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj index 558daa29f76b7..e398c067dfe06 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILCompiler.TypeSystem.ReadyToRun.Tests.csproj +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj @@ -1,6 +1,6 @@ - ILCompiler.TypeSystem.ReadyToRun.Tests + ILCompiler.TypeSystem.Tests $(NetCoreAppToolCurrent) Debug;Release;Checked @@ -24,7 +24,7 @@ - + false diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILDisassemblerTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILDisassemblerTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILDisassemblerTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILDisassemblerTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/ILDisassembler.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/ILDisassembler.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/ILDisassembler.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/ILDisassembler.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/ILTestAssembly.ilproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/ILTestAssembly.ilproj similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/ILTestAssembly.ilproj rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/ILTestAssembly.ilproj diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/InstanceFieldLayout.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/InstanceFieldLayout.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/InstanceFieldLayout.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/InstanceFieldLayout.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/MDArrayFunctionResolution.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/MDArrayFunctionResolution.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/MDArrayFunctionResolution.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/MDArrayFunctionResolution.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/Main.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/Main.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/Main.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/Main.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/MethodImplOverride1.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/MethodImplOverride1.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/MethodImplOverride1.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/MethodImplOverride1.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/Signature.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/Signature.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/Signature.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/Signature.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/StaticFieldLayout.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/StaticFieldLayout.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/StaticFieldLayout.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/StaticFieldLayout.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/VirtualFunctionOverride.il b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/VirtualFunctionOverride.il similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ILTestAssembly/VirtualFunctionOverride.il rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILTestAssembly/VirtualFunctionOverride.il diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/InstanceFieldLayoutTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/InstanceFieldLayoutTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/InstanceFieldLayoutTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/InstanceFieldLayoutTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/InterfacesTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/InterfacesTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/InterfacesTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/InterfacesTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/MarshalUtilsTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/MarshalUtilsTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/MarshalUtilsTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/MarshalUtilsTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/RuntimeDeterminedTypesTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/RuntimeDeterminedTypesTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/RuntimeDeterminedTypesTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/RuntimeDeterminedTypesTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SignatureTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SignatureTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SignatureTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SignatureTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/StaticFieldLayoutTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/StaticFieldLayoutTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/StaticFieldLayoutTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/StaticFieldLayoutTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SyntheticVirtualOverrideTests.DiagnosticName.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SyntheticVirtualOverrideTests.DiagnosticName.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SyntheticVirtualOverrideTests.DiagnosticName.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SyntheticVirtualOverrideTests.DiagnosticName.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SyntheticVirtualOverrideTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SyntheticVirtualOverrideTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/SyntheticVirtualOverrideTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/SyntheticVirtualOverrideTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestMetadataFieldLayoutAlgorithm.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TestMetadataFieldLayoutAlgorithm.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestMetadataFieldLayoutAlgorithm.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TestMetadataFieldLayoutAlgorithm.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestTypeSystemContext.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TestTypeSystemContext.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestTypeSystemContext.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TestTypeSystemContext.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TypeNameParsingTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TypeNameParsingTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TypeNameParsingTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/TypeNameParsingTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/UniversalGenericFieldLayoutTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/UniversalGenericFieldLayoutTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/UniversalGenericFieldLayoutTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/UniversalGenericFieldLayoutTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ValueTypeShapeCharacteristicsTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ValueTypeShapeCharacteristicsTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ValueTypeShapeCharacteristicsTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ValueTypeShapeCharacteristicsTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/VirtualFunctionOverrideTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/VirtualFunctionOverrideTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/WellKnownTypeTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/WellKnownTypeTests.cs similarity index 100% rename from src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/WellKnownTypeTests.cs rename to src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/WellKnownTypeTests.cs diff --git a/src/coreclr/tools/aot/crossgen2.sln b/src/coreclr/tools/aot/crossgen2.sln index 4727feaef44e4..ee4d3a0973f01 100644 --- a/src/coreclr/tools/aot/crossgen2.sln +++ b/src/coreclr/tools/aot/crossgen2.sln @@ -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 @@ -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 @@ -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 diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props index e69b66ceecb3e..2d6e9dff4072d 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.props +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props @@ -29,7 +29,7 @@ - + diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj index c957bcd1b8a9e..5e27eb6011b4c 100644 --- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj +++ b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.sln b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.sln index 3d5a6f3b1ad1d..45bc67bf40140 100644 --- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.sln +++ b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.sln @@ -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 @@ -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 diff --git a/src/coreclr/tools/r2rdump/R2RDump.sln b/src/coreclr/tools/r2rdump/R2RDump.sln index e8f71beb5a007..9dad744181fd1 100644 --- a/src/coreclr/tools/r2rdump/R2RDump.sln +++ b/src/coreclr/tools/r2rdump/R2RDump.sln @@ -1,6 +1,6 @@ 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 @@ -8,7 +8,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.Reflection.Ready 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 @@ -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