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

Commitd4432b9

Browse files
authored
Run the CI on Brettfo sdk proj (dotnet#5923)
* convert to SDK projects* fix ci_part4* convert to SDK projects* Done* Init command* ws* Update FSharpBuild.Directory.Build.props* feedback
1 parentdc6be2a commitd4432b9

File tree

66 files changed

+850
-1000
lines changed

Some content is hidden

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

66 files changed

+850
-1000
lines changed

‎FSharpTests.Directory.Build.props‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,36 @@
44
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'net40'">
55
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/net40/bin</_FSharpCompilerPath>
66

7+
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
8+
79
<FscToolPath>$(_FSharpCompilerPath)</FscToolPath>
810
<FscToolExe>fsc.exe</FscToolExe>
911
<DotnetFscCompilerPath></DotnetFscCompilerPath>
12+
13+
<FsiToolPath>$(_FSharpCompilerPath)</FsiToolPath>
14+
<FsiToolExe>fsi.exe</FsiToolExe>
15+
<DotnetFsiCompilerPath></DotnetFsiCompilerPath>
1016
</PropertyGroup>
1117

1218
<!-- SDK targets override-->
1319
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
1420
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/coreclr/bin</_FSharpCompilerPath>
1521

22+
<DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
1623
<FscToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FscToolPath>
1724
<FscToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
1825
<FscToolExeCondition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
1926
<DotnetFscCompilerPath>$(_FSharpCompilerPath)/fsc.exe</DotnetFscCompilerPath>
27+
28+
<FsiToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FsiToolPath>
29+
<FsiToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
30+
<FsiToolExeCondition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
31+
<DotnetFsiCompilerPath>$(_FSharpCompilerPath)/fsi.exe</DotnetFsiCompilerPath>
2032
</PropertyGroup>
2133

2234
<!-- SDK targets override-->
2335
<PropertyGroup>
36+
<FSharpTargetsPath>$(_FSharpCompilerPath)/Microsoft.FSharp.Targets</FSharpTargetsPath>
2437
<FSharpPropsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
2538
<FSharpTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
2639
<FSharpOverridesTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
@@ -32,5 +45,4 @@
3245
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' != ''">$(MSBuildThisFileDirectory)$(Configuration)\coreclr\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
3346
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' == ''">$(MSBuildThisFileDirectory)$(Configuration)\net40\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
3447
</PropertyGroup>
35-
3648
</Project>
Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11
<Project>
22

3-
<TargetName="HACK_CopyFscDependenciesToReleaseDirectory"
4-
BeforeTargets="CoreCompile"
5-
Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
6-
<!--
7-
When the build is done using correct netsdk projects this won't be necessary
8-
-->
3+
<UsingTaskTaskName="Fsi"AssemblyFile="$(FSharpBuildAssemblyFile)" />
94

10-
<PropertyGroup>
11-
<DotnetSdkVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)DotnetCLIToolsVersion.txt').Trim())</DotnetSdkVersion>
12-
</PropertyGroup>
13-
<ItemGroup>
14-
<CompilerFilesToCopyInclude="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/*.json" />
15-
</ItemGroup>
16-
17-
<MessageText="Copying compiler files to $(_FSharpCompilerPath)" />
18-
<CopySourceFiles="@(CompilerFilesToCopy)"DestinationFolder="$(_FSharpCompilerPath)" SkipUnchangedFiles ="true" />
19-
</Target>
5+
<Target
6+
Name="RunFSharpScript"
7+
Returns=""
8+
DependsOnTargets="$(CoreCompileDependsOn)"
9+
>
10+
<FsiCondition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true'"
11+
CodePage="$(CodePage)"
12+
DefineConstants="$(DefineConstants)"
13+
DisabledWarnings="$(NoWarn)"
14+
DotnetFsiCompilerPath="$(DotnetFsiCompilerPath)"
15+
FsiExec="@(FsiExec)"
16+
LCID="$(LCID)"
17+
LoadSources="@(LoadSource)"
18+
NoFramework="false"
19+
Optimize="$(Optimize)"
20+
OtherFlags="$(OtherFlags)"
21+
PreferredUILang="$(PreferredUILang)"
22+
ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
23+
UseSources="@(UseSource)"
24+
SkipCompilerExecution="$(SkipCompilerExecution)"
25+
Sources="@(CompileBefore);@(Compile);@(CompileAfter)"
26+
Tailcalls="$(Tailcalls)"
27+
TargetProfile="$(TargetProfile)"
28+
ToolExe="$(FsiToolExe)"
29+
ToolPath="$(FsiToolPath)"
30+
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
31+
Utf8Output="$(Utf8Output)"
32+
WarningLevel="$(WarningLevel)"
33+
WarningsAsErrors="$(WarningsAsErrors)">
34+
<OutputTaskParameter="CommandLineArgs"ItemName="FsiCommandLineArgs" />
35+
</Fsi>
2036

37+
<ItemGroup>
38+
<_CoreCompileResourceInputsRemove="@(_CoreCompileResourceInputs)" />
39+
</ItemGroup>
40+
</Target>
2141
</Project>

