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

Commit4462b3a

Browse files
committed
consolidate assembly attribute writing
1 parent0adb823 commit4462b3a

File tree

4 files changed

+17
-105
lines changed

4 files changed

+17
-105
lines changed

‎FSharp.Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
</PropertyGroup>
1010

1111
<ImportProject="build\targets\AssemblyVersions.props" />
12-
<ImportProject="build\targets\GitHash.props" />
1312
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
1413
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
1514

‎build/targets/AssemblyAttributes.targets‎

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

‎build/targets/GenerateAssemblyAttributes.targets‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<Project>
22

3+
<ImportProject="GitHash.props" />
4+
35
<TargetName="GenerateAssemblyFileVersion"
4-
BeforeTargets="CoreCompile">
6+
BeforeTargets="CoreCompile"
7+
Condition="'$(Configuration)' != 'Proto'">
58

69
<PropertyGroup>
710
<GeneratedFSharpAssemblyVersionFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyVersionFile>
@@ -41,6 +44,17 @@
4144
</_AssemblyVersionAttributes>
4245
</ItemGroup>
4346

47+
<WriteCodeFragmentAssemblyAttributes="@(_AssemblyVersionAttributes)"
48+
Language="$(Language)"
49+
OutputFile="$(GeneratedFSharpAssemblyVersionFile)"
50+
Condition="'$(_UseWriteCodeFragmentHack)' != 'true'">
51+
<!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings)-->
52+
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(Language)' != 'F#' or '$(AssemblyName)' == 'FSharp.Core'" />
53+
<!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file-->
54+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(Language)' == 'F#' and '$(AssemblyName)' != 'FSharp.Core'" />
55+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
56+
</WriteCodeFragment>
57+
4458
<ItemGroupCondition="'$(_UseWriteCodeFragmentHack)' == 'true'">
4559
<_LinesToWriteInclude="//&lt;auto-generated&gt;" />
4660
<_LinesToWriteInclude="namespace FSharp" />
@@ -54,17 +68,6 @@
5468
<FileWritesInclude="$(GeneratedFSharpAssemblyVersionFile)" />
5569
</ItemGroup>
5670

57-
<WriteCodeFragmentAssemblyAttributes="@(_AssemblyVersionAttributes)"
58-
Language="$(Language)"
59-
OutputFile="$(GeneratedFSharpAssemblyVersionFile)"
60-
Condition="'$(_UseWriteCodeFragmentHack)' != 'true'">
61-
<!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings)-->
62-
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(Language)' != 'F#' or '$(AssemblyName)' == 'FSharp.Core'" />
63-
<!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file-->
64-
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(Language)' == 'F#' and '$(AssemblyName)' != 'FSharp.Core'" />
65-
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
66-
</WriteCodeFragment>
67-
6871
<WriteLinesToFileFile="$(GeneratedFSharpAssemblyVersionFile)"
6972
Lines="@(_LinesToWrite)"
7073
Overwrite="true"

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<RepoRoot>$(MSBuildThisFileDirectory)..\</RepoRoot>
77
</PropertyGroup>
88

9-
<ImportProject="..\build\targets\GitHash.props" />
10-
119
<PropertyGroup>
1210
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
1311
</PropertyGroup>
@@ -338,7 +336,8 @@
338336

339337
</Target>
340338

341-
<ImportProject="..\build\targets\AssemblyAttributes.targets" />
339+
<ImportProject="..\build\targets\GenerateAssemblyAttributes.targets" />
340+
<ImportProject="..\build\targets\GenerateInternalsVisibleTo.targets" />
342341

343342
<UsingTaskTaskName="ReplaceFileText"TaskFactory="CodeTaskFactory"AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
344343
<ParameterGroup>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp