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

Merge branch 'release/6.0.1xx' into release/6.0.3xx

Browse source
This commit is contained in:
Jason Zhai 2022-11-02 22:26:15 -07:00
commit f3f7fb6c5d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

@ -15,6 +15,8 @@ variables:
- name: PostBuildSign - name: PostBuildSign
value: true value: true
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: Codeql.Enabled
value: true
- group: DotNet-DotNetCli-Storage - group: DotNet-DotNetCli-Storage
- group: DotNet-Installer-SDLValidation-Params - group: DotNet-Installer-SDLValidation-Params
- name: _PublishUsingPipelines - name: _PublishUsingPipelines

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -26,7 +26,7 @@
<PropertyGroup> <PropertyGroup>
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 25))</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
</PropertyGroup> </PropertyGroup>