Fixed dotnet build in benchmarks #865
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
manodasanW
reviewed
Jun 10, 2021
src/Benchmarks/Benchmarks.csproj
Outdated
| <ProjectReference Include="..\Projections\Windows\Windows.csproj" Condition="$(UseWinmd) == false" /> | ||
| <ProjectReference Include="..\Projections\Benchmark\Benchmark.csproj" Condition="$(UseWinmd) == false" /> | ||
| <ProjectReference Include="..\TestWinRT\BenchmarkComponent\BenchmarkComponent.vcxproj" Condition="$(UseWinmd) == true" /> | ||
| <ProjectReference Include="..\Projections\Windows\Windows.csproj" Condition="$(IsDotnetBuild) == false" /> |
There was a problem hiding this comment.
does benchmark_winmd.cmd still work? Do you still need the UseWinmd check too as testing the previous built-in winmd support doesn't use the cswinrt projections?
manodasanW
reviewed
Jun 10, 2021
src/Benchmarks/Benchmarks.csproj
Outdated
| @@ -11,6 +11,8 @@ | |||
| <ApplicationManifest Condition="$(UseWinmd) == true">Benchmarks.manifest</ApplicationManifest> | |||
| <BenchmarkTargetFramework>$(TargetFramework)</BenchmarkTargetFramework> | |||
| <BenchmarkTargetFramework Condition="'$(BenchmarkTargetFramework)' == 'netcoreapp2.0'">netstandard2.0</BenchmarkTargetFramework> | |||
| <IsDotnetBuild Condition="'$(IsDotnetBuild)' == ''">false</IsDotnetBuild> | |||
| <LangVersion Condition="$(IsDotnetBuild) == true">9.0</LangVersion> | |||
There was a problem hiding this comment.
@ujjwalchadha, please change your editor setting to use spaces instead of tabs
manodasanW
approved these changes
Jun 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the benchmark.cmd errors that occur due to presence of vcxproj files in the programatical dotnet build process. It uses the dll files directly built in the msbuild step and then skips the project files inclusion by introducing IsDotnetBuild prop.