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

Commitf5d8131

Browse files
authored
Merge branch 'dev16.0' into merges/master-to-dev16.0
2 parentsfb9f425 +de26777 commitf5d8131

File tree

116 files changed

+1542
-291
lines changed

Some content is hidden

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

116 files changed

+1542
-291
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-63119-03

‎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: 2 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-->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<ItemGroup>
3030
<ReferenceInclude="System.Runtime" />
3131
<ReferenceInclude="System.IO" />
32+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
3233
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3334
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3435
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<ItemGroup>
3232
<ReferenceInclude="System.Runtime" />
3333
<ReferenceInclude="System.IO" />
34+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
3435
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3536
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3637
</ItemGroup>

‎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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<NoneInclude="App.config" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
15+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1616
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1717
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
1818
</ItemGroup>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ReferenceInclude="System.Runtime.Remoting" />
17-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
17+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1818
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1919
</ItemGroup>
2020
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">

‎fcs/samples/FsiExe/FsiExe.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ReferenceInclude="System.Runtime.Remoting" />
1818
<ReferenceInclude="System.Windows.Forms" />
19-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
19+
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
2020
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2121
</ItemGroup>
2222
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">

0 commit comments

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