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

Commita1553ee

Browse files
NatElkinsKevinRansom
authored andcommitted
Fix project loading in VisualFSharp and FSharp solutions (dotnet#5651)
* Changing project name from FSharp.Compiler.Unittests to FSharp.Compiler.UnitTests to fix project loading error in FSharp.sln.* Fixing project file and solution file to get all projects to load in VisualFSharp and FSharp solutions.* Fixing naming in a few more places.* One more* Renaming one more file.
1 parent5e8352b commita1553ee

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

‎FSharp.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",
3131
EndProject
3232
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ build:
3838
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
3939
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
4040
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
41-
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
41+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
4242
mkdir -p$(Configuration)/fsharp30/net40/bin
4343
mkdir -p$(Configuration)/fsharp31/net40/bin
4444
mkdir -p$(Configuration)/fsharp40/net40/bin

‎build-everything.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
6363

6464
<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
65-
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
65+
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
6666
<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6767
</ItemGroup>
6868

6969
<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
70-
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
70+
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
7171
<ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
7272
</ItemGroup>
7373

‎tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj‎renamed to ‎tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<CompileInclude="StructTuples.fs" />
120120
<CompileInclude="SurfaceArea.$(TargetDotnetProfile).fs" />
121121
<CompileInclude="Program.fs"Condition="'$(TargetDotnetProfile)' == 'coreclr'" />
122-
<CopyAndSubstituteTextInclude="FSharp.Core.Unittests.dll.config">
123-
<TargetFilename>FSharp.Core.Unittests.dll.config</TargetFilename>
122+
<CopyAndSubstituteTextInclude="FSharp.Core.UnitTests.dll.config">
123+
<TargetFilename>FSharp.Core.UnitTests.dll.config</TargetFilename>
124124
<Pattern1>FSCoreVersion</Pattern1>
125125
<Replacement1>$(FSCoreVersion)</Replacement1>
126126
</CopyAndSubstituteText>

0 commit comments

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