mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #70 from dsplaisted/winforms-templates

Browse source 
Add WinForms project templates, insert updated DesktopUI
This commit is contained in:
Daniel Plaisted 2018-08-29 14:49:37 -07:00 • committed by GitHub
commit d519f30898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/BundledTemplates.props
View file

@ -4,6 +4,7 @@
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" Version="$(MicrosoftDotNetCommonProjectTemplates20PackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="$(MicrosoftDotNetTestProjectTemplates20PackageVersion)" />
<BundledTemplate Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
<BundledTemplate Include="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />

3
build/DependencyVersions.props
View file

@ -39,8 +39,9 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
<MicrosoftPrivateWpfPackageVersion>3.0.0-alpha-26828-2</MicrosoftPrivateWpfPackageVersion>
<MicrosoftPrivateWpfPackageVersion>3.0.0-alpha-26829-8</MicrosoftPrivateWpfPackageVersion>
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->

6
build/MSBuildExtensions.targets
View file

@ -119,11 +119,11 @@ Copyright (c) .NET Foundation. All rights reserved.
<LatestPatchVersionForNetCore2_1 Condition="'%24(LatestPatchVersionForNetCore2_1)' == ''">2.1.2</LatestPatchVersionForNetCore2_1>
</PropertyGroup>
<ItemGroup>
<KnownFrameworkReference Include="Microsoft.Windows.UI"
RuntimeFrameworkName="Microsoft.Private.WPF"
<KnownFrameworkReference Include="Microsoft.DesktopUI"
RuntimeFrameworkName="Microsoft.DesktopUI.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
TargetingPackName="Microsoft.Private.WPF"
TargetingPackName="Microsoft.DesktopUI.App"
TargetingPackVersion="$(MicrosoftPrivateWpfPackageVersion)"
/>