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

Commit70f5405

Browse files
authored
Merge branch 'dev16.0' into merges/master-to-dev16.0
2 parents2277eb2 +33e957b commit70f5405

File tree

125 files changed

+898
-935
lines changed

Some content is hidden

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

125 files changed

+898
-935
lines changed

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.0-beta8-63208-01
1+
2.11.0-beta1-63431-08

‎build.cmd‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,8 @@ REM ---------------- test-net40-fsharp -----------------------
800800
if"%TEST_NET40_FSHARP_SUITE%"=="1" (
801801

802802
setLOGFILE=%~dp0tests\TestResults\FSharp.Tests.FSharpSuite.net40.trx
803-
echo"%_dotnetexe%" test"%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
804-
"%_dotnetexe%" test"%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
803+
echo"%_dotnetexe%" test"%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
804+
"%_dotnetexe%" test"%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
805805

806806
iferrorlevel1 (
807807
echo --------------------------------------------------------------
@@ -816,8 +816,8 @@ REM ---------------- test-fcs -----------------------
816816
if"%TEST_FCS%"=="1" (
817817

818818
setLOGFILE=%~dp0tests\TestResults\FSharp.Compiler.Service.Tests.net40.trx
819-
echo"%_dotnetexe%" test"%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
820-
"%_dotnetexe%" test"%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
819+
echo"%_dotnetexe%" test"%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
820+
"%_dotnetexe%" test"%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
821821

822822
iferrorlevel1 (
823823
echo --------------------------------------------------------------
@@ -896,8 +896,8 @@ REM ---------------- net40-compilerunit -----------------------
896896
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="1" (
897897

898898
setLOGFILE=%~dp0tests\TestResults\FSharp.Compiler.UnitTests.net40.trx
899-
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
900-
"%_dotnetexe%" test"%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
899+
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
900+
"%_dotnetexe%" test"%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
901901

902902
iferrorlevel1 (
903903
echo -----------------------------------------------------------------
@@ -907,8 +907,8 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
907907
)
908908

909909
setLOGFILE=%~dp0tests\TestResults\FSharp.Build.UnitTests.net40.trx
910-
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
911-
"%_dotnetexe%" test"%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
910+
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
911+
"%_dotnetexe%" test"%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
912912

913913
iferrorlevel1 (
914914
echo -----------------------------------------------------------------
@@ -923,8 +923,8 @@ REM ---------------- net40-coreunit -----------------------
923923
if"%TEST_NET40_COREUNIT_SUITE%"=="1" (
924924

925925
setLOGFILE=%~dp0tests\TestResults\FSharp.Core.UnitTests.net40.trx
926-
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
927-
"%_dotnetexe%" test"%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
926+
echo"%_dotnetexe%" test"%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
927+
"%_dotnetexe%" test"%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
928928

929929
iferrorlevel1 (
930930
echo -----------------------------------------------------------------
@@ -980,8 +980,8 @@ REM ---------------- vs-ideunit -----------------------
980980

981981
if"%TEST_VS_IDEUNIT_SUITE%"=="1" (
982982
setLOGFILE=%~dp0tests\TestResults\GetTypesVSUnitTests.net40.trx
983-
echo"%_dotnetexe%" test"%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
984-
"%_dotnetexe%" test"%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!"
983+
echo"%_dotnetexe%" test"%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
984+
"%_dotnetexe%" test"%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!"
985985

986986
iferrorlevel1 (
987987
echo ---------------------------------------------------------------------------
@@ -991,8 +991,8 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
991991
)
992992

993993
setLOGFILE=%~dp0tests\TestResults\VisualFSharp.UnitTests.net40.trx
994-
echo"%_dotnetexe%" test"%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
995-
"%_dotnetexe%" test"%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet46 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
994+
echo"%_dotnetexe%" test"%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
995+
"%_dotnetexe%" test"%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c%BUILD_CONFIG% -fnet472 -l"trx;LogFileName=!LOGFILE!" -o"%~dp0%BUILD_CONFIG%\net40\bin"
996996
iferrorlevel1 (
997997
echo ------------------------------------------------------------
998998
echo Error: Running tests vs-ideunit failed, see file `!LOGFILE!`

‎build/targets/AssemblyVersions.props‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2222
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2323

24-
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
25-
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
24+
<FSCoreMajorVersion>4.6</FSCoreMajorVersion>
25+
<FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
2626
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
2727

28-
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
29-
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
28+
<FSPackageMajorVersion>10.4</FSPackageMajorVersion>
29+
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
3030
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3131

32-
<VSMajorVersion>15</VSMajorVersion>
33-
<VSMinorVersion>8</VSMinorVersion>
32+
<VSMajorVersion>16</VSMajorVersion>
33+
<VSMinorVersion>0</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>
3636

@@ -57,4 +57,7 @@
5757
<TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">
5858
</Target>
5959

60+
<TargetName="GetVSGeneralVersion"Outputs="$(VSGeneralVersion)">
61+
</Target>
62+
6063
</Project>

‎build/targets/PackageVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
https://api.nuget.org/v3/index.json;
1414
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
1515
https://dotnet.myget.org/F/symreader-converter/api/v3/index.json;
16+
https://myget.org/F/roslyn_concord/api/v3/index.json;
17+
https://vside.myget.org/F/devcore/api/v3/index.json;
1618
</RestoreSources>
1719

1820
<!-- synchronized build package sources-->
@@ -25,6 +27,7 @@
2527
<!-- System.* packages-->
2628
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
2729
<SystemConsolePackageVersion>4.3.0</SystemConsolePackageVersion>
30+
<SystemDesignPackageVersion>4.0.0</SystemDesignPackageVersion>
2831
<SystemDiagnosticsProcessPackageVersion>4.3.0</SystemDiagnosticsProcessPackageVersion>
2932
<SystemDiagnosticsTraceSourcePackageVersion>4.3.0</SystemDiagnosticsTraceSourcePackageVersion>
3033
<SystemIoCompressionPackageVersion>4.3.0</SystemIoCompressionPackageVersion>
@@ -79,6 +82,7 @@
7982
<MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion>
8083
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
8184
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
85+
<MicrosoftVisualStudioProjectSystemVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemVersion>
8286
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
8387
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
8488
<MicrosoftVisualStudioShell150PackageVersion>15.0.26201</MicrosoftVisualStudioShell150PackageVersion>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<ReferenceInclude="System.Runtime" />
3131
<ReferenceInclude="System.IO" />
3232
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
33+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
34+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3335
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3436
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3537
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<ReferenceInclude="System.Runtime" />
3333
<ReferenceInclude="System.IO" />
3434
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
35+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
36+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3537
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3638
</ItemGroup>
3739
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyGroup>
88
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
10+
<DefaultFSharpPackageVersion>4.1.19</DefaultFSharpPackageVersion>
1011
<NoWarn>$(NoWarn);44;75;</NoWarn>
1112
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1213
<GenerateDocumentationFile>true</GenerateDocumentationFile>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636
</Compile>
637637
</ItemGroup>
638638
<ItemGroup>
639-
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
639+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
640640
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
641641
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
642642
</ItemGroup>

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
16+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1617
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1718
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
1819
</ItemGroup>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<ItemGroup>
1616
<ReferenceInclude="System.Runtime.Remoting" />
1717
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
18+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1819
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1920
</ItemGroup>
2021
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">

0 commit comments

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