‎build/targets/PackageVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,19 @@
3232
<SystemLinqQueryablePackageVersion>4.3.0</SystemLinqQueryablePackageVersion>
3333
<SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
3434
<SystemNetRequestsPackageVersion>4.3.0</SystemNetRequestsPackageVersion>
35+
<SystemNetSecurityPackageVersion>4.3.0</SystemNetSecurityPackageVersion>
3536
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
3637
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
3738
<SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion>
3839
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
3940
<SystemRuntimePackageVersion>4.3.0</SystemRuntimePackageVersion>
4041
<SystemRuntimeInteropServicesPackageVersion>4.3.0</SystemRuntimeInteropServicesPackageVersion>
4142
<SystemRuntimeLoaderPackageVersion>4.3.0</SystemRuntimeLoaderPackageVersion>
43+
<SystemNetSecurityPackageVersion>4.3.0</SystemNetSecurityPackageVersion>
44+
<SystemSecurityClaimsPackageVersion>4.3.0</SystemSecurityClaimsPackageVersion>
4245
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
4346
<SystemSecurityPrincipalPackageVersion>4.3.0</SystemSecurityPrincipalPackageVersion>
47+
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
4448
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
4549
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
4650
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ImportProject="..\fcs.props" />
66
<ImportProject="..\netfx.props" />
77
<ImportProject="..\..\src\buildtools\buildtools.targets" />
8-
<PropertyGroup>
8+
<PropertyGroup>
99
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
@@ -641,6 +641,7 @@
641641
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
642642
</ItemGroup>
643643
<ItemGroupCondition="'$(TargetFramework)' == 'netstandard2.0'">
644+
<PackageReferenceInclude="System.Data.SqlClient"Version="4.3.0" />
644645
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />
645646
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.0.0" />
646647
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0" />

‎fcs/fcs.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
99
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->
1010
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
11-
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
12-
<FsiToolExe>fsi.exe</FsiToolExe>
11+
<ToolsetFsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</ToolsetFsiToolPath>
12+
<ToolsetFsiToolExe>fsi.exe</ToolsetFsiToolExe>
1313
</PropertyGroup>
1414
</Project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,18 +629,22 @@
629629

630630
<ItemGroup>
631631
<PackageReferenceInclude="System.Collections.Immutable"Version="$(SystemCollectionsImmutablePackageVersion)" />
632+
<PackageReferenceInclude="System.Data.SqlClient"Version="$(SystemDataSqlClientPackageVersion)" />
632633
<PackageReferenceInclude="System.Diagnostics.Process"Version="$(SystemDiagnosticsProcessPackageVersion)" />
633634
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="$(SystemDiagnosticsTraceSourcePackageVersion)" />
634635
<PackageReferenceInclude="System.Linq.Expressions"Version="$(SystemLinqExpressionsPackageVersion)" />
635636
<PackageReferenceInclude="System.Linq.Queryable"Version="$(SystemLinqExpressionsPackageVersion)" />
636637
<PackageReferenceInclude="System.Net.Requests"Version="$(SystemNetRequestsPackageVersion)" />
638+
<PackageReferenceInclude="System.Net.Security"Version="$(SystemNetSecurityPackageVersion)" />
637639
<PackageReferenceInclude="System.Reflection.Emit"Version="$(SystemReflectionEmitPackageVersion)" />
638640
<PackageReferenceInclude="System.Reflection.Metadata"Version="$(SystemReflectionMetadataPackageVersion)" />
639641
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="$(SystemReflectionTypeExtensionsPackageVersion)" />
640642
<PackageReferenceInclude="System.Runtime"Version="$(SystemRuntimePackageVersion)" />
641643
<PackageReferenceInclude="System.Runtime.InteropServices"Version="$(SystemRuntimeInteropServicesPackageVersion)" />
642644
<PackageReferenceInclude="System.Runtime.Loader"Version="$(SystemRuntimeLoaderPackageVersion)" />
645+
<PackageReferenceInclude="System.Security.Claims"Version="$(SystemSecurityClaimsPackageVersion)" />
643646
<PackageReferenceInclude="System.Security.Cryptography.Algorithms"Version="$(SystemSecurityCryptographyAlgorithmsPackageVersion)" />
647+
<PackageReferenceInclude="System.Security.Principal"Version="$(SystemSecurityPrincipalPackageVersion)" />
644648
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="$(SystemThreadingTasksParallelPackageVersion)" />
645649
<PackageReferenceInclude="System.Threading.Thread"Version="$(SystemThreadingThreadPackageVersion)" />
646650
<PackageReferenceInclude="System.Threading.ThreadPool"Version="$(SystemThreadingThreadPoolPackageVersion)" />

‎src/buildfromsource/Fsi/Fsi.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj" />
3535
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
3636
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
37-
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
3837
</ItemGroup>
3938

4039
<ItemGroup>

