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

Commite2e81c6

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents7e01b83 +f6cb501 commite2e81c6

File tree

28 files changed

+390
-300
lines changed

28 files changed

+390
-300
lines changed

‎artifacts/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.nupkg
1+
*

‎build-everything.proj‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
2525
<ProjectsWithCoreClrInclude="src/fsharp/Fsc/Fsc.fsproj" />
2626
<ProjectsWithCoreClrInclude="src/fsharp/fsi/Fsi.fsproj" />
27-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj" />
27+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
2828
</ItemGroup>
2929

3030
<ItemGroupCondition="'$(BUILD_PORTABLE)'=='1'">
@@ -43,6 +43,10 @@
4343
<SetupProjectsInclude="setup/fsharp-setup-build.proj" />
4444
</ItemGroup>
4545

46+
<ItemGroupCondition="'$(BUILD_NUGET)'=='1'">
47+
<NugetProjectsInclude="src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj" />
48+
</ItemGroup>
49+
4650
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
4751

4852
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
@@ -53,7 +57,7 @@
5357
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
5458
</ItemGroup>
5559

56-
<ItemGroupCondition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1'" >
60+
<ItemGroupCondition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1' and ('$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259')" >
5761
<ProjectsWithPortableFrameworksInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
5862
</ItemGroup>
5963

@@ -81,34 +85,39 @@
8185
<!-- +++++++++++++++++++++++ Targets +++++++++++++++++++++++++++++++-->
8286

8387
<TargetName="Build">
84-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
88+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
8589
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
8690
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
8791
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
8892
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
89-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
90-
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
93+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=xamarinmacmobile;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
94+
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=monoandroid10+monotouch10+xamarinios10;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
95+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
96+
<MSBuildProjects="@(SetupProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
97+
<MSBuildProjects="@(NugetProjects)"Targets="Build"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
9198
</Target>
9299

93100
<TargetName="Rebuild">
94-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
95-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
101+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
102+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
96103
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
97104
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
98105
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
99106
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
100-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
101-
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
107+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
108+
<MSBuildProjects="@(SetupProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
109+
<MSBuildProjects="@(NugetProjects)"Targets="Rebuild"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
102110
</Target>
103111

104112
<TargetName="Clean">
105-
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
106-
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
113+
<MSBuildProjects="@(ProjectsWithNet40)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
114+
<MSBuildProjects="@(ProjectsWithNet40PlusDefine)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
107115
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
108116
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
109117
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
110118
<MSBuildProjects="@(ProjectsWithPortableFrameworks)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration);TargetFramework=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
111-
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
112-
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
119+
<MSBuildProjects="@(ProjectsWithCoreClr)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);TargetFramework=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
120+
<MSBuildProjects="@(SetupProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
121+
<MSBuildProjects="@(NugetProjects)"Targets="Clean"BuildInParallel="false"Properties="Configuration=$(Configuration);" />
113122
</Target>
114123
</Project>

‎build.cmd‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo Usage:
1919
echo.
2020
echo build.cmd^<all^|net40^|coreclr^|pcls^|vs^>
2121
echo^<proto^|protofx^>
22-
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^>
22+
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
2323
echo^<debug^|release^>
2424
echo^<diag^|publicsign^>
2525
echo^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-pcl-coreunit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
@@ -179,6 +179,7 @@ if /i "%ARG%" == "all" (
179179
setBUILD_PORTABLE=1
180180
setBUILD_VS=1
181181
setBUILD_SETUP=%FSC_BUILD_SETUP%
182+
setBUILD_NUGET=1
182183
setCI=1
183184
)
184185

