Skip to content

Commit a2a6a87

Browse files
committed
Fix support for building PerfView in Visual Studio 2019
1 parent 61ad442 commit a2a6a87

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

global.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"msbuild-sdks": {
3+
"MSBuild.Sdk.Extras": "1.6.65"
4+
}
5+
}

src/PerfView/PerfView.csproj

+2-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="MSBuild.Sdk.Extras">
33

44
<PropertyGroup>
55
<TargetFramework>net45</TargetFramework>
@@ -8,6 +8,7 @@
88
<Prefer32Bit>True</Prefer32Bit>
99
<StartupObject>PerfView.App</StartupObject>
1010
<PublishRepositoryUrl>true</PublishRepositoryUrl>
11+
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1112

1213
<Description>PerfView</Description>
1314
<Company>Microsoft</Company>
@@ -100,10 +101,6 @@
100101
<Compile Remove="SupportFiles\tutorial.cs" />
101102
</ItemGroup>
102103

103-
<ItemGroup>
104-
<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
105-
</ItemGroup>
106-
107104
<ItemGroup>
108105
<Compile Update="Properties\Resources.Designer.cs">
109106
<AutoGen>True</AutoGen>
@@ -452,31 +449,6 @@
452449
<SplashScreen Include="SplashScreen.png" />
453450
</ItemGroup>
454451

455-
<!-- CPS doesn't show these items by default, but we want to show them. -->
456-
<ItemGroup>
457-
<!-- XAML pages and resources -->
458-
<None Include="@(Page)" />
459-
<None Include="@(Resource)" />
460-
461-
<!-- Fix nesting of generated source files in the project tree -->
462-
<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
463-
</ItemGroup>
464-
465-
<!-- Work around CoreCompile doesn't exist error -->
466-
<PropertyGroup>
467-
<LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
468-
</PropertyGroup>
469-
470-
<!--
471-
Work around to fix Intellisense file generation for XAML projects
472-
https://github.com/dotnet/project-system/issues/2488
473-
-->
474-
<Target Name="WorkaroundForXAMLIntellisenseBuildIssue" AfterTargets="_CheckCompileDesignTimePrerequisite">
475-
<PropertyGroup>
476-
<BuildingProject>false</BuildingProject>
477-
</PropertyGroup>
478-
</Target>
479-
480452
<!-- ******************* Signing Support *********************** -->
481453
<ItemGroup>
482454
<FilesToSign Include="$(TargetPath)">

0 commit comments

Comments
 (0)