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

Commit87640b9

Browse files
authored
Merge pull requestdotnet#5593 from Microsoft/merges/master-to-dev16.0
Merge master to dev16.0
2 parents0f27925 +48a5e38 commit87640b9

File tree

72 files changed

+730
-561
lines changed

Some content is hidden

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

72 files changed

+730
-561
lines changed

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2-
@if"%_echo%"==""echooff
2+
@if"%_echo%"==""echooff
33

44
setlocalenableDelayedExpansion
55

‎build/targets/AssemblyVersions.props‎

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

24-
<FSCoreVersion>4.5.0.0</FSCoreVersion>
2524
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
26-
<FSCorePackageVersion>4.5.3</FSCorePackageVersion>
27-
<FSProductVersion>10.2.3.0</FSProductVersion>
28-
<FSPackageVersion>10.2.3</FSPackageVersion>
25+
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
26+
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
27+
2928
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
29+
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
30+
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3031

3132
<VSMajorVersion>16</VSMajorVersion>
3233
<VSMinorVersion>0</VSMinorVersion>

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
2222

2323
<!-- Microsoft Build packages-->
24-
<MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
24+
<MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
2525
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
2626
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
2727
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>

‎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
@@ -30,6 +30,7 @@
3030
<ReferenceInclude="System.Runtime" />
3131
<ReferenceInclude="System.IO" />
3232
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
33+
<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">
3536
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2929
<Private>false</Private>
3030
</Reference>
31-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
31+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3232
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3333
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3434
<Private>false</Private>

‎fcs/FSharp.Compiler.Service.Tests/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<runtime>
44
<legacyUnhandledExceptionPolicyenabled="true" />
55
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
8+
<bindingRedirectoldVersion="2.0.0.0-4.5.0.0"newVersion="4.5.0.0"/>
9+
</dependentAssembly>
610
</assemblyBinding>
711
</runtime>
812
<startup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
</ItemGroup>
7575
<ItemGroup>
7676
<PackageReferenceUpdate="FSharp.Core"Version="4.1.19" />
77+
<PackageReferenceInclude="FSharp.Core"Version="4.2.3" />
7778
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="15.6.0" />
7879
<PackageReferenceInclude="NUnit"Version="3.9.0" />
7980
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.9.0" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@
636636
</ItemGroup>
637637
<ItemGroup>
638638
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
639+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
639640
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
640641
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
641642
</ItemGroup>

‎packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<packageid="Microsoft.Build.Utilities.Core"version="14.3.0" />
2626
<packageid="Microsoft.Build.Tasks.Core"version="14.3.0" />
2727

28-
<packageid="Microsoft.Build"version="15.6.85" />
29-
<packageid="Microsoft.Build.Framework"version="15.6.85" />
30-
<packageid="Microsoft.Build.Utilities.Core"version="15.6.85" />
31-
<packageid="Microsoft.Build.Tasks.Core"version="15.6.85" />
28+
<packageid="Microsoft.Build"version="15.8.166" />
29+
<packageid="Microsoft.Build.Framework"version="15.8.166" />
30+
<packageid="Microsoft.Build.Utilities.Core"version="15.8.166" />
31+
<packageid="Microsoft.Build.Tasks.Core"version="15.8.166" />
3232
<packageid="System.IO.Compression"version="4.3.0" />
3333

3434
<!-- Testing-->

0 commit comments

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