From 174bf33e95a3d53ae55b2c54bc850c52196ce9ed Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 01:03:22 -0800 Subject: [PATCH 1/6] Improve workflow --- .gitignore | 70 +++++++++++++++++++ FSharpBuild.Directory.Build.targets | 1 + FSharpTests.Directory.Build.props | 2 +- Makefile | 10 +-- build.cmd | 24 +++++-- build/targets/ConvertPortablePdbs.targets | 2 +- build/targets/NGenOrCrossGen.targets | 30 ++++++++ fsharp.proj | 51 +++++++++++--- proto.proj | 10 ++- .../Microsoft.FSharp.Compiler.nuspec | 4 +- src/fsharp/fsc/fsc.fsproj | 1 + src/fsharp/fsi/fsi.fsproj | 5 +- tests/fsharp/test-framework.fs | 2 +- 13 files changed, 185 insertions(+), 27 deletions(-) create mode 100644 build/targets/NGenOrCrossGen.targets diff --git a/.gitignore b/.gitignore index 28d53ff4e47..e3afc57e2f7 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,73 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll msbuild.binlog /fcs/FSharp.Compiler.Service.netstandard/*.fs /fcs/FSharp.Compiler.Service.netstandard/*.fsi +/tests/TestResults/FSharp.Tests.FSharpSuite.net40.trx +/tests/TestResults/FSharp.Tests.FSharpSuite.coreclr.trx +/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx +/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx +/Tools/fslex/zh-Hant/FSharp.Core.resources.dll +/Tools/fslex/zh-Hant +/Tools/fslex/zh-Hans/FSharp.Core.resources.dll +/Tools/fslex/zh-Hans +/Tools/fslex/tr/FSharp.Core.resources.dll +/Tools/fslex/tr +/Tools/fslex/ru/FSharp.Core.resources.dll +/Tools/fslex/ru +/Tools/fslex/pt-BR/FSharp.Core.resources.dll +/Tools/fslex/pt-BR +/Tools/fslex/pl/FSharp.Core.resources.dll +/Tools/fslex/pl +/Tools/fslex/ko/FSharp.Core.resources.dll +/Tools/fslex/ko +/Tools/fslex/ja/FSharp.Core.resources.dll +/Tools/fslex/ja +/Tools/fslex/it/FSharp.Core.resources.dll +/Tools/fslex/it +/Tools/fslex/fr/FSharp.Core.resources.dll +/Tools/fslex/fr +/Tools/fslex/es/FSharp.Core.resources.dll +/Tools/fslex/es +/Tools/fslex/en/FSharp.Core.resources.dll +/Tools/fslex/en +/Tools/fslex/de/FSharp.Core.resources.dll +/Tools/fslex/de +/Tools/fslex/cs/FSharp.Core.resources.dll +/Tools/fslex/fslex.xml +/Tools/fslex/fslex.runtimeconfig.json +/Tools/fslex/fslex.pdb +/Tools/fslex/fslex.dll +/Tools/fslex/fslex.deps.json +/Tools/fslex/FSharp.Core.dll +/Tools/fsyacc/zh-Hant/FSharp.Core.resources.dll +/Tools/fsyacc/zh-Hant +/Tools/fsyacc/zh-Hans/FSharp.Core.resources.dll +/Tools/fsyacc/zh-Hans +/Tools/fsyacc/tr/FSharp.Core.resources.dll +/Tools/fsyacc/tr +/Tools/fsyacc/ru/FSharp.Core.resources.dll +/Tools/fsyacc/ru +/Tools/fsyacc/pt-BR/FSharp.Core.resources.dll +/Tools/fsyacc/pt-BR +/Tools/fsyacc/pl/FSharp.Core.resources.dll +/Tools/fsyacc/pl +/Tools/fsyacc/ko/FSharp.Core.resources.dll +/Tools/fsyacc/ko +/Tools/fsyacc/ja/FSharp.Core.resources.dll +/Tools/fsyacc/ja +/Tools/fsyacc/it/FSharp.Core.resources.dll +/Tools/fsyacc/it +/Tools/fsyacc/fr/FSharp.Core.resources.dll +/Tools/fsyacc/fr +/Tools/fsyacc/es/FSharp.Core.resources.dll +/Tools/fsyacc/es +/Tools/fsyacc/en/FSharp.Core.resources.dll +/Tools/fsyacc/en +/Tools/fsyacc/de/FSharp.Core.resources.dll +/Tools/fsyacc/de +/Tools/fsyacc/cs/FSharp.Core.resources.dll +/Tools/fsyacc/fsyacc.xml +/Tools/fsyacc/fsyacc.runtimeconfig.json +/Tools/fsyacc/fsyacc.pdb +/Tools/fsyacc/fsyacc.dll +/Tools/fsyacc/fsyacc.deps.json +/Tools/fsyacc/FSharp.Core.dll diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index ef7f82861c5..fa39d7498fd 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -34,6 +34,7 @@ + diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index d9fc35fc05d..46e9b6fb369 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -23,7 +23,7 @@ $(MSBuildThisFileDirectory)artifacts\toolset\dotnet dotnet.exe dotnet - $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.0\fsi.exe + $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\fsi.exe diff --git a/Makefile b/Makefile index e402025e0ef..83b7dbc9c50 100644 --- a/Makefile +++ b/Makefile @@ -37,13 +37,13 @@ build: proto restore $(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsc/fsc.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj - $(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 src/fsharp/fsi/fsi.fsproj - $(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj - $(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj + $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsi/fsi.fsproj + $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj + $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj test: build - $(DotNetExe) test -f netcoreapp2.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx" - $(DotNetExe) test -f netcoreapp2.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx" + $(DotNetExe) test -f netcoreapp2.1 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx" + $(DotNetExe) test -f netcoreapp2.1 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx" clean: rm -rf $(CURDIR)/artifacts diff --git a/build.cmd b/build.cmd index 389679d5ba4..80d24cfa674 100644 --- a/build.cmd +++ b/build.cmd @@ -1,6 +1,5 @@ rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. @if "%_echo%"=="" echo off - setlocal enableDelayedExpansion :ARGUMENTS_VALIDATION @@ -66,6 +65,7 @@ set BUILD_FCS=0 set BUILD_CONFIG=Release set BUILD_DIAG= set BUILD_PUBLICSIGN=0 +set BUILD_FSHARP_PROJ=1 set TEST_NET40_COMPILERUNIT_SUITE=0 set TEST_NET40_COREUNIT_SUITE=0 @@ -464,10 +464,15 @@ if /i "%TEST_NET40_FSHARP_SUITE" == "1" ( ) rem Decide if Proto need building -if NOT EXIST Proto\net40\bin\fsc.exe ( +if NOT EXIST "%~dp0artifacts\bin\fsc\Proto\net46\fsc.exe" ( set BUILD_PROTO=1 ) +rem decide if FSharp.Proj needs building +if "%BUILD_NET40%"=="0" if "%BUILD_NET40_FSHARP_CORE%"=="0" if "%BUILD_CORECLR%"=="0" if "%BUILD_VS%"=="0" if "%BUILD_FCS%"=="0" if "%TEST_NET40_COMPILERUNIT_SUITE%"=="0" if "%TEST_NET40_COREUNIT_SUITE%"=="0" if "%TEST_NET40_FSHARP_SUITE%"=="0" if "%TEST_NET40_FSHARPQA_SUITE%"=="0" if "%TEST_CORECLR_COREUNIT_SUITE%"=="0" if "%TEST_CORECLR_FSHARP_SUITE%"=="0" if "%TEST_VS_IDEUNIT_SUITE%"=="0" if "%TEST_FCS%"=="0" if "%TEST_END_2_END%"=="0" if "%COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES%"=="0" ( + set BUILD_FSHARP_PROJ=0 +) + rem rem This stops the dotnet cli from hunting around and rem finding the highest possible dotnet sdk version to use. @@ -483,7 +488,6 @@ echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% echo BUILD_NET40=%BUILD_NET40% echo BUILD_NET40_FSHARP_CORE=%BUILD_NET40_FSHARP_CORE% echo BUILD_CORECLR=%BUILD_CORECLR% -echo BUILD_FROMSOURCE=%BUILD_FROMSOURCE% echo BUILD_VS=%BUILD_VS% echo BUILD_FCS=%BUILD_FCS% echo BUILD_SETUP=%BUILD_SETUP% @@ -491,6 +495,8 @@ echo BUILD_NUGET=%BUILD_NUGET% echo BUILD_CONFIG=%BUILD_CONFIG% echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% echo BUILD_MICROBUILD=%BUILD_MICROBUILD% +echo BUILD_FROMSOURCE=%BUILD_FROMSOURCE% +echo BUILD_FSHARP_PROJ=%BUILD_FSHARP_PROJ% echo. echo PB_SKIPTESTS=%PB_SKIPTESTS% echo PB_RESTORESOURCE=%PB_RESTORESOURCE% @@ -580,10 +586,18 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se :vsversionset if "%VisualStudioVersion%" == "" echo Error: Could not find an installation of Visual Studio && goto :failure +if exist "%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\amd64\MSBuild.exe" ( + set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\amd64\MSBuild.exe" + goto :havemsbuild +) if exist "%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" ( set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" goto :havemsbuild ) +if exist "%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\amd64\MSBuild.exe" ( + set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\amd64\MSBuild.exe" + goto :havemsbuild +) if exist "%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" ( set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" goto :havemsbuild @@ -665,7 +679,7 @@ if "%BUILD_PROTO%" == "1" ( echo ---------------- Done with SDK restore, starting build ------------------------ -if "%BUILD_PHASE%" == "1" ( +if "%BUILD_PHASE%" == "1" if "%BUILD_FSHARP_PROJ%" == "1" ( echo %_dotnetexe% restore fsharp.proj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\fsharp.proj.restore.binlog %_dotnetexe% restore fsharp.proj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\fsharp.proj.restore.binlog @@ -1072,6 +1086,8 @@ goto :success REM ------ exit ------------------------------------- :failure endlocal +@echo +@TIME /T >> TIME.LOG exit /b 1 :success diff --git a/build/targets/ConvertPortablePdbs.targets b/build/targets/ConvertPortablePdbs.targets index c43042a499e..8b4d4cd9e03 100644 --- a/build/targets/ConvertPortablePdbs.targets +++ b/build/targets/ConvertPortablePdbs.targets @@ -9,7 +9,7 @@ Condition="'$(OS)' != 'Unix' AND Exists('$(TargetPath)') AND ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND - $(TargetFramework.StartsWith('net4')) AND + '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(Configuration)' != 'Proto'"> $(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe diff --git a/build/targets/NGenOrCrossGen.targets b/build/targets/NGenOrCrossGen.targets new file mode 100644 index 00000000000..9cac2b6573c --- /dev/null +++ b/build/targets/NGenOrCrossGen.targets @@ -0,0 +1,30 @@ + + + + + $(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe + $(windir)\Microsoft.NET\Framework\v4.0.30319\ngen.exe + + + + + + + + + + + + + true + false + + + + diff --git a/fsharp.proj b/fsharp.proj index e695da391c9..26900615cf1 100644 --- a/fsharp.proj +++ b/fsharp.proj @@ -36,19 +36,52 @@ true + + + true + true + + - - - - - - - - - + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + + + TargetFramework=netstandard1.6 + TargetFramework=netcoreapp2.1 + diff --git a/proto.proj b/proto.proj index c3a704496ee..0974580af5a 100644 --- a/proto.proj +++ b/proto.proj @@ -7,8 +7,14 @@ - - + + TargetFramework=net46 + TargetFramework=netcoreapp2.1 + + + TargetFramework=net46 + TargetFramework=netcoreapp2.1 + diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec index 87ef49f5521..f10712a641e 100644 --- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec +++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec @@ -55,14 +55,14 @@ --> - + - + diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 4bc9770e9e0..40f56a0627e 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -12,6 +12,7 @@ $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true true + true diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index 6a4b7df15d5..5dbcac7557e 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -4,7 +4,7 @@ Exe - net46;netcoreapp2.0 + net46;netcoreapp2.1 .exe fsi $(NoWarn);45;55;62;75;1204 @@ -13,6 +13,7 @@ fsi.res true true + true @@ -45,7 +46,7 @@ - + diff --git a/tests/fsharp/test-framework.fs b/tests/fsharp/test-framework.fs index 85bc6319f19..85d462ffe47 100644 --- a/tests/fsharp/test-framework.fs +++ b/tests/fsharp/test-framework.fs @@ -164,7 +164,7 @@ let config configurationName envVars = let fsharpCompilerInteractiveSettingsArchitecture = "net46" #else let fscArchitecture = "netcoreapp2.1" - let fsiArchitecture = "netcoreapp2.0" + let fsiArchitecture = "netcoreapp2.1" let fsharpCoreArchitecture = "netstandard1.6" let fsharpBuildArchitecture = "netstandard2.0" let fsharpCompilerInteractiveSettingsArchitecture = "netstandard1.6" From e54c4f6ae57f9b6e0000914ab771995a23a99d7d Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 01:39:02 -0800 Subject: [PATCH 2/6] back to 32bit msbuild --- build.cmd | 10 +--------- fsharp.proj | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/build.cmd b/build.cmd index 80d24cfa674..919a526b67e 100644 --- a/build.cmd +++ b/build.cmd @@ -14,7 +14,7 @@ goto :ARGUMENTS_OK echo Build and run a subset of test suites echo. -echo Usage: +echo Usage:` echo. echo build.cmd ^ echo ^ @@ -586,18 +586,10 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se :vsversionset if "%VisualStudioVersion%" == "" echo Error: Could not find an installation of Visual Studio && goto :failure -if exist "%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\amd64\MSBuild.exe" ( - set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\amd64\MSBuild.exe" - goto :havemsbuild -) if exist "%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" ( set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" goto :havemsbuild ) -if exist "%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\amd64\MSBuild.exe" ( - set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\amd64\MSBuild.exe" - goto :havemsbuild -) if exist "%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" ( set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" goto :havemsbuild diff --git a/fsharp.proj b/fsharp.proj index 26900615cf1..d87b65ee597 100644 --- a/fsharp.proj +++ b/fsharp.proj @@ -51,36 +51,34 @@ - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard1.6 + TargetFramework=net45 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard2.0 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard1.6 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard1.6 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netcoreapp2.1 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=netcoreapp2.1 + TargetFramework=net46 - TargetFramework=netstandard1.6 - TargetFramework=netcoreapp2.1 + TargetFramework=net46 From 4ee8182ab54aaebcf608ba685d85a7ceadba4413 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 02:30:11 -0800 Subject: [PATCH 3/6] move out nugets, change targets in makefile --- Makefile | 4 ++-- fsharp.proj | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 83b7dbc9c50..14a5b0a8c07 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,8 @@ build: proto restore $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsc/fsc.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsi/fsi.fsproj - $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj - $(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj + $(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj + $(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj test: build $(DotNetExe) test -f netcoreapp2.1 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx" diff --git a/fsharp.proj b/fsharp.proj index d87b65ee597..59436e5a2e7 100644 --- a/fsharp.proj +++ b/fsharp.proj @@ -42,8 +42,8 @@ otherwise build it all --> - true - true + true + true @@ -80,8 +80,6 @@ TargetFramework=net46 - - @@ -101,6 +99,7 @@ + From 70c37c427c4dd86e1306a5714a3f8c1510117791 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 10:48:08 -0800 Subject: [PATCH 4/6] Detect framework --- build/targets/ConvertPortablePdbs.targets | 2 +- build/targets/NGenOrCrossGen.targets | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/targets/ConvertPortablePdbs.targets b/build/targets/ConvertPortablePdbs.targets index 8b4d4cd9e03..c43042a499e 100644 --- a/build/targets/ConvertPortablePdbs.targets +++ b/build/targets/ConvertPortablePdbs.targets @@ -9,7 +9,7 @@ Condition="'$(OS)' != 'Unix' AND Exists('$(TargetPath)') AND ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND - '$(TargetFrameworkIdentifier)' == '.NETFramework' AND + $(TargetFramework.StartsWith('net4')) AND '$(Configuration)' != 'Proto'"> $(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe diff --git a/build/targets/NGenOrCrossGen.targets b/build/targets/NGenOrCrossGen.targets index 9cac2b6573c..d5e4593a068 100644 --- a/build/targets/NGenOrCrossGen.targets +++ b/build/targets/NGenOrCrossGen.targets @@ -3,10 +3,10 @@ + Condition="'$(OS)' != 'Unix' AND + $(TargetFramework.StartsWith('net4')) AND + '$(NGenBinary)' == 'true' AND + Exists('$(TargetPath)') "> $(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe $(windir)\Microsoft.NET\Framework\v4.0.30319\ngen.exe From 4b33d3dec1823d6d570b34369573127092db07ab Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 11:39:38 -0800 Subject: [PATCH 5/6] Done --- build/targets/NGenOrCrossGen.targets | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build/targets/NGenOrCrossGen.targets b/build/targets/NGenOrCrossGen.targets index d5e4593a068..33dcaa3a63a 100644 --- a/build/targets/NGenOrCrossGen.targets +++ b/build/targets/NGenOrCrossGen.targets @@ -8,12 +8,18 @@ '$(NGenBinary)' == 'true' AND Exists('$(TargetPath)') "> - $(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe - $(windir)\Microsoft.NET\Framework\v4.0.30319\ngen.exe + $(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe + $(windir)\Microsoft.NET\Framework\v4.0.30319\ngen.exe - - + + + + + From b96e5ab3c2ed3651a8c8287d2d1018d6eb0de042 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 21 Dec 2018 12:54:33 -0800 Subject: [PATCH 6/6] feedback --- .gitignore | 70 ------------------------------------------------------ build.cmd | 3 +-- 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index e3afc57e2f7..28d53ff4e47 100644 --- a/.gitignore +++ b/.gitignore @@ -125,73 +125,3 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll msbuild.binlog /fcs/FSharp.Compiler.Service.netstandard/*.fs /fcs/FSharp.Compiler.Service.netstandard/*.fsi -/tests/TestResults/FSharp.Tests.FSharpSuite.net40.trx -/tests/TestResults/FSharp.Tests.FSharpSuite.coreclr.trx -/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx -/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx -/Tools/fslex/zh-Hant/FSharp.Core.resources.dll -/Tools/fslex/zh-Hant -/Tools/fslex/zh-Hans/FSharp.Core.resources.dll -/Tools/fslex/zh-Hans -/Tools/fslex/tr/FSharp.Core.resources.dll -/Tools/fslex/tr -/Tools/fslex/ru/FSharp.Core.resources.dll -/Tools/fslex/ru -/Tools/fslex/pt-BR/FSharp.Core.resources.dll -/Tools/fslex/pt-BR -/Tools/fslex/pl/FSharp.Core.resources.dll -/Tools/fslex/pl -/Tools/fslex/ko/FSharp.Core.resources.dll -/Tools/fslex/ko -/Tools/fslex/ja/FSharp.Core.resources.dll -/Tools/fslex/ja -/Tools/fslex/it/FSharp.Core.resources.dll -/Tools/fslex/it -/Tools/fslex/fr/FSharp.Core.resources.dll -/Tools/fslex/fr -/Tools/fslex/es/FSharp.Core.resources.dll -/Tools/fslex/es -/Tools/fslex/en/FSharp.Core.resources.dll -/Tools/fslex/en -/Tools/fslex/de/FSharp.Core.resources.dll -/Tools/fslex/de -/Tools/fslex/cs/FSharp.Core.resources.dll -/Tools/fslex/fslex.xml -/Tools/fslex/fslex.runtimeconfig.json -/Tools/fslex/fslex.pdb -/Tools/fslex/fslex.dll -/Tools/fslex/fslex.deps.json -/Tools/fslex/FSharp.Core.dll -/Tools/fsyacc/zh-Hant/FSharp.Core.resources.dll -/Tools/fsyacc/zh-Hant -/Tools/fsyacc/zh-Hans/FSharp.Core.resources.dll -/Tools/fsyacc/zh-Hans -/Tools/fsyacc/tr/FSharp.Core.resources.dll -/Tools/fsyacc/tr -/Tools/fsyacc/ru/FSharp.Core.resources.dll -/Tools/fsyacc/ru -/Tools/fsyacc/pt-BR/FSharp.Core.resources.dll -/Tools/fsyacc/pt-BR -/Tools/fsyacc/pl/FSharp.Core.resources.dll -/Tools/fsyacc/pl -/Tools/fsyacc/ko/FSharp.Core.resources.dll -/Tools/fsyacc/ko -/Tools/fsyacc/ja/FSharp.Core.resources.dll -/Tools/fsyacc/ja -/Tools/fsyacc/it/FSharp.Core.resources.dll -/Tools/fsyacc/it -/Tools/fsyacc/fr/FSharp.Core.resources.dll -/Tools/fsyacc/fr -/Tools/fsyacc/es/FSharp.Core.resources.dll -/Tools/fsyacc/es -/Tools/fsyacc/en/FSharp.Core.resources.dll -/Tools/fsyacc/en -/Tools/fsyacc/de/FSharp.Core.resources.dll -/Tools/fsyacc/de -/Tools/fsyacc/cs/FSharp.Core.resources.dll -/Tools/fsyacc/fsyacc.xml -/Tools/fsyacc/fsyacc.runtimeconfig.json -/Tools/fsyacc/fsyacc.pdb -/Tools/fsyacc/fsyacc.dll -/Tools/fsyacc/fsyacc.deps.json -/Tools/fsyacc/FSharp.Core.dll diff --git a/build.cmd b/build.cmd index 919a526b67e..2556b718f15 100644 --- a/build.cmd +++ b/build.cmd @@ -14,7 +14,7 @@ goto :ARGUMENTS_OK echo Build and run a subset of test suites echo. -echo Usage:` +echo Usage: echo. echo build.cmd ^ echo ^ @@ -1079,7 +1079,6 @@ REM ------ exit ------------------------------------- :failure endlocal @echo -@TIME /T >> TIME.LOG exit /b 1 :success