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

Commitc7a6c00

Browse files
author
dotnet-automerge-bot
authored
Merge pull requestdotnet#6012 from Microsoft/merges/master-to-dev16.0
Merge master to dev16.0
2 parents33e957b +4ab40e5 commitc7a6c00

File tree

114 files changed

+1530
-1317
lines changed

Some content is hidden

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

114 files changed

+1530
-1317
lines changed

‎CoordinateXlif.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Target Name ="CoordinateXlif"DependsOnTargets="GenerateFSharpTextResources"BeforeTargets="GetXlfSources" />
3+
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
<ImportProject="FSharpBuild.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
44
<ImportProject="FSharpTests.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
5+
<ImportProject="CoordinateXlif.targets" Condition =" '$(FSharpBuildAssemblyFile)' != '' and '$(XliffTasksAssembly)' != ''"/>
56

67
</Project>

‎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/GenerateAssemblyAttributes.targets‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,20 @@
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
</PropertyGroup>
77

8-
<TargetName="GenerateAssemblyLevelAttributes"
9-
BeforeTargets="CoreCompile">
10-
8+
<TargetName="PrepareGenerateAssemblyLevelAttributes">
119
<PropertyGroup>
1210
<GeneratedFSharpAssemblyLevelAttributesFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyLevelAttributes$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyLevelAttributesFile>
1311

1412
<!-- The compiler that currently ships with the SDK doesn't like the Git hash being embedded into the AssemblyInformationalVersionAttribute.-->
1513
<NoWarnCondition="'$(Language)' == 'F#' AND '$(Configuration)' == 'Proto'">$(NoWarn);2003</NoWarn>
1614
</PropertyGroup>
15+
</Target>
16+
17+
<TargetName="GenerateAssemblyLevelAttributes"
18+
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
19+
Outputs="$(GeneratedFSharpAssemblyLevelAttributesFile)"
20+
DependsOnTargets="PrepareGenerateAssemblyLevelAttributes;PrepareForBuild"
21+
BeforeTargets="CoreCompile">
1722

1823
<WriteCodeFragmentAssemblyAttributes="@(AssemblyLevelAttribute)"
1924
Language="$(Language)"
@@ -26,10 +31,8 @@
2631

2732
</Target>
2833

29-
<TargetName="GenerateAssemblyFileVersion"
30-
BeforeTargets="CoreCompile"
34+
<TargetName="PrepareGenerateAssemblyFileVersion"
3135
Condition="'$(Language)' != '' AND '$(GenerateAssemblyVersionAttribute)' != 'false'">
32-
3336
<PropertyGroup>
3437
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
3538

@@ -41,7 +44,6 @@
4144

4245
<GeneratedFSharpAssemblyVersionFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyVersionFile>
4346
</PropertyGroup>
44-
4547
<PropertyGroup>
4648
<!-- xbuild and older versions of msbuild don't have F# support for WriteCodeFragment-->
4749
<_UseWriteCodeFragmentHackCondition="'$(OS)' == 'Unix' and '$(Language)' == 'F#'">true</_UseWriteCodeFragmentHack>
@@ -74,6 +76,15 @@
7476
</_AssemblyVersionAttributes>
7577
</ItemGroup>
7678

79+
</Target>
80+
81+
<TargetName="GenerateAssemblyFileVersion"
82+
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
83+
Outputs="$(GeneratedFSharpAssemblyVersionFile)"
84+
DependsOnTargets="PrepareGenerateAssemblyFileVersion;PrepareForBuild"
85+
BeforeTargets="CoreCompile"
86+
Condition="'$(Configuration)' != 'Proto'">
87+
7788
<WriteCodeFragmentAssemblyAttributes="@(_AssemblyVersionAttributes)"
7889
Language="$(Language)"
7990
OutputFile="$(GeneratedFSharpAssemblyVersionFile)"

‎build/targets/PackageVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@
3535
<SystemLinqQueryablePackageVersion>4.3.0</SystemLinqQueryablePackageVersion>
3636
<SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
3737
<SystemNetRequestsPackageVersion>4.3.0</SystemNetRequestsPackageVersion>
38+
<SystemNetSecurityPackageVersion>4.3.0</SystemNetSecurityPackageVersion>
3839
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
3940
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
4041
<SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion>
4142
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
4243
<SystemRuntimePackageVersion>4.3.0</SystemRuntimePackageVersion>
4344
<SystemRuntimeInteropServicesPackageVersion>4.3.0</SystemRuntimeInteropServicesPackageVersion>
4445
<SystemRuntimeLoaderPackageVersion>4.3.0</SystemRuntimeLoaderPackageVersion>
46+
<SystemNetSecurityPackageVersion>4.3.0</SystemNetSecurityPackageVersion>
47+
<SystemSecurityClaimsPackageVersion>4.3.0</SystemSecurityClaimsPackageVersion>
4548
<SystemSecurityCryptographyAlgorithmsPackageVersion>4.3.0</SystemSecurityCryptographyAlgorithmsPackageVersion>
4649
<SystemSecurityPrincipalPackageVersion>4.3.0</SystemSecurityPrincipalPackageVersion>
50+
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
4751
<SystemThreadingTasksParallelPackageVersion>4.3.0</SystemThreadingTasksParallelPackageVersion>
4852
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
4953
<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/docsrc/content/ja/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ argTy1c.TypeDefinition.CompiledName // "Int32"
175175
*)
176176
letprojectContext= checkFileResults.ProjectContext
177177

178-
forassin projectContext.GetReferencedAssemblies()do
179-
matchass.FileNamewith
178+
forassemblyin projectContext.GetReferencedAssemblies()do
179+
matchassembly.FileNamewith
180180
| None-> printfn"コンパイル時にファイルの存在しないアセンブリを参照しました"
181181
| Some s-> printfn"コンパイル時にアセンブリ '%s' を参照しました" s
182182

‎fcs/docsrc/content/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ used in the compilation, called the `ProjectContext`:
168168
*)
169169
letprojectContext= checkFileResults.ProjectContext
170170

171-
forassin projectContext.GetReferencedAssemblies()do
172-
matchass.FileNamewith
171+
forassemblyin projectContext.GetReferencedAssemblies()do
172+
matchassembly.FileNamewith
173173
| None-> printfn"compilation referenced an assembly without a file"
174174
| Some s-> printfn"compilation references assembly '%s'" s
175175

‎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>

0 commit comments

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