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

Commit31dce4e

Browse files
committed
Update bootstrap binaries and targets
Update the bootstrap binaries and targets.
1 parenta16e9f1 commit31dce4e

10 files changed

+22
-30
lines changed

‎lib/bootstrap/4.0/FSharp.Build.dll‎

-1 KB
Binary file not shown.
-512 Bytes
Binary file not shown.
-1 KB
Binary file not shown.
-170 KB
Binary file not shown.

‎lib/bootstrap/4.0/FSharp.Core.dll‎

-38 KB
Binary file not shown.
-361 Bytes
Binary file not shown.
2 Bytes
Binary file not shown.

‎lib/bootstrap/4.0/Microsoft.FSharp.targets‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2222

2323

2424
<PropertyGroup>
25-
<!-- FSharpTargetsDir is the directory where the targets file lives-->
26-
<FSharpTargetsDirCondition="'$(FSharpTargetsDir)'==''">unused</FSharpTargetsDir>
27-
<!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file-->
28-
<FSharpTargetsFullPathCondition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp.targets</FSharpTargetsFullPath>
2925
<MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
3026
<DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
3127
<Language>F#</Language>
@@ -58,42 +54,37 @@ Copyright (C) Microsoft Corporation. All rights reserved.
5854
<PropertyGroup>
5955
<CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
6056
</PropertyGroup>
61-
<Target
62-
Name="CreateManifestResourceNames"
63-
Condition="'@(EmbeddedResource)' != ''"
64-
DependsOnTargets="$(CreateManifestResourceNamesDependsOn)"
65-
>
6657

67-
<ItemGroup>
68-
<_TemporaryRemove="@(_Temporary)" />
69-
</ItemGroup>
70-
71-
<!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources-->
72-
<CreateFSharpManifestResourceName
73-
ResourceFiles="@(EmbeddedResource)"
74-
RootNamespace="$(RootNamespace)"
75-
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
76-
77-
<OutputTaskParameter="ResourceFilesWithManifestResourceNames"ItemName="_Temporary" />
58+
<TargetName="CreateManifestResourceNames"
59+
Condition="'@(EmbeddedResource)' != ''"
60+
DependsOnTargets="$(CreateManifestResourceNamesDependsOn)">
61+
<CreateFSharpManifestResourceNameCondition="'@(ResxWithNoCulture)' != ''"
62+
ResourceFiles="@(ResxWithNoCulture)"RootNamespace="$(RootNamespace)">
63+
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestResourceWithNoCultureName" />
64+
</CreateFSharpManifestResourceName>
7865

79-
</CreateFSharpManifestResourceName>
66+
<CreateFSharpManifestResourceNameCondition="'@(NonResxWithNoCulture)' != ''"
67+
ResourceFiles="@(NonResxWithNoCulture)"RootNamespace="$(RootNamespace)">
68+
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestNonResxWithNoCulture" />
69+
</CreateFSharpManifestResourceName>
8070

81-
<!-- Create manifest names for all culture non-resx resources-->
82-
<CreateFSharpManifestResourceName
83-
ResourceFiles="@(EmbeddedResource)"
84-
RootNamespace="$(RootNamespace)"
85-
PrependCultureAsDirectory="false"
86-
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
71+
<CreateFSharpManifestResourceNameCondition="'@(ResxWithCulture)' != ''"
72+
ResourceFiles="@(ResxWithCulture)"RootNamespace="$(RootNamespace)">
73+
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestResourceWithCultureName" />
74+
</CreateFSharpManifestResourceName>
8775

88-
<OutputTaskParameter="ResourceFilesWithManifestResourceNames"ItemName="_Temporary" />
76+
<CreateFSharpManifestResourceNameCondition="'@(NonResxWithCulture)' != ''"
77+
ResourceFiles="@(NonResxWithCulture)"RootNamespace="$(RootNamespace)">
78+
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestNonResxWithCulture" />
79+
</CreateFSharpManifestResourceName>
8980

90-
</CreateFSharpManifestResourceName>
9181

9282
<ItemGroup>
9383
<EmbeddedResourceRemove="@(EmbeddedResource)"Condition="'%(EmbeddedResource.ManifestResourceName)' == ''"/>
9484
<EmbeddedResourceInclude="@(_Temporary)" />
9585
<_TemporaryRemove="@(_Temporary)" />
9686
</ItemGroup>
87+
9788
</Target>
9889

9990
<ItemGroup>
@@ -167,7 +158,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
167158
Platform="$(PlatformTarget)"
168159
References="@(ReferencePath)"
169160
ReferencePath="$(ReferencePath)"
170-
Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
161+
Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
171162
Sources="@(CompileBefore);@(Compile);@(CompileAfter)"
172163
Tailcalls="$(Tailcalls)"
173164
TargetType="$(OutputType)"
@@ -194,3 +185,4 @@ Copyright (C) Microsoft Corporation. All rights reserved.
194185

195186
</Project>
196187

188+

‎lib/bootstrap/4.0/fsc.exe‎

-1 KB
Binary file not shown.

‎lib/bootstrap/4.0/fsi.exe‎

-3.5 KB
Binary file not shown.

0 commit comments

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