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

Commit4a61b30

Browse files
dsymedsyme
dsyme
authored and
dsyme
committed
align builds
1 parentae1e428 commit4a61b30

File tree

9 files changed

+17
-88
lines changed

9 files changed

+17
-88
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@
9191
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
9292
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
9393

94-
<MonoPackaging>true</MonoPackaging>
95-
9694
<FSharpCore41TargetVersion>4.1.19</FSharpCore41TargetVersion>
9795
<FSharpCore41FrozenPortableVersion>4.1.20</FSharpCore41FrozenPortableVersion>
9896
<FSharpCore41FrozenPortableTargetVersion>4.1.21</FSharpCore41FrozenPortableTargetVersion>
@@ -191,7 +189,6 @@
191189
<DefineConstantsCondition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV15=True</DefineConstants>
192190
<DefineConstantsCondition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV15</DefineConstants>
193191
<!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono-->
194-
<!-- Note we probably just need to add imports of Microsoft.Common.props-->
195192
<DefineConstantsCondition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV14=True</DefineConstants>
196193
<DefineConstantsCondition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
197194
</PropertyGroup>

‎src/FSharpSource.targets‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
<OutputTaskParameter="Include"ItemName="FileWrites"/>
211211
</CreateItem>
212212
</Target>
213-
<ImportProject="scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
214-
<!-- <Import Project="Microbuild.Settings.targets" Condition="'$(UseMicroBuild)' == 'true'"/>-->
213+
<ImportProject="$(FSharpSourcesRoot)\scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
214+
<ImportProject="Microbuild.Settings.targets"Condition="'$(UseMicroBuild)' == 'true'"/>
215215

216216
<!-- Not included in Linux/Mono build because target 'CopyFilesToOutputDirectory' doesn't exist and this fails the Mono build-->
217217
<!--
@@ -316,6 +316,7 @@
316316

317317
<MakeDirDirectories="$(IntermediateOutputPath)" />
318318

319+
<!-- Generate source for all resx files.-->
319320
<FSharpEmbedResXSourceEmbeddedResource="@(EmbeddedResource)"IntermediateOutputPath="$(IntermediateOutputPath)"TargetFramework="$(TargetFramework)">
320321
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedResXSource" />
321322
</FSharpEmbedResXSource>
@@ -325,6 +326,7 @@
325326
<FileWritesInclude="@(_FsGeneratedResXSource)" />
326327
</ItemGroup>
327328

329+
<!-- Generate resx and source for all txt files.-->
328330
<FSharpEmbedResourceTextEmbeddedText="@(EmbeddedText)"IntermediateOutputPath="$(IntermediateOutputPath)">
329331
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedTxtSource" />
330332
<OutputTaskParameter="GeneratedResx"ItemName="_FsGeneratedResx" />

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@
6969
<ReferenceInclude="mscorlib" />
7070
<ReferenceInclude="System" />
7171
<ReferenceInclude="System.Numerics" />
72-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
73-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
74-
<Name>FSharp.Core</Name>
75-
</ProjectReference>
7672
<ReferenceInclude="System.Xml" />
7773
<ReferenceInclude="System.Xml.Linq" />
7874
</ItemGroup>
@@ -89,20 +85,10 @@
8985
<ReferenceInclude="Microsoft.Build.Tasks.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
9086
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
9187
</Reference>
92-
</ItemGroup>
93-
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' == 'true'">
94-
<ReferenceInclude="Microsoft.Build.Framework, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
95-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll</HintPath>
96-
</Reference>
97-
<ReferenceInclude="Microsoft.Build, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
98-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll</HintPath>
99-
</Reference>
100-
<ReferenceInclude="Microsoft.Build.Utilities.Core, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
101-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll</HintPath>
102-
</Reference>
103-
<ReferenceInclude="Microsoft.Build.Tasks.Core, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
104-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
105-
</Reference>
88+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
89+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
90+
<Name>FSharp.Core</Name>
91+
</ProjectReference>
10692
</ItemGroup>
10793
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' == 'true'">
10894
<ReferenceInclude="Microsoft.Build.Framework, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
<ItemGroup>
2424
<EmbeddedTextInclude="..\FSInteractiveSettings.txt" />
25-
<CompileInclude="InternalsVisibleTo.fs" />
2625
<CompileInclude="..\..\utils\reshapedreflection.fs" />
2726
<CompileInclude="..\fsiattrs.fs" />
2827
<CompileInclude="..\fsiaux.fsi" />

