Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 6340f35

Browse files
John SoklaskiDrewScoggins
authored andcommitted
Move benchmarks to use netstandard1.4 instead of netcoreapp1.0 to fix desktop reflection issue
1 parent 8d1d348 commit 6340f35

File tree

83 files changed

+128
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+128
-34
lines changed

tests/scripts/run-xunit-perf.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ pushd sandbox
3333
@rem stage stuff we need
3434

3535
@rem xunit and perf
36-
xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.runner.Windows\1.0.0-alpha-build0040\tools\* . > %RUNLOG%
37-
xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.analysis\1.0.0-alpha-build0040\tools\* . >> %RUNLOG%
38-
xcopy /sy %CORECLR_REPO%\packages\xunit.console.netcore\1.0.2-prerelease-00177\runtimes\any\native\* . >> %RUNLOG%
36+
xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.runner.Windows\1.0.0-alpha-build0035\tools\* . > %RUNLOG%
37+
xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.analysis\1.0.0-alpha-build0035\tools\* . >> %RUNLOG%
38+
xcopy /sy %CORECLR_REPO%\packages\xunit.console.netcore\1.0.2-prerelease-00101\runtimes\any\native\* . >> %RUNLOG%
3939
xcopy /sy %CORECLR_REPO%\bin\tests\Windows_NT.%TEST_ARCH%.%TEST_CONFIG%\Tests\Core_Root\* . >> %RUNLOG%
4040

4141
@rem find and stage the tests

tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
16+
<NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
1617
</PropertyGroup>
1718
<!-- Default configurations to help VS understand the configurations -->
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

0 commit comments

Comments
 (0)