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

Commit30e1904

Browse files
authored
Merge branch 'dev16.0' into merges/master-to-dev16.0
2 parentsf2de3ba +24c0cac commit30e1904

File tree

512 files changed

+2560
-1463
lines changed

Some content is hidden

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

512 files changed

+2560
-1463
lines changed

‎NuGet.Config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1818
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1919
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
20+
<addkey="myget.org roslyn-concord"value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
21+
<addkey="myget.org vside"value="https://vside.myget.org/F/devcore/api/v3/index.json" />
2022
</packageSources>
2123

2224
</configuration>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,8 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se
611611
:vsversionset
612612
if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure
613613

614-
ifexist"%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (
615-
set_msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"
614+
ifexist"%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" (
615+
set_msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe"
616616
goto :havemsbuild
617617
)
618618
ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (

‎build/targets/AssemblyVersions.props‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
2626
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
2727

28-
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
29-
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
28+
<FSPackageMajorVersion>10.3</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

@@ -65,4 +65,7 @@
6565
<TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">
6666
</Target>
6767

68+
<TargetName="GetVSGeneralVersion"Outputs="$(VSGeneralVersion)">
69+
</Target>
70+
6871
</Project>

‎build/targets/PackageVersions.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
<!-- System.* packages-->
99
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
10+
<SystemDesignPackageVersion>4.0.0</SystemDesignPackageVersion>
1011
<SystemIoCompressionPackageVersion>4.3.0</SystemIoCompressionPackageVersion>
11-
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
1212
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
13+
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
1314
<SystemValueTuplePackageVersion>4.3.0</SystemValueTuplePackageVersion>
1415

1516
<!-- Roslyn packages-->
@@ -42,6 +43,7 @@
4243
<MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion>
4344
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
4445
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
46+
<MicrosoftVisualStudioProjectSystemVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemVersion>
4547
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
4648
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
4749
<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
@@ -635,7 +635,7 @@
635635
</Compile>
636636
</ItemGroup>
637637
<ItemGroup>
638-
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
638+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
639639
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
640640
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
641641
</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>

0 commit comments

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