Skip to content

Commit

Permalink
Merge pull request #885 from sharwell/vs-2019
Browse files Browse the repository at this point in the history
Fix support for building PerfView in Visual Studio 2019
  • Loading branch information
vancem authored Feb 26, 2019
2 parents 7613b06 + a2a6a87 commit 906b9cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 30 deletions.
5 changes: 5 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "1.6.65"
}
}
32 changes: 2 additions & 30 deletions src/PerfView/PerfView.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFramework>net45</TargetFramework>
Expand All @@ -8,6 +8,7 @@
<Prefer32Bit>True</Prefer32Bit>
<StartupObject>PerfView.App</StartupObject>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>

<Description>PerfView</Description>
<Company>Microsoft</Company>
Expand Down Expand Up @@ -100,10 +101,6 @@
<Compile Remove="SupportFiles\tutorial.cs" />
</ItemGroup>

<ItemGroup>
<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -452,31 +449,6 @@
<SplashScreen Include="SplashScreen.png" />
</ItemGroup>

<!-- CPS doesn't show these items by default, but we want to show them. -->
<ItemGroup>
<!-- XAML pages and resources -->
<None Include="@(Page)" />
<None Include="@(Resource)" />

<!-- Fix nesting of generated source files in the project tree -->
<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
</ItemGroup>

<!-- Work around CoreCompile doesn't exist error -->
<PropertyGroup>
<LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
</PropertyGroup>

<!--
Work around to fix Intellisense file generation for XAML projects
https://github.com/dotnet/project-system/issues/2488
-->
<Target Name="WorkaroundForXAMLIntellisenseBuildIssue" AfterTargets="_CheckCompileDesignTimePrerequisite">
<PropertyGroup>
<BuildingProject>false</BuildingProject>
</PropertyGroup>
</Target>

<!-- ******************* Signing Support *********************** -->
<ItemGroup>
<FilesToSign Include="$(TargetPath)">
Expand Down

0 comments on commit 906b9cb

Please sign in to comment.