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

Merge pull request #1320 from dotnet/merges/release/3.0.1xx-to-master

Browse source 
Merge release/3.0.1xx to master
This commit is contained in:
William Li 2019-04-18 17:51:57 -07:00 • committed by GitHub
commit 1aa7bacb4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.vsts-ci.yml
View file

@ -1,6 +1,9 @@
trigger: trigger:
- master batch: true
- release/* branches:
include:
- master
- release/*
variables: variables:
- name: _PublishBlobFeedUrl - name: _PublishBlobFeedUrl

2
eng/Versions.props
View file

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