Skip to content

Commit 912b2d3

Browse files
brettfobaronfel
brettfo
authored and
baronfel
committed
Merge remote-tracking branch 'upstream/release/dev16.3' into merges/release/dev16.3-to-master
2 parents d6b5b1b + 0422ff2 commit 912b2d3

File tree

107 files changed

+2129
-1943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+2129
-1943
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
192192
FSharp.Compiler.Tools.Nuget/*.nupkg
193193
FSharp.Core.Nuget/*.nupkg
194194
artifacts/*.nupkg
195+
*.bak
196+
*.vserr
197+
*.err
195198
*.orig
196199
*.mdf
197200
*.ldf

‎FSharp.Profiles.props‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,18 @@
1111
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1212
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1313
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
14-
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
18-
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
1914
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
2015
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
2116
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
2217
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
2318
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
2419
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
25-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULE_HANDLES</DefineConstants>
26-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
27-
<DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
28-
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
29-
<DefineConstants>$(DefineConstants);FX_NO_SERVERCODEPAGES</DefineConstants>
3020
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
3121
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
32-
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
33-
<DefineConstants>$(DefineConstants);FX_NO_THREADABORT</DefineConstants>
34-
<DefineConstants>$(DefineConstants);FX_NO_WAITONE_MILLISECONDS</DefineConstants>
35-
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
3622
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
3723
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
3824
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
39-
<DefineConstants>$(DefineConstants);FX_REDUCED_EXCEPTIONS</DefineConstants>
4025
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
41-
<DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
42-
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
4326
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
4427
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
4528
</PropertyGroup>

‎FSharpBuild.Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9595
</PropertyGroup>
9696

97+
<PropertyGroup Condition="'$(OS)' == 'Unix'">
98+
<DefineConstants>$(DefineConstants);TESTING_ON_LINUX</DefineConstants>
99+
</PropertyGroup>
100+
97101
<!-- SDK targets override -->
98102
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
99103
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>

‎eng/Build.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ function BuildSolution() {
195195
/p:QuietRestore=$quietRestore `
196196
/p:QuietRestoreBinaryLog=$binaryLog `
197197
/p:TestTargetFrameworks=$testTargetFrameworks `
198+
/v:$verbosity `
198199
$suppressExtensionDeployment `
199200
@properties
200201
}

‎eng/Versions.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
<!-- Version number computation -->
1313
<PropertyGroup>
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
15-
<FSLanguageVersion>4.6</FSLanguageVersion>
15+
<FSLanguageVersion>4.7</FSLanguageVersion>
1616
<FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
17-
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
17+
<FSCorePackageVersion>$(FSCoreMajorVersion).1</FSCorePackageVersion>
1818
<FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
1919
<FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
2020
<!-- The current published nuget package -->
21-
<FSharpCoreShippedPackageVersion>4.6.2</FSharpCoreShippedPackageVersion>
21+
<FSharpCoreShippedPackageVersion>4.7.0</FSharpCoreShippedPackageVersion>
2222
<!-- The pattern for specifying the preview package -->
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.5</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.6</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>2</VSMinorVersion>
33+
<VSMinorVersion>3</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -55,7 +55,6 @@
5555
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
5656
https://api.nuget.org/v3/index.json;
5757
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
58-
https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json;
5958
https://dotnet.myget.org/F/symreader-converter/api/v3/index.json;
6059
https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
6160
https://myget.org/F/vs-devcore/api/v3/index.json;

‎eng/build.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ function BuildSolution {
246246
# do real build
247247
MSBuild $toolset_build_proj \
248248
$bl \
249+
/v:$verbosity \
249250
/p:Configuration=$configuration \
250251
/p:Projects="$projects" \
251252
/p:RepoRoot="$repo_root" \
@@ -278,3 +279,4 @@ if [[ "$test_core_clr" == true ]]; then
278279
fi
279280

280281
ExitWithExitCode 0
282+

‎eng/common/post-build/dotnetsymbol-init.ps1‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
param (
2+
$dotnetsymbolVersion = $null
3+
)
4+
5+
$ErrorActionPreference = "Stop"
6+
Set-StrictMode -Version 2.0
7+
8+
. $PSScriptRoot\..\tools.ps1
9+
10+
$verbosity = "minimal"
11+
12+
function Installdotnetsymbol ($dotnetsymbolVersion) {
13+
$dotnetsymbolPackageName = "dotnet-symbol"
14+
15+
$dotnetRoot = InitializeDotNetCli -install:$true
16+
$dotnet = "$dotnetRoot\dotnet.exe"
17+
$toolList = & "$dotnet" tool list --global
18+
19+
if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) {
20+
Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed."
21+
}
22+
else {
23+
Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..."
24+
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
25+
& "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global
26+
}
27+
}
28+
29+
Installdotnetsymbol $dotnetsymbolVersion

‎eng/common/post-build/sourcelink-cli-init.ps1‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
param (
2+
$sourcelinkCliVersion = $null
3+
)
4+
5+
$ErrorActionPreference = "Stop"
6+
Set-StrictMode -Version 2.0
7+
8+
. $PSScriptRoot\..\tools.ps1
9+
10+
$verbosity = "minimal"
11+
12+
function InstallSourcelinkCli ($sourcelinkCliVersion) {
13+
$sourcelinkCliPackageName = "sourcelink"
14+
15+
$dotnetRoot = InitializeDotNetCli -install:$true
16+
$dotnet = "$dotnetRoot\dotnet.exe"
17+
$toolList = & "$dotnet" tool list --global
18+
19+
if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) {
20+
Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed."
21+
}
22+
else {
23+
Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..."
24+
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
25+
& "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global
26+
}
27+
}
28+
29+
InstallSourcelinkCli $sourcelinkCliVersion

‎eng/common/post-build/symbols-validation.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ function InstallDotnetSymbol {
178178

179179
try {
180180
InstallDotnetSymbol
181-
182181
CheckSymbolsAvailable
183182
}
184183
catch {

‎eng/common/templates/job/publish-build-assets.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
6262
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
6363
/p:Configuration=$(_BuildConfig)
64+
/v:detailed
6465
condition: ${{ parameters.condition }}
6566
continueOnError: ${{ parameters.continueOnError }}
6667

0 commit comments

Comments
 (0)