‎src/fsharp/FSharp.Compiler.Private/AssemblyInfo.fs‎

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

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
<EmbeddedResourceInclude="..\FSStrings.resx">
6565
<Link>FSStrings.resx</Link>
6666
</EmbeddedResource>
67-
<CompileInclude="AssemblyInfo.fs">
68-
<Link>AssemblyInfo.fs</Link>
69-
</Compile>
7067
<CompileInclude="..\..\utils\reshapedreflection.fs">
7168
<Link>Reflection\reshapedreflection.fs</Link>
7269
</Compile>
@@ -651,7 +648,6 @@
651648
<Link>InteractiveSession/fsi.fs</Link>
652649
</Compile>
653650

654-
<CompileInclude="..\MSBuildReferenceResolver.fs"Condition="'$(MonoPackaging)' != 'true'">
655651
<CompileInclude="..\MSBuildReferenceResolver.fs"Condition="'$(MonoPackaging)' != 'true'">
656652
<Link>Misc/MSBuildReferenceResolver.fs</Link>
657653
</Compile>
@@ -673,26 +669,20 @@
673669
<ReferenceInclude="System.Numerics" />
674670
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
675671
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
676-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
677-
<Private>true</Private>
678-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
679-
</Reference>
680-
<ReferenceInclude="Microsoft.DiaSymReader">
681-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
682-
<Private>true</Private>
683672
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.$(MicrosoftDiaSymReaderPortablePdbPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
673+
<Private>true</Private>
684674
</Reference>
685675
<ReferenceInclude="Microsoft.DiaSymReader">
686676
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.$(MicrosoftDiaSymReaderPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.dll</HintPath>
677+
<Private>true</Private>
687678
</Reference>
688679
<ReferenceInclude="System.Reflection.Metadata">
689680
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
690681
<Private>true</Private>
691682
</Reference>
692683
<ReferenceInclude="System.Collections.Immutable">
693-
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
694-
<Private>true</Private>
695684
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
685+
<Private>true</Private>
696686
</Reference>
697687
<ReferenceInclude="System.ValueTuple">
698688
<HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@ namespace Microsoft.FSharp
55
openSystem.Reflection
66
openSystem.Runtime.InteropServices
77

8-
#if STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY
9-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
10-
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
11-
#endif
12-
138
[<assembly:ComVisible(false)>]
149
do()

‎src/fsharp/FSharp.Core/FSharp.Core.fsproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@
2121
<CompilingFsLib>true</CompilingFsLib>
2222
<AllowCrossTargeting>true</AllowCrossTargeting>
2323
<FX_NO_LOADER>true</FX_NO_LOADER>
24-
<OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 </OtherFlags>
25-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='net20' AND EXISTS('$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll')">$(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" </OtherFlags>
26-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='net20' AND EXISTS('$(MonoLibDir40)/mscorlib.dll')">$(OtherFlags) --compiling-fslib-20:"$(MonoLibDir40)/mscorlib.dll" </OtherFlags>
27-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='net40'">$(OtherFlags) --compiling-fslib-40</OtherFlags>
28-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='coreclr'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
29-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable7'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
30-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable78'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
31-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable259'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
32-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='coreclr'">$(OtherFlags) --compiling-fslib-40</OtherFlags>
33-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable7'">$(OtherFlags) --compiling-fslib-40</OtherFlags>
34-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable78'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
35-
<OtherFlagsCondition=" '$(TargetDotnetProfile)'=='portable259'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
36-
<OtherFlags>$(OtherFlags) --compiling-fslib-40</OtherFlags>
3724
<OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --extraoptimizationloops:1</OtherFlags>
3825
<OtherFlags>$(OtherFlags) --warnon:3218</OtherFlags>
3926
<OtherFlags>$(OtherFlags) --maxerrors:20</OtherFlags>

0 commit comments

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