Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit52f911b

Browse files
authored
Merge pull request #3898 from Microsoft/merges/master-to-dev15.6-20171107-080045
Merge master to dev15.6
2 parents8a96a49 +e0933b4 commit52f911b

File tree

84 files changed

+347
-1290
lines changed

Some content is hidden

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

84 files changed

+347
-1290
lines changed

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-preview2-006502
1+
2.0.3-servicing-007056

‎build.cmd‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ echo BUILD_CONFIG=%BUILD_CONFIG%
420420
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
421421
echo.
422422
echo PB_SKIPTESTS=%PB_SKIPTESTS%
423+
echo PB_RESTORESOURCE=%PB_RESTORESOURCE%
423424
echo.
424425
echo TEST_NET40_COMPILERUNIT_SUITE=%TEST_NET40_COMPILERUNIT_SUITE%
425426
echo TEST_NET40_COREUNIT_SUITE=%TEST_NET40_COREUNIT_SUITE%
@@ -493,7 +494,43 @@ if "%RestorePackages%"=="" (
493494

494495
@call src\update.cmd signonly
495496

496-
set_msbuildexe=%~dp0packages\RoslynTools.MSBuild.0.4.0-alpha\tools\msbuild\MSBuild.exe
497+
:: Check prerequisites
498+
ifnot"%VisualStudioVersion%"==""goto vsversionset
499+
ifexist"%VS150COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=15.0
500+
ifnot"%VisualStudioVersion%"==""goto vsversionset
501+
502+
ifnot"%VisualStudioVersion%"==""goto vsversionset
503+
ifexist"%VS150COMNTOOLS%\..\..\ide\devenv.exe"setVisualStudioVersion=15.0
504+
ifnot"%VisualStudioVersion%"==""goto vsversionset
505+
506+
ifexist"%VS140COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=14.0
507+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
508+
ifexist"%ProgramFiles%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
509+
ifnot"%VisualStudioVersion%"==""goto vsversionset
510+
511+
ifexist"%VS120COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=12.0
512+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
513+
ifexist"%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
514+
515+
:vsversionset
516+
if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure
517+
518+
ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (
519+
set_msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"
520+
goto :havemsbuild
521+
)
522+
ifexist"%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
523+
set_msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
524+
goto :havemsbuild
525+
)
526+
ifexist"%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (
527+
set_msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
528+
goto :havemsbuild
529+
)
530+
echo Error: Could not find MSBuild.exe.&&goto :failure
531+
goto :eof
532+
533+
:havemsbuild
497534
set_nrswitch=/nr:false
498535

499536
:: See <http://www.appveyor.com/docs/environment-variables>
@@ -527,18 +564,24 @@ if "%RestorePackages%" == "true" (
527564
cd..
528565
@if ERRORLEVEL1echo Error: Paket restore failed&&goto :failure
529566

530-
%_ngenexe% install%_nugetexe% /nologo
567+
%_ngenexe% install%_nugetexe% /nologo
568+
set_nugetoptions=-PackagesDirectory packages -ConfigFile%_nugetconfig%
569+
ifnot"%PB_RESTORESOURCE%"=="" (
570+
set_nugetoptions=!_nugetoptions! -Source%PB_RESTORESOURCE%
571+
)
572+
573+
echo _nugetoptions=!_nugetoptions!
531574

532-
%_nugetexe% restore packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%
575+
%_nugetexe% restore packages.config!_nugetoptions!
533576
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
534577

535578
if"%BUILD_VS%"=="1" (
536-
%_nugetexe% restore vsintegration\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%
579+
%_nugetexe% restore vsintegration\packages.config!_nugetoptions!
537580
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
538581
)
539582

540583
if"%BUILD_SETUP%"=="1" (
541-
%_nugetexe% restore setup\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%
584+
%_nugetexe% restore setup\packages.config!_nugetoptions!
542585
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
543586
)
544587
)

‎build.sh‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ printf "BUILD_CONFIG=%s\n" "$BUILD_CONFIG"
389389
printf"BUILD_PUBLICSIGN=%s\n""$BUILD_PUBLICSIGN"
390390
printf"\n"
391391
printf"PB_SKIPTESTS=%s\n""$PB_SKIPTESTS"
392+
printf"PB_RESTORESOURCE=%s\n""$PB_RESTORESOURCE"
393+
printf"\n"
392394
printf"TEST_NET40_COMPILERUNIT_SUITE=%s\n""$TEST_NET40_COMPILERUNIT_SUITE"
393395
printf"TEST_NET40_COREUNIT_SUITE=%s\n""$TEST_NET40_COREUNIT_SUITE"
394396
printf"TEST_NET40_FSHARP_SUITE=%s\n""$TEST_NET40_FSHARP_SUITE"
@@ -441,21 +443,26 @@ if [ "${RestorePackages:-true}" = 'true' ]; then
441443
if [$exit_code-ne 0 ];then
442444
exit$exit_code
443445
fi
444-
445-
eval"$_nugetexe restore packages.config -PackagesDirectory packages -ConfigFile$_nugetconfig"
446+
447+
_nugetoptions="-PackagesDirectory packages -ConfigFile$_nugetconfig"
448+
if ["$PB_RESTORESOURCE"!="" ];then
449+
_nugetoptions="$_nugetoptions -Source$PB_RESTORESOURCE"
450+
fi
451+
452+
eval"$_nugetexe restore packages.config$_nugetoptions"
446453
if [$?-ne 0 ];then
447454
failwith"Nuget restore failed"
448455
fi
449456

450457
if ["$BUILD_VS"='1' ];then
451-
eval"$_nugetexe restore vsintegration/packages.config-PackagesDirectory packages -ConfigFile$_nugetconfig"
458+
eval"$_nugetexe restore vsintegration/packages.config$_nugetoptions"
452459
if [$?-ne 0 ];then
453460
failwith"Nuget restore failed"
454461
fi
455462
fi
456463

