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

Commit5450aff

Browse files
authored
Merge pull requestdotnet#5482 from brettfo/sdk-proj
convert src/fsharp to be SDK projects
2 parentsa7acf9f +61465f6 commit5450aff

File tree

301 files changed

+3456
-6960
lines changed

Some content is hidden

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

301 files changed

+3456
-6960
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
/debug
99
/Proto
1010

11+
# auto-generated during the build
12+
global.json
13+
1114
# Patches that may have been generated by scripts.
1215
# (These aren't generally useful to commit directly; if anything, they should be applied.)
1316
scripts/*.patch
@@ -82,6 +85,8 @@ lib/bootstrap/4.1/*.xml
8285
lib/bootstrap/4.1/fsharpc
8386
lib/bootstrap/4.1/fsharpi
8487
lib/bootstrap/4.1/policy*
88+
obj/
89+
bin/
8590
aclocal.m4
8691
Debug
8792
Release

‎.vsts-pr.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ jobs:
66
strategy:
77
maxParallel:2
88
matrix:
9-
release_default:
10-
_command:./mono/cibuild.sh
11-
_args:release
9+
dotnet_sdk:
10+
_command:make
11+
_args:Configuration=release
1212
# disabled until it can be properly fixed
1313
#release_fcs:
1414
# _command: ./fcs/build.sh

‎DEVGUIDE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ If you are behind a proxy server, NuGet client tool must be configured to use it
259259

260260
Where you should set proper proxy address, user name and password.
261261

262-
263262
####Resources
264263

265264
The primary technical guide to the core compiler code is[The F# Compiler Technical Guide](http://fsharp.github.io/2015/09/29/fsharp-compiler-guide.html). Please read and contribute to that guide.

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.403
1+
2.1.500

‎DotnetCLIVersion.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/FSharp.Profiles.props‎renamed to ‎FSharp.Profiles.props‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<Project>
44

5-
<PropertyGroupCondition="'$(TargetFramework)' == 'net46'">
5+
<PropertyGroupCondition="$(TargetFramework.StartsWith('net4'))">
66
<DefineConstantsCondition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
88
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
99
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
1010
</PropertyGroup>
1111

12-
<PropertyGroupCondition="'$(TargetFramework)' == 'netstandard1.6' or '$(TargetFramework)' == 'netcoreapp1.0'">
12+
<PropertyGroupCondition="$(TargetFramework.StartsWith('netstandard')) OR$(TargetFramework.StartsWith('netcoreapp'))">
1313
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1414
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
1515
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
@@ -19,13 +19,11 @@
1919
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
2020
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
2121
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
22-
<DefineConstants>$(DefineConstants);FX_NO_CRYPTO</DefineConstants>
2322
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
2423
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
2524
<DefineConstants>$(DefineConstants);FX_NO_HEAPTERMINATION</DefineConstants>
2625
<DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
2726
<DefineConstants>$(DefineConstants);FX_NO_LOADER_OPTIMIZATION</DefineConstants>
28-
<DefineConstants>$(DefineConstants);FX_NO_SIMPLIFIED_LOADER</DefineConstants>
2927
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
3028
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
3129
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
@@ -42,16 +40,13 @@
4240
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
4341
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
4442
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
43+
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
4544
<DefineConstants>$(DefineConstants);FX_REDUCED_EXCEPTIONS</DefineConstants>
4645
<DefineConstants>$(DefineConstants);FX_REDUCED_CONSOLE</DefineConstants>
4746
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
48-
<DefineConstants>$(DefineConstants);FX_RESHAPED_CONSOLE</DefineConstants>
4947
<DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
5048
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
51-
<DefineConstants>$(DefineConstants);FX_JITTRACKING_ISSUE</DefineConstants>
52-
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
53-
<DefineConstantsCondition=" '$(FX_NO_LOADER)' != 'true'">$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
54-
<DefineConstants>$(DefineConstants);FSI_TODO_NETCORE</DefineConstants>
49+
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
5550
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
5651
</PropertyGroup>
5752

‎FSharpBuild.Directory.Build.props‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project>
22

3+
<ImportProject="build\targets\AssemblyVersions.props" />
34
<ImportProject="build\targets\PackageVersions.props" />
5+
<ImportProject="build\targets\GitHash.props" />
46
<ImportProject="build\targets\CommonPackages.targets" />
57

68
<!-- directory locations-->
@@ -9,19 +11,29 @@
911
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
1012
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
1113
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13-
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14+
<ProtoOutputPathCondition="'$(OS)' != 'Unix'">$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
15+
<ProtoOutputPathCondition="'$(OS)' == 'Unix'">$(RepoRoot)Proto\coreclr\bin</ProtoOutputPath>
1416
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
1517
</PropertyGroup>
1618

1719
<!-- nuget-->
1820
<PropertyGroup>
1921
<!-- default NuGet package restore location-->
2022
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
21-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
23+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
24+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
2225
<!-- ensure there is a trailing slash-->
2326
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
2427
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
28+
<!-- ensure all NuGet packages come from the `$(NuGetPackageRoot)` variable-->
29+
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
30+
</PropertyGroup>
31+
32+
<!-- mono-->
33+
<PropertyGroupCondition="'$(OS)' == 'Unix'">
34+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4'))">true</MonoPackaging>
35+
<FrameworkPathOverrideCondition="'$(TargetFramework)' == 'net45'">/usr/lib/mono/4.5-api</FrameworkPathOverride>
36+
<FrameworkPathOverrideCondition="'$(TargetFramework)' == 'net46'">/usr/lib/mono/4.6-api</FrameworkPathOverride>
2537
</PropertyGroup>
2638

2739
<!-- signing-->
@@ -32,15 +44,15 @@
3244
<StrongNames>true</StrongNames>
3345
<DelaySign>true</DelaySign>
3446
</PropertyGroup>
35-
36-
<!-- mono-->
37-
<PropertyGroup>
38-
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
47+
<PropertyGroupCondition="'$(MonoPackaging)' == 'true'">
48+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\test.snk</AssemblyOriginatorKeyFile>
49+
<DelaySign>false</DelaySign>
50+
<DefineConstants>STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)</DefineConstants>
3951
</PropertyGroup>
4052

4153
<!-- localization-->
4254
<PropertyGroup>
43-
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto'or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
55+
<EnableXlfLocalizationCondition="'$(EnableXlfLocalization)' == '' AND ('$(Configuration)' == 'Proto'OR '$(MonoPackaging)' == 'true')">false</EnableXlfLocalization>
4456
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
4557
</PropertyGroup>
4658

@@ -53,10 +65,11 @@
5365
</PropertyGroup>
5466

5567
<!-- SDK targets override-->
56-
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
57-
<FSharpPropsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
58-
<FSharpTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
59-
<FSharpOverridesTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
68+
<PropertyGroupCondition="'$(Configuration)' != 'Proto' AND Exists('$(ProtoOutputPath)')">
69+
<FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
70+
<FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
71+
<FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
72+
<FSharpOverridesTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
6073
</PropertyGroup>
6174

6275
</Project>

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
<Project>
22

3+
<ImportProject="FSharp.Profiles.props" />
4+
35
<PropertyGroup>
46
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
5-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
6-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
7-
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
8-
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
9-
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
10-
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
117
</PropertyGroup>
128

13-
<TargetName="HACK_CopyOutputsToTheProperLocation"
14-
AfterTargets="AfterBuild"
15-
Condition="'$(DisableOutputPathCopying)' != 'true'">
9+
<PropertyGroupCondition="'$(UseAssetTargetFallback)' == 'true'">
10+
<!--
11+
HACK: Necessary because the `netstandard1.6` version of FSharp.Compiler.Private requires a package that isn't
12+
necessary for `net46`, but the package has a requirement on `net462`. The reference is excluded from the build
13+
during `net46`, but for purposes of restore needs to be present.
14+
-->
15+
<AssetTargetFallback>$(AssetTargetFallback);net462</AssetTargetFallback>
16+
</PropertyGroup>
17+
18+
<PropertyGroup>
19+
<CompileDependsOn>$(CompileDependsOn);CopyAndSubstituteTextFiles</CompileDependsOn>
20+
</PropertyGroup>
21+
22+
<TargetName="CopyAndSubstituteTextFiles"
23+
Inputs="@(CopyAndSubstituteText)"
24+
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')">
25+
<PropertyGroup>
26+
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
27+
<_ReplacementTextCondition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
28+
<_ReplacementTextCondition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
29+
</PropertyGroup>
30+
<WriteLinesToFileFile="$(OutDir)%(CopyAndSubstituteText.TargetFilename)"Lines="$(_ReplacementText)"Overwrite="true" />
31+
<!-- Make sure it will get cleaned-->
32+
<CreateItemInclude="$(OutDir)%(CopyAndSubstituteText.TargetFilename)">
33+
<OutputTaskParameter="Include"ItemName="FileWrites" />
34+
</CreateItem>
35+
</Target>
36+
37+
<TargetName="ComputeFinalOutputPaths">
1638
<!--
1739
Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
1840
depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
@@ -22,6 +44,21 @@
2244
The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
2345
-->
2446

47+
<PropertyGroup>
48+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
49+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
50+
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
51+
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
52+
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
53+
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
54+
</PropertyGroup>
55+
</Target>
56+
57+
<TargetName="HACK_CopyOutputsToTheProperLocation"
58+
AfterTargets="AfterBuild"
59+
DependsOnTargets="ComputeFinalOutputPaths"
60+
Condition="'$(DisableOutputPathCopying)' != 'true'">
61+
2562
<ItemGroup>
2663
<OutputFilesToCopyInclude="$(ActualOutputPath)**" />
2764
<IntermediateFilesToCopyInclude="$(IntermediateOutputPath)\**" />
@@ -33,7 +70,6 @@
3370
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)\%(RecursiveDir)" />
3471
</Target>
3572

36-
<ImportProject="build\targets\AssemblyVersions.props" />
3773
<ImportProject="build\targets\ConvertPortablePdbs.targets" />
3874
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
3975
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />

0 commit comments

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