Skip to content

Merge dev15.7 to dev15.8 #4614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettfo merged 22 commits into from
Mar 23, 2018
Merged

Merge dev15.7 to dev15.8 #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
24b7c0a
Merge branch 'build-in-vs' of https://github.com/brettfo/visualfsharp
dsyme Mar 15, 2018
eb87631
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Mar 16, 2018
9e2e058
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Mar 16, 2018
e452a46
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Mar 19, 2018
2ad2627
Update dev build to include old and new system.valuetuple (#4589)
KevinRansom Mar 21, 2018
bcc94d5
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Mar 21, 2018
c86fbdc
textual cleanup (#4593)
dsyme Mar 21, 2018
a8d21e5
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Mar 21, 2018
639583a
don't allow < or > in .nuspec files (#4592)
brettfo Mar 21, 2018
08bfa00
Nightlies need this too
Mar 21, 2018
2c6e3b6
hide representations in Abstract IL
dsyme Mar 21, 2018
b606cb5
hide representations in Abstract IL
dsyme Mar 21, 2018
92e6d6a
remove FSharp.LanguageService.Base dependency (#4588)
majocha Mar 22, 2018
176d669
issue# 4591 - Resx files are not working for fsharp project (#4595)
KevinRansom Mar 22, 2018
3273ed0
Merge pull request #4596 from dsyme/caches4
dsyme Mar 22, 2018
75e435e
Use Roslyn for backing metadata bytes in VS (#4586)
dsyme Mar 22, 2018
b6dfbb6
Reduce resident memory for VS tokenization and other caches (#4590)
dsyme Mar 22, 2018
57a588a
Merge pull request #4599 from Microsoft/merges/master-to-dev15.7
KevinRansom Mar 22, 2018
9646a1d
add System.ValueTuple.4.3.1.nupkg and PatternMatcher.dll to the sign …
brettfo Mar 22, 2018
2a206f9
Read/store ILCustomAttrs, ILSecurityDecls, ILTypeDef sensibly (#4597)
dsyme Mar 22, 2018
65d87f0
Merge pull request #4609 from brettfo/sign-fix
brettfo Mar 22, 2018
d966d6d
Merge pull request #4613 from Microsoft/master
brettfo Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions VisualFSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj", "{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PatternMatcher", "vsintegration\src\PatternMatcher\PatternMatcher.csproj", "{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -554,6 +556,14 @@ Global
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.Build.0 = Release|Any CPU
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.ActiveCfg = Release|Any CPU
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.Build.0 = Release|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.ActiveCfg = Debug|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.Build.0 = Debug|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.Build.0 = Release|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.ActiveCfg = Release|Any CPU
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -617,6 +627,7 @@ Global
{0385564F-07B4-4264-AB8A-17C393E9140C} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
{400FAB03-786E-40CC-85A8-04B0C2869B14} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{18227628-DF90-4C47-AF3D-CC72D2EDD986} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}
Expand Down
2 changes: 1 addition & 1 deletion build-everything.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++ -->

<ItemGroup Condition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
<ItemGroup Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
<ProjectsWithNet40 Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
<ProjectsWithNet40 Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
</ItemGroup>
Expand Down
37 changes: 25 additions & 12 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ if /i "%ARG%" == "microbuild" (
set BUILD_VS=1
set BUILD_SETUP=%FSC_BUILD_SETUP%
set BUILD_NUGET=1
set BUILD_MICROBUILD=1

set TEST_NET40_COMPILERUNIT_SUITE=1
set TEST_NET40_COREUNIT_SUITE=1
Expand Down Expand Up @@ -478,6 +479,7 @@ echo BUILD_SETUP=%BUILD_SETUP%
echo BUILD_NUGET=%BUILD_NUGET%
echo BUILD_CONFIG=%BUILD_CONFIG%
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
echo BUILD_MICROBUILD=%BUILD_MICROBUILD%
echo.
echo PB_SKIPTESTS=%PB_SKIPTESTS%
echo PB_RESTORESOURCE=%PB_RESTORESOURCE%
Expand Down Expand Up @@ -864,7 +866,7 @@ echo SNEXE32: %SNEXE32%
echo SNEXE64: %SNEXE64%
echo

if "%TEST_NET40_COMPILERUNIT_SUITE%" == "0" if "%TEST_FCS%" == "0" if "%TEST_NET40_COREUNIT_SUITE%" == "0" if "%TEST_CORECLR_COREUNIT_SUITE%" == "0" if "%TEST_VS_IDEUNIT_SUITE%" == "0" if "%TEST_NET40_FSHARP_SUITE%" == "0" if "%TEST_NET40_FSHARPQA_SUITE%" == "0" goto :success
if "%TEST_NET40_COMPILERUNIT_SUITE%" == "0" if "%TEST_FCS%" == "0" if "%TEST_NET40_COREUNIT_SUITE%" == "0" if "TEST_CORECLR_FSHARP_SUITE" == "0" if "%TEST_CORECLR_COREUNIT_SUITE%" == "0" if "%TEST_VS_IDEUNIT_SUITE%" == "0" if "%TEST_NET40_FSHARP_SUITE%" == "0" if "%TEST_NET40_FSHARPQA_SUITE%" == "0" goto :success

if "%no_test%" == "1" goto :success

Expand Down Expand Up @@ -1019,38 +1021,49 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
echo -----------------------------------------------------------------
goto :failure
)
)

REM ---------------- net40-coreunit -----------------------

if "%TEST_NET40_COREUNIT_SUITE%" == "1" (

set OUTPUTARG=
set ERRORARG=
set OUTPUTFILE=
set ERRORFILE=
set XMLFILE=!RESULTSDIR!\test-net40-coreunit-results.xml
set XMLFILE=!RESULTSDIR!\test-net40-buildunit-results.xml
if "%CI%" == "1" (
set ERRORFILE=!RESULTSDIR!\test-net40-coreunit-errors.log
set OUTPUTFILE=!RESULTSDIR!\test-net40-coreunit-output.log
set OUTPUTFILE=!RESULTSDIR!\test-net40-buildunit-output.log
set ERRORFILE=!RESULTSDIR!\test-net40-buildunit-errors.log
set ERRORARG=--err:"!ERRORFILE!"
set OUTPUTARG=--output:"!OUTPUTFILE!"
)

set ERRORFILE=!RESULTSDIR!\test-net40-buildunit-errors.log
echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.UnitTests.dll" !WHERE_ARG_NUNIT!
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.UnitTests.dll" !WHERE_ARG_NUNIT!


if errorlevel 1 (
echo -----------------------------------------------------------------
type "!OUTPUTFILE!"
echo -----------------------------------------------------------------
type "!ERRORFILE!"
echo -----------------------------------------------------------------
echo Error: Running tests net40-coreunit failed, see logs above -- FAILED
echo Error: Running tests net40-compilernit failed, see logs above -- FAILED
echo -----------------------------------------------------------------
goto :failure
)
)

REM ---------------- net40-coreunit -----------------------

if "%TEST_NET40_COREUNIT_SUITE%" == "1" (

set OUTPUTARG=
set ERRORARG=
set OUTPUTFILE=
set ERRORFILE=
set XMLFILE=!RESULTSDIR!\test-net40-coreunit-results.xml
if "%CI%" == "1" (
set ERRORFILE=!RESULTSDIR!\test-net40-coreunit-errors.log
set OUTPUTFILE=!RESULTSDIR!\test-net40-coreunit-output.log
set ERRORARG=--err:"!ERRORFILE!"
set OUTPUTARG=--output:"!OUTPUTFILE!"
)

echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.UnitTests.dll" !WHERE_ARG_NUNIT!
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.UnitTests.dll" !WHERE_ARG_NUNIT!
Expand Down
4 changes: 3 additions & 1 deletion build/config/AssemblySignToolData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
"net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
"net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
"net40\\bin\\PatternMatcher.dll",
"coreclr\\bin\\FSharp.Core.dll",
"coreclr\\bin\\*\\FSharp.Core.resources.dll",
"coreclr\\bin\\FSharp.Build.dll",
Expand Down Expand Up @@ -65,9 +66,10 @@
"Microsoft.DiaSymReader.dll",
"Microsoft.DiaSymReader.PortablePdb.dll",
"Newtonsoft.Json.dll",
"System.ValueTuple.4.4.0.nupkg",
"System.Collections.Immutable.dll",
"System.Reflection.Metadata.dll",
"System.ValueTuple.4.3.1.nupkg",
"System.ValueTuple.4.4.0.nupkg",
"System.ValueTuple.dll"
]
}
2 changes: 1 addition & 1 deletion fcs/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let isMono = false
// Utilities
// --------------------------------------------------------------------------------------

let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.4"
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.100"

let runDotnet workingDir args =
let result =
Expand Down
1 change: 1 addition & 0 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<package id="System.Reflection.Metadata" version="1.4.2" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.2.0" />
<package id="Microsoft.DiaSymReader" version="1.1.0" />
<package id="System.ValueTuple" version="4.3.1" />
<package id="System.ValueTuple" version="4.4.0" />
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
<package id="Microsoft.Build" version="14.3.0" />
Expand Down
Loading