@@ -192,6 +193,7 @@ if /i "%ARG%" == "microbuild" (
192193
setBUILD_PORTABLE=1
193194
setBUILD_VS=1
194195
setBUILD_SETUP=%FSC_BUILD_SETUP%
196+
setBUILD_NUGET=1
195197

196198
setTEST_NET40_COMPILERUNIT_SUITE=1
197199
setTEST_NET40_COREUNIT_SUITE=1
@@ -209,6 +211,17 @@ if /i "%ARG%" == "microbuild" (
209211
setTMP=%~dp0%BUILD_CONFIG%\TEMP
210212
)
211213

214+
if /i"%ARG%"=="nuget" (
215+
set_autoselect=0
216+
217+
setBUILD_PROTO=1
218+
setBUILD_NET40_FSHARP_CORE=1
219+
setBUILD_PROTO_WITH_CORECLR_LKG=1
220+
setBUILD_PORTABLE=1
221+
setBUILD_CORECLR=1
222+
setBUILD_NUGET=1
223+
)
224+
212225
REM These divide "ci" into two chunks which can be done in parallel
213226
if /i"%ARG%"=="ci_part1" (
214227
set_autoselect=0
@@ -231,7 +244,6 @@ if /i "%ARG%" == "ci_part2" (
231244
setBUILD_PROTO=1
232245
setBUILD_NET40=1
233246
setBUILD_NET40_FSHARP_CORE=1
234-
235247
setTEST_NET40_COREUNIT_SUITE=1
236248
setTEST_NET40_FSHARP_SUITE=1
237249
setCI=1
@@ -244,7 +256,9 @@ if /i "%ARG%" == "ci_part3" (
244256
setBUILD_PROTO_WITH_CORECLR_LKG=1
245257
setBUILD_PROTO=1
246258
setBUILD_CORECLR=1
247-
259+
setBUILD_NET40_FSHARP_CORE=1
260+
setBUILD_PORTABLE=1
261+
setBUILD_NUGET=1
248262
setTEST_CORECLR_FSHARP_SUITE=1
249263
setTEST_CORECLR_COREUNIT_SUITE=1
250264
setCI=1
@@ -303,6 +317,7 @@ if /i "%ARG%" == "test-all" (
303317
setBUILD_PORTABLE=1
304318
setBUILD_VS=1
305319
setBUILD_SETUP=%FSC_BUILD_SETUP%
320+
setBUILD_NUGET=1
306321

307322
setTEST_NET40_COMPILERUNIT_SUITE=1
308323
setTEST_NET40_COREUNIT_SUITE=1
@@ -553,6 +568,15 @@ if "%RestorePackages%" == "true" (
553568
)
554569
)
555570

571+
if"%BUILD_NUGET%"=="1" (
572+
:: Copy the net20 and net40 build directory for nuget building
573+
md%~dp0%BUILD_CONFIG%\dotnet20\bin
574+
copy /Y%~dp0packages\FSharp.Core.4.1.17\lib\net20\*.*%~dp0%BUILD_CONFIG%\dotnet20\bin
575+
576+
md%~dp0%BUILD_CONFIG%\dotnet40\bin
577+
copy /Y%~dp0packages\FSharp.Core.4.1.17\lib\net40\*.*%~dp0%BUILD_CONFIG%\dotnet40\bin
578+
)
579+
556580
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
557581
:: Restore the Tools directory
558582
call%~dp0init-tools.cmd

‎packages.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
4242
<packageid="FSharp.Compiler.Tools"version="4.1.5"/>
4343

44+
<!-- FSharp.Core is used to get the net20 and net40 builds of FSharp.Core.dll-->
45+
<packageid="FSharp.Core"version="4.1.17"/>
46+
4447
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
4548
<packageid="FSharp.Data"version="2.2.5" />
4649

‎src/FSharpSource.targets‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<FSCoreVersionCondition="'$(FSharpCoreBackVersion)' == '3.0' AND '$(FSCoreVersion)' == '4.4.1.0'">4.3.0.0</FSCoreVersion>
1414
<FSCoreVersionCondition="'$(FSharpCoreBackVersion)' == '3.1' AND '$(FSCoreVersion)' == '4.4.1.0'">4.3.1.0</FSCoreVersion>
1515
<FSCoreVersionCondition="'$(FSharpCoreBackVersion)' == '4.0' AND '$(FSCoreVersion)' == '4.4.1.0'">4.4.0.0</FSCoreVersion>
16-
17-
1816
</PropertyGroup>
1917

2018
<Choose>
@@ -600,24 +598,6 @@
600598
<DeleteFiles="@(OldBuildVersionFiles)"TreatErrorsAsWarnings="true"/>
601599
</Target>
602600

603-
<TargetName="nugetpack"
604-
DependsOnTargets="CreateOrUpdateBuildVersionFile"
605-
AfterTargets="Build"
606-
Condition="'$(TargetFramework)' == 'coreclr'"
607-
Inputs="@(PackageNuspec)"
608-
Outputs='$(FSharpSourcesRoot.TrimEnd("\"))\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'>
609-
610-
<PropertyGroup>
611-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
612-
</PropertyGroup>
613-
614-
<MakeDirDirectories="$(FSharpSourcesRoot.TrimEnd('\'))\..\$(Configuration)\artifacts" />
615-
<MakeDirDirectories="$(FSharpSourcesRoot.TrimEnd('\'))\..\artifacts" />
616-
<SetEnvVarName="NUGET_PACKAGES"Value="$(NUGET_PACKAGES)" />
617-
<ExecCommand='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(OutputPath.TrimEnd("\")) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot.TrimEnd("\"))\..\$(Configuration)\artifacts' />
618-
<ExecCommand='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(OutputPath.TrimEnd("\")) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot.TrimEnd("\"))\..\artifacts' />
619-
</Target>
620-
621601
<UsingTaskTaskName="ReplaceFileText"TaskFactory="CodeTaskFactory"AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
622602
<ParameterGroup>
623603
<InputFilenameParameterType="System.String"Required="true" />

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@
2323
</FilesToLocalize>
2424
</ItemGroup>
2525

26-
<!-- Nuget packaging configuration-->
27-
<ItemGroup>
28-
<PackageNuspecInclude="FSharp.Build.netcore.nuspec"Condition="'$(TargetFramework)' == 'coreclr'" />
29-
</ItemGroup>
30-
<PropertyGroup>
31-
<PackageVersionCondition="'$(PreReleaseLabel)' == ''">$(NuGeReleaseVersion)</PackageVersion>
32-
<PackageVersionCondition="'$(PackageVersionMinor)' != ''">$(PackageVersionMajor)-$(PackageVersionMinor)</PackageVersion>
33-
<PackageVersionCondition="'$(PackageVersionMinor)' == ''">$(NuGetPerBuildPreReleaseVersion)-0</PackageVersion>
34-
</PropertyGroup>
35-
3626
<ItemGroup>
3727
<FsSrGenInclude="FSBuild.txt">
3828
<Link>FSBuild.txt</Link>

‎src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

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