Merge branch 'release/3.0.1xx' into merge-master-to-release/3.0.1xx-for-preview5

This commit is contained in:
William Li 2019-04-22 09:51:10 -07:00 committed by GitHub
commit 72e625fe33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -62,9 +62,9 @@
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>6487f2fd7a2d9cb44bad72d6c36af289de2d721f</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview4.19213.1">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview4.19222.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>b1ee29b8b8e14c1200adff02847391dde471d0d2</Sha>
<Sha>e88abb4ba892ae2a0b8ba053d38d4f3aff352626</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview5.19219.3">
<Uri>https://github.com/dotnet/wpf</Uri>

View file

@ -16,7 +16,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview4.19213.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview4.19222.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->