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

Commit11ee1bd

Browse files
authored
Merge pull requestdotnet#4504 from Microsoft/merges/master-to-dev15.7
Merge master to dev15.7
2 parentsce5bb8d +ac9f2af commit11ee1bd

File tree

6 files changed

+35
-8
lines changed

6 files changed

+35
-8
lines changed

‎DEVGUIDE.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Install
1515
-[.NET 4.6](https://www.microsoft.com/en-gb/download/details.aspx?id=48130)
1616

1717
**NOTE on Windows:**
18-
1. It is recommended to run the build.cmd and the qualifiersbelow on a command prompt with path set to have the location of MSBuild. If you have Visual Studio, we can also run using`Developer Command Prompt for Visual Studio 20xx` (depends on Visual Studio version). This developer command prompt is easier to use than normal command prompt, because it already has the correct path of Visual Studio and .NET's tooling set for us to use (including MSBuild).
18+
1. It is recommended to run the build.cmd and the qualifiersbe on a command prompt with path set to have the location of MSBuild. If you have Visual Studio, we can also run using`Developer Command Prompt for Visual Studio 20xx` (depends on Visual Studio version). This developer command prompt is easier to use than normal command prompt, because it already has the correct path of Visual Studio and .NET's tooling set for us to use (including MSBuild).
1919
2. The running command prompt must be run under Administrator right (`Run as Administrator`).
2020

2121
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
@@ -213,6 +213,13 @@ For **Release**:
213213
- We use the proto compiler to compile the source for`FSharp.Core.dll` in this distribution.
214214
- We use the proto compiler to compile the source for`FSharp.Compiler.dll`,`fsc.exe`,`fsi.exe`, and other binaries found in this distribution.
215215

216+
####Updating FSComp.fs
217+
218+
If you change error messages you may need to update FSComp.fs in`src\buildfromsource\FSharp.Compiler.Private`.
219+
220+
To do this, build the non-buildfromsource version of FSharp.Compiler.Private (src\fsharp\FSharp.Compiler.Private) then check its obj\ directory for`FSComp.fs` and manually copy that into the buildfromsource directory.
221+
222+
216223
####Configuring proxy server
217224

218225
If you are behind a proxy server, NuGet client tool must be configured to use it:

‎FSharp.Directory.Build.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
<!-- nuget-->
1717
<PropertyGroup>
1818
<!-- default NuGet package restore location-->
19-
<NugetPackageRootCondition="'$(NugetPackageRoot)' == ''">$(UserProfile)\.nuget\packages\</NugetPackageRoot>
19+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
21+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
22+
<!-- ensure there is a trailing slash-->
23+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
24+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
2025
</PropertyGroup>
2126

2227
<!-- signing-->

‎setup/FSharp.Setup.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
<NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>
1111
</PropertyGroup>
1212

13+
<ImportProject="$(MSBuildThisFileDirectory)..\build\targets\AssemblyVersions.props" />
14+
1315
<PropertyGroup>
14-
<!-- This number should bekept in sync with the expected shipping version of Visual Studio.-->
15-
<FSharpProductVersion>15.7</FSharpProductVersion>
16+
<!-- This number shouldonlybetwo parts, e.g., '15.6'.-->
17+
<FSharpProductVersion>$(VSAssemblyVersion.Split('.')[0]).$(VSAssemblyVersion.Split('.')[1])</FSharpProductVersion>
1618
<!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build-->
1719
<BUILD_BUILDNUMBERCondition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
1820
<!-- Remove .DRAFT suffix if it exists in the build number-->

‎src/fsharp/FSharp.Core/prim-types.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -961,11 +961,11 @@ namespace Microsoft.FSharp.Core
961961
letc= int64Order lenx1 leny1
962962
if c<>0then celse
963963
letbasex0= int64(x.GetLowerBound(0))
964-
letbasex1= int64(x.GetLowerBound(1))
965964
letbasey0= int64(y.GetLowerBound(0))
966-
letbasey1= int64(y.GetLowerBound(1))
967965
letc= int64Order basex0 basey0
968966
if c<>0then celse
967+
letbasex1= int64(x.GetLowerBound(1))
968+
letbasey1= int64(y.GetLowerBound(1))
969969
letc= int64Order basex1 basey1
970970
if c<>0then celse
971971
let reccheck0 i=
@@ -4167,7 +4167,7 @@ namespace Microsoft.FSharp.Core
41674167
else(#"ceq" e1 e1: int #)
41684168
when^T: float32=if(#"clt" e1 e2: bool #)then(-1)
41694169
elif(#"cgt" e1 e2: bool #)then(1)
4170-
elif(#"ceq" e1 e2: bool #)then(1)
4170+
elif(#"ceq" e1 e2: bool #)then(0)
41714171
elif(#"ceq" e2 e2: bool #)then(-1)
41724172
else(#"ceq" e1 e1: int #)
41734173
when^T: char=if(#"clt.un" e1 e2: bool #)then(-1)else(#"cgt.un" e1 e2: int #)

‎tests/FSharp.Core.UnitTests/FSharp.Core/PrimTypes.fs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,3 +816,16 @@ type RangeTests() =
816816
if System.UIntPtr.Size>=8then RangeTestsHelpers.unsigned(System.UIntPtr System.UInt64.MinValue)(System.UIntPtr System.UInt64.MaxValue)
817817

818818

819+
openNonStructuralComparison
820+
821+
822+
[<TestFixture>]
823+
typeNonStructuralComparisonTests()=
824+
825+
[<Test>]
826+
member__.CompareFloat32()=// https://github.com/Microsoft/visualfsharp/pull/4493
827+
828+
letx=32|> float32
829+
lety=32|> float32
830+
letcomparison= compare x y
831+
Assert.AreEqual(0, comparison)

‎vsintegration/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageTargetFallback>net462</PackageTargetFallback>
1212
</PropertyGroup>
1313

14-
<ImportGroupCondition="'$(ImportVsSDK)' == 'true'">
14+
<ImportGroupCondition="'$(ImportVsSDK)' == 'true' AND Exists('$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)')">
1515
<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />
1616
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />
1717
<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\tools\vssdk\Microsoft.VsSDK.targets" />

0 commit comments

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