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

Commit83208f8

Browse files
authored
fix-resource (#3690)
1 parentd94167f commit83208f8

File tree

4 files changed

+2
-75
lines changed

4 files changed

+2
-75
lines changed

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@
6161
</ProjectReference>
6262
</ItemGroup>
6363
<ImportProject="$(SolutionDir)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
64-
<ImportProject="$(SolutionDir).paket\paket.targets" />
6564
</Project>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,4 @@
7474
</ProjectReference>
7575
</ItemGroup>
7676
<ImportProject="$(SolutionDir)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
77-
<ImportProject="$(SolutionDir).paket\paket.targets" />
7877
</Project>

‎src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ module internal {1} =
7777
|(true,true)-> sprintf" [<Literal>]\n let%s =\"%s\"" identifier name
7878
|(true,false)-> sprintf" let%s =\"%s\"" identifier name// the [<Literal>] attribute can't be used for FSharp.Core
7979
|(false,_)->
80-
letisStringResource=match node.Attribute(xname"type")with
81-
|null->true
82-
|_->false
80+
letisStringResource= node.Attribute(xname"type")|> isNull
8381
match(isStringResource, generateGetObject)with
8482
|(true,_)-> sprintf" let%s() = GetString(\"%s\")" identifier name
8583
|(false,true)-> sprintf" let%s() = GetObject(\"%s\")" identifier name
@@ -134,7 +132,7 @@ module internal {1} =
134132
if getBooleanMetadata"GenerateSource"false itemthen
135133
letmoduleName=
136134
match item.GetMetadata("GeneratedModuleName")with
137-
|null-> Path.GetFileNameWithoutExtension(item.ItemSpec)
135+
|null|""-> Path.GetFileNameWithoutExtension(item.ItemSpec)
138136
| value-> value
139137
letgenerateLegacy= getBooleanMetadata"GenerateLegacyCode"false item
140138
letgenerateLiteral= getBooleanMetadata"GenerateLiterals"true item

‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
6-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>b5b8c6fd-d77d-46e6-a9c5-5d78200668cc</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<RootNamespace>Sample_VS2012_FSharp_ConsoleApp_net45</RootNamespace>
11-
<AssemblyName>Sample_VS2012_FSharp_ConsoleApp_net45</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<Name>Sample_VS2012_FSharp_ConsoleApp_net45</Name>
14-
<ProductVersion>10.0.0</ProductVersion>
15-
<UsePartialTypes>False</UsePartialTypes>
16-
</PropertyGroup>
17-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
18-
<DebugSymbols>True</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>False</Optimize>
21-
<Tailcalls>False</Tailcalls>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<WarningLevel>3</WarningLevel>
25-
<PlatformTarget>AnyCPU</PlatformTarget>
26-
<DocumentationFile>bin\Debug\Sample_VS2012_FSharp_ConsoleApp_net45.xml</DocumentationFile>
27-
<Prefer32Bit>true</Prefer32Bit>
28-
</PropertyGroup>
29-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>True</Optimize>
32-
<Tailcalls>True</Tailcalls>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<WarningLevel>3</WarningLevel>
36-
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<DocumentationFile>bin\Release\Sample_VS2012_FSharp_ConsoleApp_net45.xml</DocumentationFile>
38-
<Prefer32Bit>true</Prefer32Bit>
39-
<DebugSymbols>False</DebugSymbols>
40-
</PropertyGroup>
41-
<ItemGroup>
42-
<ReferenceInclude="mscorlib" />
43-
<ReferenceInclude="System" />
44-
<ReferenceInclude="System.Core" />
45-
<ReferenceInclude="System.Numerics" />
46-
<ReferenceInclude="FSharp.Core" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<CompileInclude="Program.fs" />
50-
<NoneInclude="App.config" />
51-
</ItemGroup>
52-
<PropertyGroup>
53-
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
54-
</PropertyGroup>
55-
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets"Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
56-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
57-
Other similar extension points exist, see Microsoft.Common.targets.
58-
<Target Name="BeforeBuild">
59-
</Target>
60-
<Target Name="AfterBuild">
61-
</Target>
62-
-->
63-
<ItemGroup>
64-
<EmbeddedResourceInclude="resource.txt" />
65-
</ItemGroup>
66-
<ItemGroup>
67-
<ContentInclude="content.txt">
68-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69-
</Content>
70-
</ItemGroup>
713
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
724
<PropertyGroup>
735
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
@@ -173,6 +105,5 @@
173105
<ReferenceInclude="System.Core" />
174106
<ReferenceInclude="System.Numerics" />
175107
</ItemGroup>
176-
<ImportProject="tools\FSharp.SRGen.targets" />
177108

178109
</Project>

0 commit comments

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