‎src/buildfromsource/targets/PackageVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
<SystemLinqExpressionsPackageVersion>4.3.0</SystemLinqExpressionsPackageVersion>
1010
<SystemLinqQueryablePackageVersion>4.3.0</SystemLinqQueryablePackageVersion>
1111
<SystemNetRequestsPackageVersion>4.3.0</SystemNetRequestsPackageVersion>
12+
<SystemNetSecurityPackageVersion>4.3.0</SystemNetSecurityPackageVersion>
1213
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
1314
<SystemReflectionMetadataPackageVersion>1.5.0</SystemReflectionMetadataPackageVersion>
1415
<SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion>
1516
<SystemRuntimePackageVersion>4.3.0</SystemRuntimePackageVersion>
1617
<SystemRuntimeInteropServicesPackageVersion>4.3.0</SystemRuntimeInteropServicesPackageVersion>
1718
<SystemRuntimeLoaderPackageVersion>4.3.0</SystemRuntimeLoaderPackageVersion>
19+
<SystemSecurityClaimsPackageVersion>4.3.0</SystemSecurityClaimsPackageVersion>
1820
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
21+
<SystemSecurityPrincipalPackageVersion>4.3.0</SystemSecurityPrincipalPackageVersion>
22+
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
1923
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
2024
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
2125
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>

‎src/fsharp/CompileOps.fs‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,6 +1825,7 @@ let DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) =
18251825
yield"System.Data"
18261826
yield"System.Drawing"
18271827
yield"System.Core"
1828+
18281829
// These are the Portable-profile and .NET Standard 1.6 dependencies of FSharp.Core.dll. These are needed
18291830
// when an F# sript references an F# profile 7, 78, 259 or .NET Standard 1.6 component which in turn refers
18301831
// to FSharp.Core for profile 7, 78, 259 or .NET Standard.
@@ -1850,17 +1851,24 @@ let DefaultReferencesForScriptsAndOutOfProjectSources(assumeDotNetFramework) =
18501851
yield"System.Windows.Forms"
18511852
yield"System.Numerics"
18521853
else
1853-
yield Path.Combine(Path.GetDirectoryName(typeof<System.Object>.Assembly.Location),"mscorlib.dll");// mscorlib
1854-
yield typeof<System.Console>.Assembly.Location;// System.Console
1855-
yield typeof<System.ComponentModel.DefaultValueAttribute>.Assembly.Location;// System.Runtime
1856-
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location;// System.ObjectModel
1857-
yield typeof<System.IO.BufferedStream>.Assembly.Location;// System.IO
1858-
yield typeof<System.Linq.Enumerable>.Assembly.Location;// System.Linq
1859-
//yield typeof<System.Xml.Linq.XDocument>.Assembly.Location; // System.Xml.Linq
1860-
yield typeof<System.Net.WebRequest>.Assembly.Location;// System.Net.Requests
1861-
yield typeof<System.Numerics.BigInteger>.Assembly.Location;// System.Runtime.Numerics
1862-
yield typeof<System.Threading.Tasks.TaskExtensions>.Assembly.Location;// System.Threading.Tasks
1863-
yield typeof<Microsoft.FSharp.Core.MeasureAttribute>.Assembly.Location;// FSharp.Core
1854+
yield Path.Combine(Path.GetDirectoryName(typeof<System.Object>.Assembly.Location),"mscorlib.dll")// mscorlib
1855+
yield typeof<System.Console>.Assembly.Location// System.Console
1856+
yield typeof<System.Collections.BitArray>.Assembly.Location// System.Collections
1857+
yield typeof<System.Data.SqlClient.SqlCommand>.Assembly.Location// System.Data.SqlClient
1858+
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location// System.ObjectModel
1859+
yield typeof<System.IO.File>.Assembly.Location// System.IO.FileSystem
1860+
yield typeof<System.IO.TextWriter>.Assembly.Location// System.IO
1861+
yield typeof<System.Linq.Enumerable>.Assembly.Location// System.Linq
1862+
yield typeof<System.Xml.XmlNodeType>.Assembly.Location// System.Xml
1863+
yield typeof<System.Xml.Linq.XDocument>.Assembly.Location// System.Xml.Linq
1864+
yield typeof<System.Net.WebRequest>.Assembly.Location// System.Net.Requests
1865+
yield typeof<System.Numerics.BigInteger>.Assembly.Location// System.Runtime.Numerics
1866+
yield typeof<System.Net.Security.AuthenticatedStream>.Assembly.Location// System.Net.Security
1867+
yield typeof<System.Security.Principal.GenericIdentity>.Assembly.Location// System.Security.Claims
1868+
yield typeof<System.Text.RegularExpressions.Regex>.Assembly.Location// System.Text.RegularExpressions.Regex
1869+
yield typeof<System.Threading.Tasks.TaskExtensions>.Assembly.Location// System.Threading.Tasks
1870+
yield typeof<System.Threading.Thread>.Assembly.Location// System.Threading
1871+
yield typeof<Microsoft.FSharp.Core.MeasureAttribute>.Assembly.Location// FSharp.Core
18641872
]
18651873

18661874

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# FSharp.Build resource strings
2-
toolpathUnknown,"ToolPath is unknown; specify the path tofsc.exe astheToolPath property."
2+
toolpathUnknown,"ToolPath is unknown; specify the path to thetool."

0 commit comments

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