diff options
202 files changed, 1375 insertions, 1787 deletions
diff --git a/.gitignore b/.gitignore index 0e66b98800..4f2797602f 100644 --- a/.gitignore +++ b/.gitignore @@ -149,8 +149,11 @@ publish/ # NuGet Packages *.nupkg +*.nuget.g.props +*.nuget.g.targets **/packages/* project.lock.json +project.assets.json # Windows Azure Build Output csx/ diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 591e3c8e33..268988da68 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01413-01
\ No newline at end of file +2.0.0-prerelease-01528-03
\ No newline at end of file diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index e42fc5fdff..32aae90d8a 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0-preview2-1-003182
\ No newline at end of file +2.0.0-preview1-005724
\ No newline at end of file diff --git a/Tools-Override/codeOptimization.targets b/Tools-Override/codeOptimization.targets deleted file mode 100644 index 4db340f15e..0000000000 --- a/Tools-Override/codeOptimization.targets +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> - - <PropertyGroup> - <OptimizationDataVersion Condition="'$(OptimizationDataVersion)'==''">2.0.0-rc-61101-16</OptimizationDataVersion> - <OptimizationDataPackageName Condition="'$(OptimizationDataPackageName)'==''">RoslynDependencies.OptimizationData</OptimizationDataPackageName> - <OptimizationDataDir Condition="'$(OptimizationDataDir)'==''">$(ToolsDir)OptimizationData/</OptimizationDataDir> - <RestoreDefaultOptimizationDataPackage Condition="'$(RestoreDefaultOptimizationDataPackage)'==''">true</RestoreDefaultOptimizationDataPackage> - <UsePartialNGENOptimization Condition="'$(UsePartialNGENOptimization)'==''">true</UsePartialNGENOptimization> - </PropertyGroup> - - <!-- If IBC data hasn't been merged with the IL yet, preprocess it first --> - <Target Name="PreProcessIBCData" - BeforeTargets="OptimizeWithTrainingData" - DependsOnTargets="ResolveOptionalTools" - Condition="'$(OS)'=='Windows_NT' and '$(EnableProfileGuidedOptimization)'=='true' and Exists('$(OptimizationDataDir)$(AssemblyName).dll')"> - - <!-- Find IBCMerge as a resolved optional tool. --> - <PropertyGroup> - <IBCMergeToolPath Condition="'%(Filename)%(Extension)'=='ibcmerge.exe'">@(ResolvedOptionalToolReferences)</IBCMergeToolPath> - </PropertyGroup> - - <!-- Enumerate the various files that need merging --> - <PropertyGroup> - <InputAssemblyFile>$(OptimizationDataDir)$(AssemblyName).dll</InputAssemblyFile> - <TargetOptimizationDataFile>$(OptimizationDataDir)$(AssemblyName).pgo</TargetOptimizationDataFile> - </PropertyGroup> - <ItemGroup> - <RawOptimizationDataFiles Include="$(OptimizationDataDir)$(AssemblyName)*.ibc" /> - </ItemGroup> - - <!-- Merge the optimization data into the source DLL --> - <Exec Command="$(IBCMergeToolPath) -q -f -delete -mo $(InputAssemblyFile) @(RawOptimizationDataFiles, ' ')" /> - - <!-- Verify that the optimization data has been merged --> - <Exec Command="$(IBCMergeToolPath) -mi $(InputAssemblyFile)" /> - - <!-- Save the module as *.pgo to match the convention expected in target OptimizeWithTrainingData --> - <Copy SourceFiles="$(InputAssemblyFile)" DestinationFiles="$(TargetOptimizationDataFile)" /> - </Target> - - <!-- We should only run this target on Windows and only if EnableProfileGuidedOptimization is set and we have training data --> - <Target Name="OptimizeWithTrainingData" - AfterTargets="AfterBuild" - BeforeTargets="CopyFilesToOutputDirectory" - DependsOnTargets="ResolveOptionalTools" - Condition="'$(OS)'=='Windows_NT' and '$(EnableProfileGuidedOptimization)'=='true' and Exists('$(OptimizationDataDir)$(AssemblyName).pgo')"> - - <!-- Find IBCMerge as a resolved optional tool. --> - <PropertyGroup> - <IBCMergeToolPath Condition="'%(Filename)%(Extension)'=='ibcmerge.exe'">@(ResolvedOptionalToolReferences)</IBCMergeToolPath> - </PropertyGroup> - - <PropertyGroup> - <OptimizedAssemblyDir>$(IntermediateOutputPath)/OptimizedAssembly</OptimizedAssemblyDir> - <OptimizedAssemblyFile>$(OptimizedAssemblyDir)/$(AssemblyName).dll</OptimizedAssemblyFile> - </PropertyGroup> - - <!-- Customize IBCMerge's arguments depending on input props --> - <PropertyGroup> - <IBCMergeArguments>-q -f -mo $(OptimizedAssemblyFile) -incremental $(OptimizationDataDir)$(AssemblyName).pgo</IBCMergeArguments> - <IBCMergeArguments Condition="$(UsePartialNGENOptimization)">$(IBCMergeArguments) -partialNGEN -minify</IBCMergeArguments> - </PropertyGroup> - - <!-- Copy the compiled assembly into a folder for further processing --> - <MakeDir Directories="$(OptimizedAssemblyDir)" /> - <Copy SourceFiles="@(IntermediateAssembly)" DestinationFolder="$(OptimizedAssemblyDir)" /> - - <!-- Apply optimization data to the compiled assembly --> - <Exec Command="$(IBCMergeToolPath) $(IBCMergeArguments)" /> - - <!-- Verify that the optimization data has been applied --> - <Exec Command="$(IBCMergeToolPath) -mi $(OptimizedAssemblyFile)" /> - - <!-- We need to make sure that the assembly that gets packaged is the one with the optimization data --> - <ItemGroup> - <IntermediateAssembly Remove="@(IntermediateAssembly)"/> - <IntermediateAssembly Include="$(OptimizedAssemblyDir)/$(AssemblyName).dll"/> - </ItemGroup> - </Target> - - <!-- We need the OptimizationData package in order to be able to optimize the assembly --> - <Target Name="RestoreOptimizationDataPackage" - BeforeTargets="Sync" - Condition="'$(EnableProfileGuidedOptimization)'=='true' and '$(RestoreDefaultOptimizationDataPackage)'=='true' and !Exists('$(OptimizationDataDir)project.json')"> - - <!-- Dynamically create a project.json file used to restore the optimization data--> - <Message Text="Generating project.json for optimization data" Importance="low" /> - <ItemGroup> - <_OptimizationDataJsonLine Include="{"dependencies": {" /> - <_OptimizationDataJsonLine Include=""$(OptimizationDataPackageName)" : "$(OptimizationDataVersion)" " /> - <_OptimizationDataJsonLine Include="},"frameworks": {"netcoreapp1.0": {},"net46": {}}}"/> - </ItemGroup> - - <PropertyGroup> - <OptimizationDataProjectJson>$(OptimizationDataDir)project.json</OptimizationDataProjectJson> - <OptimizationDataNuGetFeed Condition="'$(OptimizationDataNuGetFeed)'==''">https:%2F%2Fdotnet.myget.org/F/roslyn/api/v3/index.json</OptimizationDataNuGetFeed> - </PropertyGroup> - - <MakeDir Directories="$(OptimizationDataDir)" ContinueOnError="true" /> - <WriteLinesToFile File="$(OptimizationDataProjectJson)" Lines="@(_OptimizationDataJsonLine)" Overwrite="true" /> - - <!-- Restore the OptimizationData package --> - <Exec Command="$(DnuRestoreCommand) $(OptimizationDataProjectJson) --source $(OptimizationDataNuGetFeed)" - StandardOutputImportance="Low"/> - - <!-- Copy the restored files into a more accessible location --> - <ItemGroup> - <_OptimizationDataFiles Include="$(PackagesDir)/$(OptimizationDataPackageName)/$(OptimizationDataVersion)/content/OptimizationData/*.pgo" /> - </ItemGroup> - - <Copy SourceFiles="@(_OptimizationDataFiles)" - DestinationFiles="@(_OptimizationDataFiles->'$(OptimizationDataDir)%(Filename)%(Extension)')" - SkipUnchangedFiles="true" - ContinueOnError="true"/> - </Target> -</Project>
\ No newline at end of file diff --git a/Tools-Override/depProj.targets b/Tools-Override/depProj.targets deleted file mode 100644 index ea32123741..0000000000 --- a/Tools-Override/depProj.targets +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -*********************************************************************************************** -depProj.targets - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -This file defines the steps in the standard build process specific for NuGet deployment -projects. The remainder of the build process is defined in Microsoft.Common.targets, -which is imported by this file. - -Licensed to the .NET Foundation under one or more agreements. -The .NET Foundation licenses this file to you under the MIT license. -See the LICENSE file in the project root for more information. -*********************************************************************************************** ---> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - <!-- Deployment project - Restores NuGet dependencies and copies them to the output directory. - - NuGetTargetMoniker - determined by the TargetFramework* and TargetPlatform* - properties of the project, can be overidden. - NuGetRuntimeIdentifier - defaults to <empty> (""), can be overidden. - NuGetDeploySourceItem - defaults to ReferenceCopyLocalPaths, can be overidden to - specify Reference (for compile assets) or Analyzer(for - analyzer assets) - - For the appropriate behavior of P2P references the project should set the - TargetName and TargetExt to match one of the files that will be copied - from the packages. - --> - - <PropertyGroup> - <NuGetDeploySourceItem Condition="'$(NuGetDeploySourceItem)' == ''">ReferenceCopyLocalPaths</NuGetDeploySourceItem> - - <!-- suppress the attempt to copy build output. --> - <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory> - - <!-- Unless overridden, use no runtime identifier. This is transformed in packageresolve.targets. - We specify "None" here to avoid being assigned the default runtime for projects which set CopyNuGetImplementations=true. --> - <NuGetRuntimeIdentifier Condition="'$(NuGetRuntimeIdentifier)' == ''">None</NuGetRuntimeIdentifier> - - <!-- make sure we tell nuget targets to copy, even if output type would not by default --> - <CopyNuGetImplementations>true</CopyNuGetImplementations> - - <!-- by default there shouldn't be any assets in depproj files that require signing --> - <SkipSigning Condition="'$(SkipSigning)' == ''">true</SkipSigning> - </PropertyGroup> - - <Target Name="CoreCompile"> - - <Error Condition="'$(NuGetDeploySourceItem)' != 'ReferenceCopyLocalPaths' AND - '$(NuGetDeploySourceItem)' != 'Reference' AND - '$(NuGetDeploySourceItem)' != 'Analyzer'" - Text="Unexpected value for NuGetDeploySourceItem:'$(NuGetDeploySourceItem)'. Expected ReferenceCopyLocalPaths, Reference, or Analyzer." /> - - <ItemGroup> - <!-- Don't set IntermediateAssembly since this is not produced --> - <IntermediateAssembly Remove="@(IntermediateAssembly)" /> - - <NuGetDeploy Include="@($(NuGetDeploySourceItem))"/> - - <!-- filter to only items that came from packages --> - <!-- the following condition must be applied after the include because msbuild doesn't seem - to support property-defined-item-names in a metadata statement --> - <NuGetDeploy Remove="@(NuGetDeploy)" Condition="'%(NuGetDeploy.NuGetPackageId)' == ''" /> - - <!-- remove all existing items from NuGet packages we'll be defining these in our own item --> - <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''"/> - <Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' != ''"/> - <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' != ''"/> - - <!-- add items defined by NuGetDeployItem property to Content so that we get clean behavior --> - <ContentWithTargetPath Include="@(NuGetDeploy)"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <TargetPath>%(FileName)%(Extension)</TargetPath> - </ContentWithTargetPath> - </ItemGroup> - - <Error Condition="'@(NuGetDeploy)' == ''" Text="Error no assets were resolved from NuGet packages." /> - <Message Importance="High" Text="%(FullPath) (%(NuGetPackageId).%(NuGetPackageVersion)) -> @(NuGetDeploy->'$(TargetDir)%(FileName)%(Extension)')" /> - - <!-- Include marker files if an extension has been provided --> - <!-- internal builds use this to distinguish files which have already been signed --> - <Touch Condition="'$(DeployMarkerExtension)' != ''" Files="@(NuGetDeploy->'$(TargetDir)%(FileName)$(DeployMarkerExtension)')" AlwaysCreate="true"> - <Output TaskParameter="TouchedFiles" ItemName="FileWrites"/> - </Touch> - </Target> - - <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" /> - - <!-- Required by Common.Targets but not used for depproj --> - <Target Name="CreateManifestResourceNames" /> - - <PropertyGroup> - <!-- don't use TargetingPackReference, we do our own filtering --> - <SkipFilterTargetingPackResolvedNugetPackages>true</SkipFilterTargetingPackResolvedNugetPackages> - </PropertyGroup> - - <!-- Support filtering to a subset of packages or files --> - <Target Name="FilterNugetPackages" - AfterTargets="ResolveNuGetPackages" - Condition="'@(PackageToInclude)' != '' OR '@(PackageToExclude)' != '' OR '@(FileToInclude)' != '' OR '@(FileToExclude)' != ''"> - <ItemGroup> - <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/> - <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')"> - <OriginalItemSpec>%(Identity)</OriginalItemSpec> - </_nuGetDeployByFileName> - - <_nuGetDeployByFileNameToRemove Include="@(_nuGetDeployByFileName)" Exclude="@(FileToInclude)" Condition="'@(FileToInclude)' != ''" /> - <_filteredNuGetDeployByFileName Include="@(_nuGetDeployByFileName)" Exclude="@(_nuGetDeployByFileNameToRemove);@(FileToExclude)" /> - - <_nuGetDeployByPackageId Include="@(_filteredNuGetDeployByFileName->'%(NuGetPackageId)')" /> - - <_nuGetDeployByPackageIdToRemove Include="@(_nuGetDeployByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" /> - <_filteredNuGetDeployByPackageId Include="@(_nuGetDeployByPackageId)" Exclude="@(_nuGetDeployByPackageIdToRemove);@(PackageToExclude)" /> - - <ReferenceCopyLocalPaths Condition="'$(NuGetDeploySourceItem)' == 'ReferenceCopyLocalPaths'" Remove="@(ReferenceCopyLocalPaths)" /> - <Reference Condition="'$(NuGetDeploySourceItem)' == 'Reference'" Remove="@(Reference)" /> - <Analyzer Condition="'$(NuGetDeploySourceItem)' == 'Analyzer'" Remove="@(Analyzer)" /> - </ItemGroup> - - <CreateItem Include="@(_filteredNuGetDeployByPackageId->'%(OriginalItemSpec)')"> - <Output TaskParameter="Include" ItemName="$(NuGetDeploySourceItem)" /> - </CreateItem> - </Target> - -</Project> diff --git a/Tools-Override/resources.targets b/Tools-Override/resources.targets deleted file mode 100644 index 82ce179ac7..0000000000 --- a/Tools-Override/resources.targets +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask TaskName="GenerateResourcesCode" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <PropertyGroup> - <GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime> - <GenerateResourceMSBuildArchitecture>CurrentArchitecture</GenerateResourceMSBuildArchitecture> - </PropertyGroup> - - <PropertyGroup> - <ResourcesSourceOutputDirectory Condition="'$(ResourcesSourceOutputDirectory)' == ''">$(MSBuildProjectDirectory)/Resources/</ResourcesSourceOutputDirectory> - <StringResourcesPath Condition="'$(StringResourcesPath)'=='' And Exists('$(ResourcesSourceOutputDirectory)Strings.resx')">$(ResourcesSourceOutputDirectory)/Strings.resx</StringResourcesPath> - <IntermediateResOutputFileFullPath Condition="'$(MSBuildProjectExtension)' == '.csproj'">$(IntermediateOutputPath)SR.cs</IntermediateResOutputFileFullPath> - <IntermediateResOutputFileFullPath Condition="'$(MSBuildProjectExtension)' == '.vbproj'">$(IntermediateOutputPath)SR.vb</IntermediateResOutputFileFullPath> - <DefineConstants Condition="'$(ConfigurationGroup)' == 'Debug'">$(DefineConstants);DEBUGRESOURCES</DefineConstants> - </PropertyGroup> - - <PropertyGroup Condition="'$(StringResourcesPath)'!=''"> - <CompileDependsOn> - GenerateResourcesSource; - $(CompileDependsOn); - </CompileDependsOn> - </PropertyGroup> - - <Target Name="GenerateResourcesSource" - Condition="'$(StringResourcesPath)'!='' AND '$(OmitResources)'!='true'" - Inputs="$(StringResourcesPath)" - Outputs="$(IntermediateResOutputFileFullPath)"> - - - - <GenerateResourcesCode - ResxFilePath="$(StringResourcesPath)" - OutputSourceFilePath="$(IntermediateResOutputFileFullPath)" - AssemblyName="$(AssemblyName)" /> - - <ItemGroup> - <!-- The following Compile element has to be included dynamically inside the Target otherwise intellisense will not work --> - <Compile Include="$(IntermediateResOutputFileFullPath)" /> - </ItemGroup> - - <ItemGroup> - <FileWrites Include="$(IntermediateResOutputFileFullPath)" /> - </ItemGroup> - </Target> - - <ItemGroup Condition="'$(StringResourcesPath)'!='' AND '$(OmitResources)'!='true'"> - <EmbeddedResource Include="$(StringResourcesPath)"> - <Visible>true</Visible> - <LogicalName>FxResources.$(AssemblyName).SR.resources</LogicalName> - </EmbeddedResource> - </ItemGroup> - - <Choose> - <When Condition="Exists('$(StringResourcesPath)') And '$(SkipCommonResourcesIncludes)'=='' AND '$(OmitResources)'!='true'"> - <Choose> - <When Condition="'$(MSBuildProjectExtension)' == '.csproj'"> - <ItemGroup> - <Compile Include="$(CommonPath)/System/SR.cs"> - <Visible>true</Visible> - <Link>Resources/Common/SR.cs</Link> - </Compile> - </ItemGroup> - </When> - <When Condition="'$(MSBuildProjectExtension)' == '.vbproj'"> - <ItemGroup> - <Compile Include="$(CommonPath)/System/SR.vb"> - <Visible>true</Visible> - <Link>Resources/Common/SR.vb</Link> - </Compile> - </ItemGroup> - </When> - </Choose> - </When> - </Choose> -</Project> diff --git a/build-test.cmd b/build-test.cmd index 21f54ef91f..6291f502ec 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -77,7 +77,6 @@ if /i "%1" == "release" (set __BuildType=Release&set processedArgs if /i "%1" == "checked" (set __BuildType=Checked&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skipmanaged" (set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "updateinvalidpackages" (set __UpdateInvalidPackagesArg=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if /i "%1" == "buildagainstpackages" (set __ZipTests=1&set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "ziptests" (set __ZipTests=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -148,17 +147,6 @@ call "%__ProjectDir%\init-tools.cmd" REM ========================================================================================= REM === -REM === Resolve runtime dependences -REM === -REM ========================================================================================= -call "%__TestDir%\setup-runtime-dependencies.cmd" /arch %__BuildArch% /outputdir %__BinDir% - -if defined __UpdateInvalidPackagesArg ( - goto skipnative -) - -REM ========================================================================================= -REM === REM === Native test build section REM === REM ========================================================================================= @@ -240,7 +228,7 @@ REM ============================================================================ if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir% set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root" -call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -UpdateDependencies -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% +call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% set __BuildLogRootName=Tests_GenerateRuntimeLayout @@ -277,11 +265,7 @@ if not defined VSINSTALLDIR ( exit /b 1 ) -if defined __UpdateInvalidPackagesArg ( - set __up=-updateinvalidpackageversions -) - -call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__up% %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% +call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: echo %__BuildLog% @@ -428,7 +412,6 @@ echo. echo. -? -h -help: view this message. echo Build architecture: -buildArch: only x64 is currently allowed ^(default: x64^). echo Build type: -buildType: one of Debug, Checked, Release ^(default: Debug^). -echo updateinvalidpackageversions: Runs the target to update package versions. echo buildagainstpackages: builds tests against restored packages, instead of against a built product. echo runtimeid ^<ID^>: Builds a test overlay for the specified OS (Only supported when building against packages). Supported IDs are: echo alpine.3.4.3-x64: Builds overlay for Alpine 3.4.3 diff --git a/build.proj b/build.proj index 07bb11a922..b2f6cffb1f 100644 --- a/build.proj +++ b/build.proj @@ -40,7 +40,8 @@ <Target Name="Sync" BeforeTargets="Build" /> <Target Name="RestoreNETCorePlatforms" AfterTargets="Build" Condition="'$(RestoreDuringBuild)'=='true'"> - <Exec Command="$(DnuRestoreCommand) "$(SourceDir).nuget/init/project.json" --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> + <Exec Command="$(DnuRestoreCommand) $(SourceDir).nuget/init/init.csproj" + StandardOutputImportance="Low" /> </Target> </Project> diff --git a/config.json b/config.json index 5f493f6521..3bc7e6994f 100644 --- a/config.json +++ b/config.json @@ -348,12 +348,6 @@ "values": [ "debian.8-x64", "fedora.24-x64", "fedora.25-x64", "opensuse.42.1-x64", "osx.10.12-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ], "defaultValue": "${__RuntimeId}" }, - "UpdateDependencies": { - "description": "MsBuild target that updates project.json dependencies.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, "BatchRestorePackages": { "description": "MsBuild target that restores the packages.", "valueType": "target", @@ -103,7 +103,8 @@ <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand> <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on the path. --> - <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand> + <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Windows_NT'">$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand> + <NugetRestoreCommand Condition="'$(OsEnvironment)'!='Windows_NT'">$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\'))"</NugetRestoreCommand> <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand> <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand> <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand> @@ -113,9 +114,10 @@ <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> + <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand> + <DnuRestoreCommand Condition="'$(OsEnvironment)'=='Windows_NT'">$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand> + <DnuRestoreCommand Condition="'$(OsEnvironment)'!='Windows_NT'">$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\'))"</DnuRestoreCommand> </PropertyGroup> <!-- Setup common target properties that we use to conditionally include sources --> @@ -146,7 +148,8 @@ <SyncInfoDirectory>$(BaseIntermediateOutputPath)</SyncInfoDirectory> <!-- This should be kept in sync with package details in src/.nuget/init/project.json --> - <RuntimeIdGraphDefinitionFile>$(PackagesDir)/Microsoft.NETCore.Platforms/1.0.2-beta-24224-02/runtime.json</RuntimeIdGraphDefinitionFile> + <RuntimeIdGraphDefinitionVersion>1.0.2-beta-24224-02</RuntimeIdGraphDefinitionVersion> + <RuntimeIdGraphDefinitionFile>$(PackagesDir)/microsoft.netcore.platforms/$(RuntimeIdGraphDefinitionVersion)/runtime.json</RuntimeIdGraphDefinitionFile> <!-- This link should be updated for each release milestone, currently this points to 1.1.0-beta --> <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes> diff --git a/init-tools.cmd b/init-tools.cmd index 8efc2f400d..b69239bfe6 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -2,20 +2,15 @@ setlocal set INIT_TOOLS_LOG=%~dp0init-tools.log -set PACKAGES_DIR=%~dp0packages\ -set TOOLRUNTIME_DIR=%~dp0Tools -:: This is an isolated script that handles the download of dotnet binaries and shall be removed after bootstrap.ps1/sh refactor (dotnet/corefx#15427) -set DOTNET_DOWNLOAD_PATH=%~dp0dotnet-download.ps1 +if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\ +if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\ -set DOTNET_CMD=%DOTNET_PATH%dotnet.exe +if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt" set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\ -set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION% -set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json -set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" , "Microsoft.DotNet.BuildTools.Coreclr": "1.0.4-prerelease"}, "frameworks": { "dnxcore50": { } } } -set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed0 -set TOOLS_INIT_RETURN_CODE=0 +set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild +set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated if [%1]==[force] ( @@ -26,7 +21,7 @@ if [%1]==[force] ( :: If sempahore exists do nothing if exist "%BUILD_TOOLS_SEMAPHORE%" ( echo Tools are already initialized. - goto :DONE + goto :EOF ) if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" @@ -37,8 +32,6 @@ if NOT exist "%PACKAGES_DIR%NuGet.exe" ( powershell -NoProfile -ExecutionPolicy unrestricted -Command "(New-Object Net.WebClient).DownloadFile('https://www.nuget.org/nuget.exe', '%PACKAGES_DIR%NuGet.exe') ) -if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%" -echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%" echo Running %0 > "%INIT_TOOLS_LOG%" set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" @@ -46,47 +39,39 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" -if [%PROCESSOR_ARCHITECTURE%]==[x86] (set DOTNET_ZIP_NAME=dotnet-dev-win-x86.%DOTNET_VERSION%.zip) else (set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip) -set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip +set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" -powershell -NoProfile -ExecutionPolicy unrestricted -File %DOTNET_DOWNLOAD_PATH% -DotnetRemotePath %DOTNET_REMOTE_PATH% -DotnetLocalPath %DOTNET_LOCAL_PATH% -DotnetPath %DOTNET_PATH% >> "%INIT_TOOLS_LOG%" +powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" if NOT exist "%DOTNET_LOCAL_PATH%" ( - echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. - set TOOLS_INIT_RETURN_CODE=1 - goto :DONE + echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b 1 ) :afterdotnetrestore if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages "%PACKAGES_DIR% " --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --packages "%PACKAGES_DIR% " --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" +call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( - echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. - set TOOLS_INIT_RETURN_CODE=1 - goto :DONE + echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b 1 ) :afterbuildtoolsrestore -echo Initializing BuildTools ... +echo Initializing BuildTools... echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" - -echo Updating CLI NuGet Frameworks map... -robocopy "%TOOLRUNTIME_DIR%" "%TOOLRUNTIME_DIR%\dotnetcli\sdk\%DOTNET_VERSION%" NuGet.Frameworks.dll /XO >> "%INIT_TOOLS_LOG%" -set UPDATE_CLI_ERRORLEVEL=%ERRORLEVEL% -if %UPDATE_CLI_ERRORLEVEL% GTR 1 ( - echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL%}. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 - exit /b %UPDATE_CLI_ERRORLEVEL% +set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL% +if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( + echo ERROR: An error occured when trying to initialize the tools. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 + exit /b %INIT_TOOLS_ERRORLEVEL% ) :: Create sempahore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" - -:DONE - -exit /b %TOOLS_INIT_RETURN_CODE% +exit /b 0
\ No newline at end of file diff --git a/init-tools.msbuild b/init-tools.msbuild new file mode 100644 index 0000000000..d9ff7b4517 --- /dev/null +++ b/init-tools.msbuild @@ -0,0 +1,16 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <TargetFramework>netcoreapp1.0</TargetFramework> + <EnableDefaultItems>false</EnableDefaultItems> + <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> + <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion)</BaseIntermediateOutputPath> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.BuildTools"> + <Version>$(BuildToolsPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.Coreclr"> + <Version>1.0.4-prerelease</Version> + </PackageReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/init-tools.sh b/init-tools.sh index f965583dae..b676ba1846 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -7,63 +7,17 @@ __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli __DOTNET_CMD=$__DOTNET_PATH/dotnet if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +export __BUILDTOOLS_USE_CSPROJ=true __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION -__PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json -__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"netcoreapp1.0\": { } } }" -__INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done - -# Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc -get_current_linux_name() { - # Detect Distro - if [ "$(cat /etc/os-release | grep -cim1 ubuntu)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 16.04)" -eq 1 ]; then - echo "ubuntu.16.04" - return 0 - fi - if [ "$(cat /etc/os-release | grep -cim1 16.10)" -eq 1 ]; then - echo "ubuntu.16.10" - return 0 - fi - - echo "ubuntu" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 centos)" -eq 1 ]; then - echo "centos" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 rhel)" -eq 1 ]; then - echo "rhel" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 debian)" -eq 1 ]; then - echo "debian" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 alpine)" -eq 1 ]; then - echo "alpine" - return 0 - elif [ "$(cat /etc/os-release | grep -cim1 fedora)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 24)" -eq 1 ]; then - echo "fedora.24" - return 0 - fi - if [ "$(cat /etc/os-release | grep -cim1 25)" -eq 1 ]; then - echo "fedora.25" - return 0 - fi - elif [ "$(cat /etc/os-release | grep -cim1 opensuse)" -eq 1 ]; then - if [ "$(cat /etc/os-release | grep -cim1 42.1)" -eq 1 ]; then - echo "opensuse.42.1" - return 0 - fi - fi - - # Cannot determine Linux distribution, assuming Ubuntu 14.04. - echo "ubuntu" - return 0 -} +__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib +__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild +__INIT_TOOLS_DONE_MARKER=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/done if [ -z "$__DOTNET_PKG" ]; then + if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then + echo "Warning: build not supported on 32 bit Unix" + fi OSName=$(uname -s) case $OSName in Darwin) @@ -73,14 +27,14 @@ OSName=$(uname -s) ;; Linux) - __DOTNET_PKG="dotnet-dev-$(get_current_linux_name)-x64" + __DOTNET_PKG=dotnet-dev-linux-x64 OS=Linux ;; *) - echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools." + echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools." OS=Linux - __DOTNET_PKG=dotnet-dev-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-linux-x64 ;; esac fi @@ -103,13 +57,14 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH else echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" + __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} - else + which curl > /dev/null 2> /dev/null + if [ $? -ne 0 ]; then wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + else + curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} fi cd $__DOTNET_PATH tar -xf $__DOTNET_PATH/dotnet.tar @@ -128,18 +83,18 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Copying $BUILD_TOOLS_TOOL_DIR to $__TOOLRUNTIME_DIR" >> $__init_tools_log cp -r $BUILD_TOOLS_TOOL_DIR/* $__TOOLRUNTIME_DIR else - if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi - echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE" - if [ ! -e $__BUILD_TOOLS_PATH ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log - $__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log + $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi fi echo "Initializing BuildTools..." echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log + + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + chmod +x $__BUILD_TOOLS_PATH/init-tools.sh $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log if [ "$?" != "0" ]; then echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2 @@ -147,18 +102,16 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi - if [ $__PATCH_CLI_NUGET_FRAMEWORKS -eq 1 ]; then - echo "Updating CLI NuGet Frameworks map..." - cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log - if [ "$?" != "0" ]; then - echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2 - exit 1 - fi - fi + echo "Making all .sh files executable under Tools." + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + ls $__scriptpath/Tools/*.sh | xargs chmod +x + ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x + + Tools/crossgen.sh $__scriptpath/Tools touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." else echo "Tools are already initialized" -fi +fi
\ No newline at end of file @@ -48,9 +48,6 @@ if NOT [%ERRORLEVEL%]==[0] ( exit /b 1 ) -:: Always copy over the Tools-Override -xcopy %~dp0Tools-Override\* %~dp0Tools /y >nul - set _toolRuntime=%~dp0Tools set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe set _json=%~dp0config.json @@ -5,9 +5,6 @@ working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo "Running init-tools.sh" $working_tree_root/init-tools.sh -# Always copy over the Tools-Override -cp $working_tree_root/Tools-Override/* $working_tree_root/Tools > /dev/null - toolRuntime=$working_tree_root/Tools dotnet=$toolRuntime/dotnetcli/dotnet diff --git a/tests/src/Common/external/external.csproj b/src/.nuget/init/init.csproj index f7fa75ed32..115090dd76 100644 --- a/tests/src/Common/external/external.csproj +++ b/src/.nuget/init/init.csproj @@ -5,9 +5,20 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> - <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>$(RuntimeIdGraphDefinitionVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json deleted file mode 100644 index 5908fcc3f9..0000000000 --- a/src/.nuget/init/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02" - }, - "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" - } - }, -}
\ No newline at end of file diff --git a/src/.nuget/init/readme.txt b/src/.nuget/init/readme.txt deleted file mode 100644 index 6792dd555f..0000000000 --- a/src/.nuget/init/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Please keep the package details listed in project.json in sync with <repo_root>/dir.props.
\ No newline at end of file diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj index 44019bce52..ec3602e66d 100644 --- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj +++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj @@ -13,6 +13,8 @@ <NoCompilerStandardLib>true</NoCompilerStandardLib> <IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly> <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey> + <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> + <ContainsPackageReferences>true</ContainsPackageReferences> <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). --> @@ -39,8 +41,25 @@ <Compile Include="SymbolReader.cs" /> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + </PropertyGroup> + <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>$(RuntimeIdGraphDefinitionVersion)</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.0.1</Version> + </PackageReference> + <PackageReference Include="System.Runtime.InteropServices"> + <Version>4.1.0</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Metadata"> + <Version>1.4.1</Version> + </PackageReference> </ItemGroup> <Target Name="CopyItemsToDirectory" AfterTargets="Build"> diff --git a/src/ToolBox/SOS/NETCore/project.json b/src/ToolBox/SOS/NETCore/project.json deleted file mode 100644 index a92b173569..0000000000 --- a/src/ToolBox/SOS/NETCore/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.IO.FileSystem": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Reflection.Metadata": "1.4.1" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "portable-net45+win8" - ] - } - } -} diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 4a8fdcf4ca..7cb3244567 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -20,6 +20,7 @@ <!-- This prevents the default MsBuild targets from referencing System.Core.dll --> <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> <!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll --> + <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> <NoStdLib>true</NoStdLib> <NoCompilerStandardLib>true</NoCompilerStandardLib> <SubsystemVersion>6.00</SubsystemVersion> diff --git a/tests/build.proj b/tests/build.proj index 518d59ca69..260afb275a 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -20,6 +20,23 @@ </TraversalBuildDependsOn> </PropertyGroup> + <ItemGroup> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\scripts\scripts.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\test_dependencies\test_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\test_runtime\test_runtime.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark\benchmark.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\performance\performance.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\TestWrappersConfig\TestWrappersConfig.csproj" /> + </ItemGroup> + + <PropertyGroup> + <DnuRestoreDirs>@(RestoreProjects -> '%(Identity)', ' ')</DnuRestoreDirs> + </PropertyGroup> + <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages"> <Message Text="Building Targeting Pack" Importance="High" /> <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" /> @@ -28,32 +45,19 @@ <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies"> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> - <!-- restore all project.jsons in one pass for perf & to avoid concurrency problems --> - <Exec Command="$(DnuRestoreCommand) $(DnuRestoreDirs)" - StandardOutputImportance="Low" /> - + <!-- restore all csproj's with PackageReferences in one pass --> + <MSBuild Projects="build.proj" + Properties="RestoreProj=%(RestoreProjects.Identity)" + Targets="RestorePackage" /> + <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> </Target> - <!-- Task from buildtools that validates dependencies contained in project.json files. --> - <UsingTask TaskName="ValidateProjectDependencyVersions" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Tasks from buildtools for easy project.json dependency updates --> - <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> - - <!-- Create a collection of all project.json files for dependency updates. --> - <ItemGroup> - <ProjectJsonFiles Include="$(SourceDir)**\project.json" /> - <ProjectJsonFiles Include="$(ProjectDir)scripts\**\project.json" /> - </ItemGroup> - - <Target Name="UpdatePackageDependencyVersion"> - <UpdatePackageDependencyVersion ProjectJsons="@(ProjectJsonFiles)" - PackageId="$(PackageId)" - OldVersion="$(OldVersion)" - NewVersion="$(NewVersion)" /> + <Target Name="RestorePackage"> + <Exec Command="$(DnuRestoreCommand) $(RestoreProj)" + StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> -</Project> +</Project>
\ No newline at end of file diff --git a/tests/dir.props b/tests/dir.props index 3a9b043b09..d5533ee252 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -36,7 +36,7 @@ <!-- Common properties --> <PropertyGroup> <RootBinDir>$(__RootBinDir)\</RootBinDir> - <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir> + <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\bin\</RootBinDir> </PropertyGroup> <!-- Default Test platform to deploy the netstandard compiled tests to --> @@ -91,7 +91,7 @@ <!-- list of directories to perform batch restore --> <ItemGroup> - <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> + <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\**\*.csproj"" /> </ItemGroup> <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> @@ -104,9 +104,8 @@ <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> - <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs> - <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> + <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> </PropertyGroup> diff --git a/tests/issues.targets b/tests/issues.targets index df8fc554d8..a5098f8ed5 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -184,6 +184,15 @@ <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*"> <Issue>6707</Issue> </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\PrivateInterfaceImpl\Test6_ImplementingClass\*"> + <Issue></Issue> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\440935\Test\*"> + <Issue></Issue> + </ExcludeList> + <ExcludeList Include="$(XunitTestBinBase)\JIT\CheckProjects\CheckProjects\*"> + <Issue></Issue> + </ExcludeList> </ItemGroup> <!-- The following are x86 failures --> diff --git a/tests/override.targets b/tests/override.targets index a01163225f..0e7f82bf77 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -3,13 +3,13 @@ Overrides for all other targets (including build tools) can go in this file. --> - <!-- Contains overrides for the nuget reference resolution. The regular nuget reference resolution will not + <!-- Contains overrides for the nuget reference resolution. The regular nuget reference resolution will not copy references local, which we need in order to correctly execute the xunit project --> <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" /> <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference System.Private.CoreLib. Some tests use functionality not available in the portable reference assemblies. - For portability reasons it's generally a good idea to reference the facades instead of the + For portability reasons it's generally a good idea to reference the facades instead of the raw implementation assemblies. However, these tests are useful. --> <Target Name="AddDesignTimeFacadeReferences" Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'" @@ -21,4 +21,13 @@ <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\System.Private.CoreLib.dll" /> </ItemGroup> </Target> + + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> + <!-- + Allow this project to setup the default target frameworks. Note this depends on the targeting packs that VS + installs to resolve mscorlib and System. That should be fixed in the future. + --> + <_TargetFrameworkDirectories></_TargetFrameworkDirectories> + <_FullFrameworkReferenceAssemblyPaths></_FullFrameworkReferenceAssemblyPaths> + </PropertyGroup> </Project> diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 6d1c6bdc78..80d1f71a52 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -18,16 +18,16 @@ </PropertyGroup> <ItemGroup> - <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\project.lock.json"/> - <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\project.lock.json"/> + <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\obj\project.assets.json"/> + <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\obj\project.assets.json"/> </ItemGroup> <ItemGroup> - <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\project.lock.json"/> + <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/> </ItemGroup> <ItemGroup> - <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\project.lock.json"/> + <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/> </ItemGroup> <ItemGroup> @@ -43,10 +43,6 @@ Inputs="@(CoreRootProjectLockJsonFiles)" Outputs="$(CORE_ROOT)\*.*"> - <MSBuild Projects="$(SourceDir)Common\test_runtime\test_runtime.csproj"/> - - <MSBuild Projects="$(SourceDir)Common\test_dependencies\test_dependencies.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="false" @@ -89,8 +85,6 @@ Inputs="@(RefProjectLockJsonFiles)" Outputs="$(RefDestination)\*.*"> - <MSBuild Projects="$(SourceDir)Common\targeting_pack_ref\targeting_pack_ref.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" @@ -121,8 +115,6 @@ Inputs="@(ProductProjectLockJsonFiles)" Outputs="$(ProductDestination)\*.*"> - <MSBuild Projects="$(SourceDir)Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj"/> - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" diff --git a/tests/runtest.proj b/tests/runtest.proj index 9ebe5c00b6..2a797bc81a 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -80,14 +80,13 @@ $(_XunitEpilog) <OutputType>Library</OutputType> <TargetFrameworkIdentifier Condition ="'$(BuildTestsAgainstPackages)' != 'true'">.NETFramework</TargetFrameworkIdentifier> <TargetFrameworkVersion Condition ="'$(BuildTestsAgainstPackages)' != 'true'">v4.5</TargetFrameworkVersion> + <NugetTargetMonikerShort Condition ="'$(BuildTestsAgainstPackages)' != 'true'">net45</NugetTargetMonikerShort> <IsXunitWrapperProject>true</IsXunitWrapperProject> <SkipSigning>true</SkipSigning> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <CLRTestKind>BuildOnly</CLRTestKind> <IsTestProject>true</IsTestProject> - <ProjectJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson> - <ProjectLockJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '%24(Configuration)|%24(Platform)' == 'Debug|AnyCPU' "> @@ -118,7 +117,8 @@ $(_XunitEpilog) </ItemGroup> <Import Project="$(SourceDir)dir.targets" /> <PropertyGroup> - <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir> + <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir> + <ProjectAssetsFile Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)obj/project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> ]]> diff --git a/tests/runtest.sh b/tests/runtest.sh index 8291ad4383..439bbb66e6 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -1202,18 +1202,6 @@ else load_failing_tests fi -# Other architectures are not supported yet. -if [ "$ARCH" == "x64" ] -then - scriptPath=$(dirname $0) - ${scriptPath}/setup-runtime-dependencies.sh --outputDir=$coreOverlayDir -else - if [ "$ARCH" != "arm64" ] - then - echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture." - fi -fi - export __TestEnv=$testEnv cd "$testRootDir" diff --git a/tests/scripts/project.json b/tests/scripts/project.json index b3c3a15f62..394cd2f922 100644 --- a/tests/scripts/project.json +++ b/tests/scripts/project.json @@ -15,4 +15,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd index 130cb37c3b..7b1bd3e9b0 100644 --- a/tests/scripts/run-xunit-perf.cmd +++ b/tests/scripts/run-xunit-perf.cmd @@ -35,8 +35,8 @@ setlocal call :set_perf_run_log || exit /b 1 call :setup_sandbox || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" || exit /b 1 - call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" || exit /b 1 + call :run_cmd "%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\PerfHarness.csproj" -c Release -o "%CORECLR_REPO%\sandbox" || exit /b 1 rem TODO: Remove the version of the package to copy. e.g.) if multiple version exist, then error out? call :run_cmd xcopy /sy "%CORECLR_REPO%\packages\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.3-alpha-experimental\lib\native"\* . >> %RUNLOG% || exit /b 1 diff --git a/tests/scripts/scripts.csproj b/tests/scripts/scripts.csproj new file mode 100644 index 0000000000..dca723de8e --- /dev/null +++ b/tests/scripts/scripts.csproj @@ -0,0 +1,35 @@ +<?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" /> + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.xunit.performance.run.core"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.analysis.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance.runner.cli"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.xunit.performance"> + <Version>1.0.0-alpha-build0040</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>1.0.0-prerelease-00629-04</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.3</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + </PropertyGroup> + <Import Project="$(MSBuildThisFileDirectory)..\src\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd deleted file mode 100755 index 0079d42f60..0000000000 --- a/tests/setup-runtime-dependencies.cmd +++ /dev/null @@ -1,145 +0,0 @@ -@if not defined _echo @echo off -setlocal - -set __ThisScriptShort=%0 -set __ThisScriptFull=%~f0 -set __ThisScriptPath=%~dp0 - -REM ========================================================================================= -REM === -REM === Parse arguments -REM === -REM ========================================================================================= - -set __OutputDir= -set __Arch= - -:Arg_Loop -if "%1" == "" goto ArgsDone - -if /i "%1" == "/?" goto Usage -if /i "%1" == "-?" goto Usage -if /i "%1" == "/h" goto Usage -if /i "%1" == "-h" goto Usage -if /i "%1" == "/help" goto Usage -if /i "%1" == "-help" goto Usage - -if /i "%1" == "/arch" (set __Arch=%2&shift&shift&goto Arg_Loop) -if /i "%1" == "/outputdir" (set __OutputDir=%2&shift&shift&goto Arg_Loop) - -echo Invalid command-line argument: %1 -goto Usage - -:ArgsDone - -if not defined __OutputDir goto Usage -if not defined __Arch goto Usage - -REM Check if the platform is supported -if /i %__Arch% == "arm" ( - echo No runtime dependencies for Arm32. - exit /b 0 - ) - -REM ========================================================================================= -REM === -REM === Check if dotnet CLI and necessary directories exist -REM === -REM ========================================================================================= - -set __DotNetToolDir=%__ThisScriptPath%..\Tools -set __DotNetCmd=%__DotNetToolDir%\dotnetcli\dotnet.exe -set __PackageDir=%__ThisScriptPath%..\Packages -set __TmpDir=%Temp%\coreclr_gcstress_%RANDOM% - -REM Check if dotnet cli exists -if not exist "%__DotNetToolDir%" ( - echo Directory containing dotnet CLI does not exist: %__DotNetToolDir% - goto Fail -) -if not exist "%__DotNetCmd%" ( - echo dotnet.exe does not exist: %__DotNetCmd% - goto Fail -) - -REM Create directories needed -if not exist "%__PackageDir%" md "%__PackageDir%" -if not exist "%__OutputDir%" md "%__OutputDir%" - -REM Check and create a temp directory -if exist "%__TmpDir%" ( - rmdir /S /Q %__TmpDir% -) -mkdir %__TmpDir% - -REM Project.json path -set __JsonFilePath=%__TmpDir%\project.json - -REM ========================================================================================= -REM === -REM === Download packages -REM === -REM ========================================================================================= - -REM Write dependency information to project.json -echo { ^ - "dependencies": { ^ - "runtime.win7-%__Arch%.Microsoft.NETCore.CoreDisTools": "1.0.1-prerelease-*" ^ - }, ^ - "frameworks": { "dnxcore50": { } } ^ - } > "%__JsonFilePath%" - -echo JSON file: %__JsonFilePath% -type "%__JsonFilePath%" - -REM Download the package -echo Downloading CoreDisTools package -set DOTNETCMD="%__DotNetCmd%" restore "%__JsonFilePath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%" -echo %DOTNETCMD% -call %DOTNETCMD% -if errorlevel 1 goto Fail - -REM Get downloaded dll path -echo Locating coredistools.dll -FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i -echo CoreDisTools library path: %__LibPath% -if not exist "%__LibPath%" ( - echo Failed to locate the downloaded library: %__LibPath% - goto Fail -) - -REM Copy library to output directory -echo Copy library: %__LibPath% to %__OutputDir% -copy /y "%__LibPath%" "%__OutputDir%" -if errorlevel 1 ( - echo Failed to copy %__LibPath% to %__OutputDir% - goto Fail -) - -REM Delete temporary files -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) - -exit /b 0 - -:Fail -if exist "%__TmpDir%" ( - rmdir /S /Q "%__TmpDir%" -) -exit /b 1 - -REM ========================================================================================= -REM === -REM === Helper routines -REM === -REM ========================================================================================= - -:Usage -echo. -echo Download coredistools for GC stress testing -echo. -echo Usage: -echo %__ThisScriptShort% /arch ^<TargetArch^> /outputdir ^<coredistools_lib_install_path^> -echo. -exit /b 1 diff --git a/tests/setup-runtime-dependencies.sh b/tests/setup-runtime-dependencies.sh deleted file mode 100755 index 4573e084bd..0000000000 --- a/tests/setup-runtime-dependencies.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env bash -# set -x - -# -# Constants -# -readonly EXIT_CODE_SUCCESS=0 - -# -# This script should be located in coreclr/tests. -# - -function print_usage { - echo '' - echo 'Download coredistools for GC stress testing' - echo '' - echo 'Command line:' - echo '' - echo './setup-gcstress.sh --outputDir=<coredistools_lib_install_path>' - echo '' - echo 'Required arguments:' - echo ' --outputDir=<path> : Directory to install libcoredistools.so' - echo '' -} - -# temorary directory -tmpDirPath= - -function exit_with_error { - local errorCode=$1 - local errorMsg=$2 - - if [ ! -z "$2" ]; then - echo $2 - fi - - if [ -e $tmpDirPath ]; then - rm -rf $tmpDirPath - fi - - exit $errorCode -} - -function handle_ctrl_c { - exit_with_error 1 'Aborted by Ctrl+C' - } - -# Register the Ctrl-C handler -trap handle_ctrl_c INT - -# Argument variables -libInstallDir= - -# Handle arguments -verbose=0 -for i in "$@" -do - case $i in - -h|--help) - exit $EXIT_CODE_SUCCESS - ;; - -v|--verbose) - verbose=1 - ;; - --outputDir=*) - libInstallDir=${i#*=} - ;; - *) - echo "Unknown switch: $i" - print_usage - exit $EXIT_CODE_SUCCESS - ;; - esac -done - -if [ -z "$libInstallDir" ]; then - echo "--libInstallDir is required." - print_usage - exit_with_error 1 -fi - -# create temp directory -tmpDirPath=`mktemp -d` -if [ ! -e $tmpDirPath ]; then - exit_with_error 1 "Cannot create a temporary directory" -fi - -# This script must be located in coreclr/tests. -scriptDir=$(cd "$(dirname "$0")"; pwd -P) - -echo "Running init-tools.sh" -$scriptDir/../init-tools.sh - -dotnetToolsDir=$scriptDir/../Tools -dotnetCmd=${dotnetToolsDir}/dotnetcli/dotnet -packageDir=${scriptDir}/../packages -jsonFilePath=${tmpDirPath}/project.json - -# Check tool directory -if [ ! -e $dotnetToolsDir ]; then - exit_with_error 1 'Directory containing dotnet commandline does not exist:'$dotnetToolsDir -fi -if [ ! -e $dotnetCmd ]; then - exit_with_error 1 'dotnet commandline does not exist:'$dotnetCmd -fi - -# make package directory -if [ ! -e $packageDir ]; then - mkdir -p $packageDir -fi - -# make output directory -if [ ! -e $libInstallDir ]; then - mkdir -p $libInstallDir -fi - -# Query runtime Id -rid=`$dotnetCmd --info | grep 'RID:' | sed 's/^ *RID: *//g'` -if [ -z "$rid" ]; then - exit_with_error 1 "Failed to query runtime Id" -fi - -# Write dependency information to project.json -packageName='runtime.'$rid'.Microsoft.NETCore.CoreDisTools' -echo { \ - \"dependencies\": { \ - \"$packageName\": \"1.0.1-prerelease-*\" \ - }, \ - \"frameworks\": { \"dnxcore50\": { } } \ - } > $jsonFilePath - -# Download the package -echo Downloading CoreDisTools package -bash -c -x "$dotnetCmd restore $jsonFilePath --source https://dotnet.myget.org/F/dotnet-core/ --packages $packageDir" -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to restore the package" -fi - -# Get library path -libPath=`find $packageDir | grep $rid | grep -m 1 libcoredistools` -if [ ! -e $libPath ]; then - exit_with_error 1 'Failed to locate the downloaded library' -fi - -# Copy library to output directory -echo 'Copy library:' $libPath '-->' $libInstallDir/ -cp -f $libPath $libInstallDir -if [ $? -ne 0 ] -then - exit_with_error 1 "Failed to copy the library" -fi - -# Delete temporary files -rm -rf $tmpDirPath - -# Return success -exit $EXIT_CODE_SUCCESS - diff --git a/tests/src/Common/PerfHarness/PerfHarness.cs b/tests/src/Common/PerfHarness/PerfHarness.cs index b3a0ea48c5..f78022517b 100644 --- a/tests/src/Common/PerfHarness/PerfHarness.cs +++ b/tests/src/Common/PerfHarness/PerfHarness.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.Reflection; using System.Collections.Generic; using Microsoft.Xunit.Performance.Api; diff --git a/tests/src/Common/PerfHarness/PerfHarness.csproj b/tests/src/Common/PerfHarness/PerfHarness.csproj new file mode 100644 index 0000000000..5f9377c225 --- /dev/null +++ b/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp1.1</TargetFramework> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>1.1.0</Version> + </PackageReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/PerfHarness/project.json b/tests/src/Common/PerfHarness/project.json deleted file mode 100644 index bed9544b65..0000000000 --- a/tests/src/Common/PerfHarness/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "xunit.performance.api": "1.0.0-beta-build0004" - } - } - } -} diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index 63c54488f2..3718f79578 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -7,8 +7,30 @@ <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> <ItemGroup> - <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> + <PackageReference Include="Microsoft.NETCore.ILAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.ILDAsm"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Jit"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.TestHost"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;win10-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json deleted file mode 100644 index 56ee674728..0000000000 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.ILAsm": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.Jit": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25316-03", - "Microsoft.NETCore.TestHost": "2.0.0-preview2-25316-03" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "win10-arm64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "opensuse.42.1-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json deleted file mode 100644 index e1ec3bfd42..0000000000 --- a/tests/src/Common/empty/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 5a16122cdb..710866f629 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -5,19 +5,54 @@ <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> - <ProjectJson>$(MSBuildThisFileDirectory)project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath> <Language>C#</Language> <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier> + <ContainsPackageReferences>true</ContainsPackageReferences> <OutputPath>$(TargetingPackPath)</OutputPath> <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId> <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId> <CLRTestKind>SharedLibrary</CLRTestKind> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>9.0.1</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <PackageToInclude Include="xunit.abstractions"/> <PackageToInclude Include="xunit.assert"/> @@ -40,6 +75,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\external\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences" Condition="'$(TargetGroup)' == 'netfx'"> <Error Condition="!Exists('$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe')" Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe." diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json deleted file mode 100644 index b5e378db94..0000000000 --- a/tests/src/Common/external/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Newtonsoft.Json": "9.0.1", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {} - } -} diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json deleted file mode 100644 index 9d8811f7c5..0000000000 --- a/tests/src/Common/netcoreapp/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": "2.0.0-beta-001494-00", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01" - }, - "frameworks": { - "netcoreapp2.0": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json deleted file mode 100644 index 566b4c66b9..0000000000 --- a/tests/src/Common/targeting_pack_ref/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25316-03" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index 65e37c03c3..f59dfa3905 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -6,6 +6,19 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json deleted file mode 100644 index 9d1a65842e..0000000000 --- a/tests/src/Common/test_dependencies/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25316-01", - "System.Memory": "4.4.0-preview2-25316-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01", - "System.Security.Permissions": "4.4.0-preview2-25316-01" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "netcoreapp1.1", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index 0b0f5b82bf..65f01bf3a2 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -6,8 +6,34 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.CoreDisTools"> + <Version>1.0.1-prerelease-*</Version> + </PackageReference> + <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="System.Security.Permissions"> + <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" - DependsOnTargets="ResolveReferences" /> -</Project> + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json deleted file mode 100644 index 6c5cd04ef7..0000000000 --- a/tests/src/Common/test_runtime/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease", - "jit-dasm": "0.0.1.4", - "cijobs": "0.0.1.2", - "jit-analyze": "0.0.1.1" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win-x64": {}, - "win-x86": {}, - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "osx-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {}, - "linux-x64": {} - } -} diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 3b55297f3d..7b01268dec 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -5,14 +5,34 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> - <!-- Reset the Default project.json--> - <ProjectJson></ProjectJson> - <ProjectLockJson></ProjectLockJson> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies"> + <Version>1.0.0-prerelease</Version> + </PackageReference> + <PackageReference Include="jit-dasm"> + <Version>0.0.1.4</Version> + </PackageReference> + <PackageReference Include="cijobs"> + <Version>0.0.1.2</Version> + </PackageReference> + <PackageReference Include="jit-analyze"> + <Version>0.0.1.1</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-x64;win-x86;win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;osx-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;linux-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 61fe6102ea..02d073a3fb 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -29,10 +29,9 @@ <ItemGroup> <Compile Include="CheckProjects.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project> diff --git a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj index 36cd9b760b..13a728059d 100644 --- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj +++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="TypedReference.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj index 953edac964..dcef420e0a 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj index 829c62c4c4..84ef3caf97 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj index 3c5f1cc245..22e4d5e32d 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj index a41f31a39d..1b0800a1af 100644 --- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj +++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="loop6.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index d8ec34de75..0ae44d99ef 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj index afe15bbe2d..2edd488ce0 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj index 33039679f7..3579d2647e 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj index 7ec8612274..2638322546 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj index b0b398de80..0298dde5d2 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj index 2b1acc4a5c..d3849b1a14 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj index 97be5fecbd..4a165d377d 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj index 592c20a7b8..694363a0ce 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj index 817c22f9c3..ca5a53abba 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj index f858d0f6bd..9601e61e1e 100644 --- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gc_nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj index 11babc3182..c2ba77845c 100644 --- a/tests/src/JIT/Methodical/VT/etc/nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="nested.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index 3d7729f5e7..cfbf44f7b0 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj index c8dd1da34c..0e77a28947 100644 --- a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_dbgnative.csproj index 1ffea88844..e8edef3a7c 100644 --- a/tests/src/JIT/Methodical/refany/_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj index eb5c6626f3..9704560fab 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj index c41462c110..540ee3c8dc 100644 --- a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj index f1b1b10a24..50a1e714c2 100644 --- a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_relgcreport.csproj index 8781f33cdb..da3914fcdb 100644 --- a/tests/src/JIT/Methodical/refany/_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relnative.csproj b/tests/src/JIT/Methodical/refany/_relnative.csproj index 50bccd2c9d..88e840991c 100644 --- a/tests/src/JIT/Methodical/refany/_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress1.csproj b/tests/src/JIT/Methodical/refany/_relstress1.csproj index 08cfb0238f..19a9a55226 100644 --- a/tests/src/JIT/Methodical/refany/_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relstress3.csproj b/tests/src/JIT/Methodical/refany/_relstress3.csproj index 03c37ce533..65da5b03e3 100644 --- a/tests/src/JIT/Methodical/refany/_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj index 459da7d647..d1e9e6767c 100644 --- a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj index 21e1dfb876..2e39368075 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj index f7fde093de..8757d50b1a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj index 10d26819f4..10a8cd5f6a 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj index cfd702ecae..124554ed79 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj index 531b47a9bc..45aad43acc 100644 --- a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj index 3fb0a8d27f..a0bc8fff61 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj index 11e2afd4be..30045fba82 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj index f300ebc4aa..0e484466b1 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="stress1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj index fd6a9aedb9..6e160e6e01 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="stress3-64bit.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj index ecae4158e9..ab78d753e8 100644 --- a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj +++ b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj index 83c8927f2d..8c713ad864 100644 --- a/tests/src/JIT/Methodical/refany/array1.csproj +++ b/tests/src/JIT/Methodical/refany/array1.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array1.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj index 1890a9c9d0..1d57843df2 100644 --- a/tests/src/JIT/Methodical/refany/array2.csproj +++ b/tests/src/JIT/Methodical/refany/array2.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="array2.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj index 18b8fa8e87..008ec5fad3 100644 --- a/tests/src/JIT/Methodical/refany/format.csproj +++ b/tests/src/JIT/Methodical/refany/format.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="format.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj index 04d0fffb01..c40ea0504b 100644 --- a/tests/src/JIT/Methodical/refany/gcreport.csproj +++ b/tests/src/JIT/Methodical/refany/gcreport.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="gcreport.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj index 122a161b4a..187948b805 100644 --- a/tests/src/JIT/Methodical/refany/lcs.csproj +++ b/tests/src/JIT/Methodical/refany/lcs.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="lcs.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj index db30722d05..a100b56c0d 100644 --- a/tests/src/JIT/Methodical/refany/native.csproj +++ b/tests/src/JIT/Methodical/refany/native.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="native.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj index fecf6cc43e..1f7727308c 100644 --- a/tests/src/JIT/Methodical/refany/virtcall.csproj +++ b/tests/src/JIT/Methodical/refany/virtcall.csproj @@ -29,9 +29,10 @@ <ItemGroup> <Compile Include="virtcall.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj index 0225a059b7..b15027176f 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj index faf18d60df..10128517d2 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj index 82d5593bcd..7ff0df3280 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj index f7e7aafbeb..7089fece10 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj index 8f35c4bb65..fa8199743a 100644 --- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj +++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="refanyval.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj index 80afc6699a..9d5cf5d0e6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Adams.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj index 174ee76e18..c42c73625c 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMk2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj index 1594ae0a45..e26289d3f4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchMrk.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj index 70fdb06897..345ee32477 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Bisect.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj index bd1b084df5..9eb733599a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="DMath.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj index 10f39efd08..28b1fa42a7 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FFT.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj index 975bf96f92..0d3d9d324a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InProd.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj index 417f1c5631..8971e8aa78 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="InvMt.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj index 6751cc2492..2b4d20a5c3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LLoops.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj index 1ab94d40c8..0a309d0b35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Lorenz.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj index 09454d9218..2c43dba6cd 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MatInv4.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj index 1213cae10a..a0978c2c6a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj index a6f11c0f06..3fffb1b1b8 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NewtR.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj index 37fa54eda8..b674da9031 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Regula.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj index ca2c525458..147ae342a4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Romber.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj index 27e3773834..9bc41d95aa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Secant.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj index d7b09af860..b63153a388 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Simpsn.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj index 90d780e258..daf711df07 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="SqMtx.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj index e9f704cf6b..97909f61d0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Trap.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj index 02eaf525e9..c08f3ff969 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Whetsto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj index a4c3de5674..5db8e820ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="8Queens.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj index 8f72e1c87e..08dfa01a1a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Ackermann.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj index ffadd54595..9c260fe837 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj index 2619b38c0c..265b099233 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="AddArray2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj index cb1ed7b648..3bbd8afc30 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array1.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj index b368d85bda..9a3f889660 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Array2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj index 6d58dc402f..05e511d32b 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BenchE.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj index 776afa72c0..674e4f687a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj index 448892e8eb..d5870cd244 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="BubbleSort2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj index edbab6006b..85a1aea481 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="CSieve.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj index ff30f8ccf7..91763f28fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Fib.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj index 270e55060f..7aed611204 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="HeapSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj index bcf7b40d72..15e50078ac 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="IniArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj index 669a0efdd5..3ab835d461 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="LogicArray.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj index 666ba47ce2..76d2a5a391 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Midpoint.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj index 78573f88cc..4c73bd6564 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="MulMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj index 5622ad71d2..b8eb815e06 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="NDhrystone.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj index 63339c8903..76d7b9ded5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Permutate.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj index 5228f957ba..c2368e0d35 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Pi.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj index ea10a44d83..66d9b49550 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Puzzle.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj index f16d1d38b1..87408cd0b4 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="QuickSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj index caa2de7720..a768a01d95 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeInsert.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj index 9d253e28b4..770b495ac5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="TreeSort.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj index a234c09352..a18aa8811a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="XposMatrix.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj index 3cbf952833..d10772f2af 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj index a7c8f2daf3..3dffd5e4bf 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -32,11 +33,9 @@ <ItemGroup> <Compile Include="binarytrees.csharp3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj index 259d5e8ff3..5d5c7f72c6 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fasta.csharp-2.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj index 8d77905de9..30c542ee27 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="fastaredux.csharp.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj index 097a3a2534..89c8ad5c47 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj index f8c3785f54..be7e66e2a3 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="nbody.csharp-3.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj index 7396e3b00f..003871e447 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="pi-digits.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj index 6f334e9afb..e7b9d42bd0 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj index 69d39df429..00789ed3a5 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,11 +40,9 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj index e12feab89a..3cbd6d32db 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="spectralnorm.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj index 0f57308962..bb0aca7f14 100644 --- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Burgers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj index 26a64c6e89..a293c23987 100644 --- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -45,10 +46,9 @@ <Compile Include="numericsort.cs" /> <Compile Include="utility.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj index af7ce3b4c9..7bac1f4bdf 100644 --- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj +++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="FractalPerf.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj index 7ecdbab687..7d26fcb734 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="InlineGCStruct.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj index 34b42c389f..965618d15d 100644 --- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -31,11 +32,9 @@ <ItemGroup> <Compile Include="NoThrowInline.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj index 2fc6cb0419..6fac3b034a 100644 --- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Linq.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj index 2545a585bb..067ea9f7e0 100644 --- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -73,4 +74,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index baea313f2c..bb5226e58c 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <GCStressIncompatible>true</GCStressIncompatible> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -30,10 +31,9 @@ <ItemGroup> <Compile Include="CscBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+roslyn\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj index b6224770fa..dc256858fa 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -38,10 +39,9 @@ <Compile Include="VectorFloatStrict.cs" /> <Compile Include="VectorHelpers.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj index 0b1e5be0ae..ea19938bd5 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -44,10 +45,9 @@ <Compile Include="Surfaces.cs" /> <Compile Include="Vector.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj index d5c72559ec..dc31f186a2 100644 --- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj @@ -30,11 +30,9 @@ <ItemGroup> <Compile Include="SeekUnroll.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj index 917d749d41..65726fce85 100644 --- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj +++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> <AssemblyName>SciMark</AssemblyName> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -39,10 +40,9 @@ <Compile Include="SparseCompRow.cs" /> <Compile Include="Stopwatch.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj index c08d1cd14b..e28565bb52 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Deserialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj index 04798526f9..235de76463 100644 --- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Serialize.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark+serialize\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj index a871713d1d..0427657cf5 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -12,6 +12,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -34,11 +35,9 @@ <ItemGroup> <Compile Include="Indexer.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj index 7404828bcd..f3bcfa2ed9 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -12,6 +12,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -33,11 +34,9 @@ <ItemGroup> <Compile Include="SpanBench.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj index ec9e4e1bbf..ff54fab733 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Crypto.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj index f81039d693..50c8420691 100644 --- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj +++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj @@ -10,6 +10,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> @@ -29,10 +30,9 @@ <ItemGroup> <Compile Include="Richards.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj index 0489b0a8b0..6932f71cae 100644 --- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj +++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="RunBenchmarks.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj index 46b4b8e24f..949136259b 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b51817.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj index fb24d78107..bb1bf4d139 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52593.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj index 2358d4970f..68a40de4bd 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52733.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj index 26cd0e80c3..509a6628ea 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b52840.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj index 3c046ea754..99cdb6ebbb 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226a.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj index 9acb19163a..3bd0fa0fa7 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b53226b.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj index 1067ba1e42..390448cfd3 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj @@ -27,9 +27,10 @@ <ItemGroup> <Compile Include="b66533.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj index 2d330449a1..d6d753abaa 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj index 1d20f00012..1b7f8a70b5 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj @@ -33,11 +33,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj index 6107b7f18d..7bdd3d7238 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj @@ -28,10 +28,9 @@ <ItemGroup> <Compile Include="GitHub_8231.cs" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj index 238a9b609a..db2490dda9 100644 --- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj +++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj @@ -28,9 +28,10 @@ <ItemGroup> <Compile Include="_5mvazhg.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj index 30b8c4b97e..a3fbd8a948 100644 --- a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj +++ b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj @@ -20,9 +20,10 @@ <ItemGroup> <Compile Include="DoWhileBndChk.cs" /> </ItemGroup> - <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" /> - </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> diff --git a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj new file mode 100644 index 0000000000..0f2937aac4 --- /dev/null +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -0,0 +1,98 @@ +<?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> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Security.Cryptography.Algorithms"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json deleted file mode 100644 index d785552820..0000000000 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Console": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Security.Cryptography.Algorithms": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj new file mode 100644 index 0000000000..c0cb32f119 --- /dev/null +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -0,0 +1,98 @@ +<?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> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>7.0.1</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.ObjectModel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Dynamic.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Json"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Primitives"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Serialization.Xml"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlSerializer"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json deleted file mode 100644 index 402884f56c..0000000000 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "Newtonsoft.Json": "7.0.1", - "System.Console": "4.4.0-beta-24913-02", - "System.IO": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.ObjectModel": "4.4.0-beta-24913-02", - "System.Dynamic.Runtime": "4.4.0-beta-24913-02", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02", - "System.Runtime.Serialization.Xml": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XmlSerializer": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj new file mode 100644 index 0000000000..c7a5d57116 --- /dev/null +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -0,0 +1,113 @@ +<?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> + <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Memory"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.ThreadPool"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.4</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json deleted file mode 100644 index 46b9a694e5..0000000000 --- a/tests/src/JIT/config/benchmark/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0004", - "xunit.performance.core": "1.0.0-beta-build0004", - "xunit.performance.execution": "1.0.0-beta-build0004", - "xunit.performance.metrics": "1.0.0-beta-build0004", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Parallel": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Memory": "4.4.0-preview2-25316-01", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25316-01", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Threading.ThreadPool": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj index f71ad15a05..8be1cb04bf 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Devirtualization/override.ilproj b/tests/src/JIT/opt/Devirtualization/override.ilproj index 0bfc25ff45..75da709ced 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -32,11 +32,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - <PropertyGroup> - <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson> - <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson> - </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> + <PropertyGroup> + <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj new file mode 100644 index 0000000000..80f52a0259 --- /dev/null +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -0,0 +1,37 @@ +<?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> + <CLRTestKind>BuildOnly</CLRTestKind> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.assert"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.core"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.msbuild"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project>
\ No newline at end of file diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json deleted file mode 100644 index 975651896a..0000000000 --- a/tests/src/TestWrappersConfig/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "xunit": "2.2.0-beta2-build3300", - "xunit.assert": "2.2.0-beta2-build3300", - "xunit.core": "2.2.0-beta2-build3300", - "xunit.runner.msbuild": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net45": { - "imports": "portable-net45+win8" - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/dir.props b/tests/src/dir.props index cb976cc081..abad765fe4 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -13,6 +13,7 @@ <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> <!-- Set the project.json directory for generated TestWrappers. --> <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> + <AssemblyKey>Test</AssemblyKey> </PropertyGroup> <!-- Expose the target OS in a more convenient fashion --> @@ -75,16 +76,22 @@ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> </PropertyGroup> + <!-- Don't reference the mscorlib facade --> + <PropertyGroup> + <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> + </PropertyGroup> + <!-- Set default ZapRequire level (used only when CrossGen is enabled) --> <PropertyGroup> <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire> </PropertyGroup> <PropertyGroup> - <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath> <!-- Specify the target framework of the common test dependency project.json. --> <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort> + <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> </PropertyGroup> </Project> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 08c77df7cf..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun> </PropertyGroup> - <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> - <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson> - </PropertyGroup> - <!-- If it needs ProjectToRun, turn the project into a ProjectReference so it gets built --> @@ -189,4 +184,13 @@ DestinationFolder="$(OutputPath)" Condition="Exists('$(AssemblyName).reflect.xml')"/> </Target> + + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + + <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> + <ProjectAssetsFile></ProjectAssetsFile > + </PropertyGroup> + </Project> diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index e49ab945a7..6ae2b7c09e 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -23,9 +23,11 @@ <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> <DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" /> <DisabledProjects Include="Common\external\external.csproj" /> - <DisabledProjects Include="Common\external\external.depproj" /> + <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" /> <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" /> <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" /> + <DisabledProjects Include="JIT\config\**" /> + <DisabledProjects Include="Performance\performance.csproj" /> <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" /> <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 --> </ItemGroup> diff --git a/tests/src/performance/linkbench/linkbench.csproj b/tests/src/performance/linkbench/linkbench.csproj index 2a3048ab21..46c79ff039 100644 --- a/tests/src/performance/linkbench/linkbench.csproj +++ b/tests/src/performance/linkbench/linkbench.csproj @@ -16,6 +16,7 @@ <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> @@ -23,8 +24,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj index ed197261fb..ccacb0b66c 100644 --- a/tests/src/performance/perflab/PerfLab.csproj +++ b/tests/src/performance/perflab/PerfLab.csproj @@ -12,6 +12,7 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMonikerShort>netstandard1.4</NuGetTargetMonikerShort> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> @@ -19,8 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> </PropertyGroup> <PropertyGroup> - <ProjectJson>..\project.json</ProjectJson> - <ProjectLockJson>..\project.lock.json</ProjectLockJson> + <RestoreOutputPath>..\obj</RestoreOutputPath> </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj new file mode 100644 index 0000000000..49659691bf --- /dev/null +++ b/tests/src/performance/performance.csproj @@ -0,0 +1,110 @@ +<?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> + <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> + <NugetTargetMonikerShort>netstandard1.5</NugetTargetMonikerShort> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.performance.api"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>1.0.0-beta-build0003</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>1.0.3-alpha-experimental</Version> + </PackageReference> + <PackageReference Include="Microsoft.NETCore.Platforms"> + <Version>2.0.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Collections.NonGeneric"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Console"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.IO.FileSystem"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Linq.Expressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Numerics.Vectors"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Reflection"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Reflection.TypeExtensions"> + <Version>4.4.0-preview2-25302-03</Version> + </PackageReference> + <PackageReference Include="System.Runtime"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Extensions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Loader"> + <Version>4.0.0</Version> + </PackageReference> + <PackageReference Include="System.Runtime.Numerics"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Text.RegularExpressions"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Threading.Tasks.Parallel"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.Process"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="System.Xml.XPath.XmlDocument"> + <Version>4.4.0-beta-24913-02</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.2-prerelease-00177</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netstandard1.5</TargetFramework> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json deleted file mode 100644 index 8746053f7e..0000000000 --- a/tests/src/performance/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dependencies": { - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25316-01", - "System.Collections.NonGeneric": "4.4.0-beta-24913-02", - "System.Console": "4.4.0-beta-24913-02", - "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Linq": "4.4.0-beta-24913-02", - "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview2-25316-01", - "System.Reflection": "4.4.0-beta-24913-02", - "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview2-25316-01", - "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.Loader": "4.0.0", - "System.Runtime.Numerics": "4.4.0-beta-24913-02", - "System.Text.RegularExpressions": "4.4.0-beta-24913-02", - "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.Tasks": "4.4.0-beta-24913-02", - "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", - "System.Diagnostics.Process": "4.4.0-beta-24913-02", - "System.Xml.XmlDocument": "4.4.0-beta-24913-02", - "System.Xml.XPath": "4.4.0-beta-24913-02", - "System.Xml.XPath.XmlDocument": "4.4.0-beta-24913-02", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 3b59343f8a..69531f44b1 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -77,3 +77,6 @@ Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generate Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/Generated681.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/Generated682.sh Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/Generated683.sh +Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass/Test6_ImplementingClass.sh"> +Loader/classloader/regressions/440935/Test/Test.sh"> +JIT/CheckProjects/CheckProjects/CheckProjects.sh diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets index 3b343bd891..a0ff7f59fa 100644 --- a/tests/xunitwrapper.targets +++ b/tests/xunitwrapper.targets @@ -6,13 +6,13 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Target Name="ResolveNuGetPackages"> - <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))" + <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectAssetsFile))" AllowFallbackOnTargetSelection="true" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" RuntimeIdentifier="$(TestNugetRuntimeId)" ProjectLanguage="$(Language)" - ProjectLockFile="$(ProjectLockJson)" + ProjectLockFile="$(ProjectAssetsFile)" TargetMonikers="$(TargetFrameworkMoniker)"> <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> |