457464
if ["$BUILD_SETUP"='1' ];then
458-
eval"$_nugetexe restore setup/packages.config-PackagesDirectory packages -ConfigFile$_nugetconfig"
465+
eval"$_nugetexe restore setup/packages.config$_nugetoptions"
459466
if [$?-ne 0 ];then
460467
failwith"Nuget restore failed"
461468
fi

‎fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@
652652
</Compile>
653653
</ItemGroup>
654654
<ItemGroup>
655-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.0" />
655+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.4.0" />
656656
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />
657657
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.0.0" />
658658
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,16 +635,16 @@
635635
<ReferenceInclude="System.Numerics" />
636636
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
637637
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
638-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
638+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
639639
</Reference>
640640
<ReferenceInclude="Microsoft.DiaSymReader">
641641
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
642642
</Reference>
643643
<ReferenceInclude="System.Reflection.Metadata">
644-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
644+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
645645
</Reference>
646646
<ReferenceInclude="System.Collections.Immutable">
647-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
647+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
648648
</Reference>
649649
<ReferenceInclude="System.ValueTuple">
650650
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/nuget/FSharp.Compiler.Service.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<grouptargetFramework="net45">
17-
<dependencyid="System.Collections.Immutable"version="1.3.1" />
17+
<dependencyid="System.Collections.Immutable"version="1.4.0" />
1818
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
1919
</group>
2020
</dependencies>

‎packages.config‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
<!-- Build infrastructure-->
1111
<packageid="MicroBuild.Core"version="0.2.0" />
1212
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
13-
<packageid="RoslynTools.MSBuild"version="0.4.0-alpha" />
1413

1514
<!-- For the internal orchestrated build. This version should be kept in sync with `PublishToBlob.proj`-->
1615
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />
1716

1817
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
19-
<packageid="System.Collections.Immutable"version="1.3.1" />
20-
<packageid="System.Reflection.Metadata"version="1.4.2" />
21-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
18+
<packageid="System.Collections.Immutable"version="1.4.0" />
19+
<packageid="System.Reflection.Metadata"version="1.5.0" />
20+
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2221
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
2322
<packageid="System.ValueTuple"version="4.3.1" />
2423
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
@@ -33,7 +32,7 @@
3332
<packageid="BenchmarkDotNet.Diagnostics.Windows"version="0.9.8"/>
3433
<packageid="Newtonsoft.Json"version="8.0.1"/>
3534
<packageid="Microsoft.FSharp.TupleSample"version="1.0.0-alpha-161121"/>
36-
<packageid="Microsoft.VSSDK.BuildTools"version="15.0.26201" />
35+
<packageid="Microsoft.VSSDK.BuildTools"version="15.5.72" />
3736

3837
<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute-->
3938
<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools-->

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@
171171
</Component>
172172

173173
<ComponentId="Compiler_Redist_System.Collections.Immutable.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Collections.Immutable.dll, $(var.LocaleCode)))">
174-
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.3.1\lib\netstandard1.0\System.Collections.Immutable.dll" />
174+
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.4.0\lib\netstandard1.0\System.Collections.Immutable.dll" />
175175
</Component>
176176

177177
<ComponentId="Compiler_Redist_System.Reflection.Metadata.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">
178-
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\netstandard1.1\System.Reflection.Metadata.dll" />
178+
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.5.0\lib\netstandard1.1\System.Reflection.Metadata.dll" />
179179
</Component>
180180

181181
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">
182-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
182+
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
183183
</Component>
184184

185185
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.dll, $(var.LocaleCode)))">
186-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.0.8\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
186+
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
187187
</Component>
188188

189189
<ComponentId="Compiler_Redist_System.ValueTuple.dll"Guid="$(fsharp.guid(Compiler_Redist_System.ValueTuple.dll, $(var.LocaleCode)))">

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplate
1818
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library1.fs"
1919
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\Script.fsx"
2020

21-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCore259Project"
22-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore259Project\AssemblyInfo.fs"
23-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\NETCore259PortableLibrary.vstemplate"
24-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\PortableLibrary.fsproj"
25-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\PortableLibrary1.fs"
26-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore259Project\Script.fsx"
27-
28-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCore78Project"
29-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore78Project\AssemblyInfo.fs"
30-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\NETCore78PortableLibrary.vstemplate"
31-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\PortableLibrary.fsproj"
32-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\PortableLibrary1.fs"
33-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore78Project\Script.fsx"
34-
35-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCoreProject"
36-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCoreProject\AssemblyInfo.fs"
37-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\NETCore7PortableLibrary.vstemplate"
38-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\PortableLibrary.fsproj"
39-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\PortableLibrary1.fs"
40-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCoreProject\Script.fsx"
41-
42-
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\PortableLibraryProject"
43-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\PortableLibraryProject\AssemblyInfo.fs"
44-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary.fsproj"
45-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary.vstemplate"
46-
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary1.fs"
47-
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\PortableLibraryProject\Script.fsx"
48-
4921
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject"
5022
file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.fsproj"
5123
file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\TutorialProject\Tutorial.fsx"

‎setup/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="System.Collections.Immutable"version="1.3.1" />
4-
<packageid="System.Reflection.Metadata"version="1.4.1-beta-24227-04" />
5-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
6-
<packageid="Microsoft.DiaSymReader"version="1.0.8" />
3+
<packageid="System.Collections.Immutable"version="1.4.0" />
4+
<packageid="System.Reflection.Metadata"version="1.5.0" />
5+
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
6+
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
77
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
88
<packageid="MicroBuild.Core"version="0.2.0" />
99
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp