Skip to content

Commit faaedc4

Browse files
authored
Merge branch 'release/dev16.5' into merges/master-to-release/dev16.5
2 parents e69e4f1 + 6822bcb commit faaedc4

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ stages:
339339
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
340340
- template: eng/release/insert-into-vs.yml
341341
parameters:
342-
componentBranchName: refs/heads/release/dev16.4
343-
insertTargetBranch: rel/d16.4
342+
componentBranchName: refs/heads/release/dev16.5
343+
insertTargetBranch: master
344344
insertTeamEmail: [email protected]
345345
insertTeamName: 'F#'

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.7</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.8</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>4</VSMinorVersion>
33+
<VSMinorVersion>5</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

eng/common/dotnet-install.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1414
version='Latest'
1515
architecture=''
1616
runtime='dotnet'
17-
runtimeSourceFeed=''
18-
runtimeSourceFeedKey=''
1917
while [[ $# > 0 ]]; do
2018
opt="$(echo "$1" | awk '{print tolower($0)}')"
2119
case "$opt" in
@@ -31,14 +29,6 @@ while [[ $# > 0 ]]; do
3129
shift
3230
runtime="$1"
3331
;;
34-
-runtimesourcefeed)
35-
shift
36-
runtimeSourceFeed="$1"
37-
;;
38-
-runtimesourcefeedkey)
39-
shift
40-
runtimeSourceFeedKey="$1"
41-
;;
4232
*)
4333
echo "Invalid argument: $1"
4434
exit 1

0 commit comments

Comments
 (0)