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

Commitc9f9a6d

Browse files
authored
Update BuildTask properties add signing properties, DelaySign & Publi… (#3258)
* Update BuildTask properties add signing properties, DelaySign & PublicSign* Att them to targets, case the switch correctly
1 parent3ff08d4 commitc9f9a6d

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,57 +116,58 @@ type FscCommandLineBuilder () =
116116
type[<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly")>]Fsc()as this=
117117
inherit ToolTask()
118118
let mutablebaseAddress:string=null
119+
let mutablecapturedArguments:string list=[]// list of individual args, to pass to HostObject Compile()
120+
let mutablecapturedFilenames:string list=[]// list of individual source filenames, to pass to HostObject Compile()
119121
let mutablecodePage:string=null
122+
let mutablecommandLineArgs:ITaskItem list=[]
120123
let mutabledebugSymbols=false
121124
let mutabledebugType:string=null
122125
let mutabledefineConstants:ITaskItem[]=[||]
126+
let mutabledelaySign:bool=false
123127
let mutabledisabledWarnings:string=null
124128
let mutabledocumentationFile:string=null
129+
let mutabledotnetFscCompilerPath:string=null
125130
let mutableembedAllSources=false
126131
let mutableembed:string=null
127132
let mutablegenerateInterfaceFile:string=null
133+
let mutablehighEntropyVA:bool=false
128134
let mutablekeyFile:string=null
129135
let mutablenoFramework=false
130136
let mutableoptimize:bool=true
131-
let mutabletailcalls:bool=true
132137
let mutableotherFlags:string=null
133138
let mutableoutputAssembly:string=null
134139
let mutablepdbFile:string=null
135140
let mutableplatform:string=null
136141
let mutableprefer32bit:bool=false
142+
let mutablepublicSign:bool=false
143+
let mutableprovideCommandLineArgs:bool=false
137144
let mutablereferences:ITaskItem[]=[||]
138145
let mutablereferencePath:string=null
139146
let mutableresources:ITaskItem[]=[||]
147+
let mutableskipCompilerExecution:bool=false
140148
let mutablesources:ITaskItem[]=[||]
141149
let mutablesourceLink:string=null
150+
let mutablesubsystemVersion:string=null
151+
let mutabletailcalls:bool=true
152+
let mutabletargetProfile:string=null
142153
let mutabletargetType:string=null
143154
let mutabletoolExe:string="fsc.exe"
144-
let mutablewarningLevel:string=null
145-
let mutabletreatWarningsAsErrors:bool=false
146-
let mutablewarningsAsErrors:string=null
147155
let mutabletoolPath:string=
148156
letlocationOfThisDll=
149157
try Some(System.IO.Path.GetDirectoryName(typeof<FscCommandLineBuilder>.Assembly.Location))
150158
with_-> None
151159
match FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(locationOfThisDll)with
152160
| Some s-> s
153161
| None->""
162+
let mutabletreatWarningsAsErrors:bool=false
163+
let mutablewarningsAsErrors:string=null
154164
let mutableversionFile:string=null
165+
let mutablewarningLevel:string=null
155166
let mutablewin32res:string=null
156167
let mutablewin32manifest:string=null
157168
let mutablevserrors:bool=false
158169
let mutablevslcid:string=null
159170
let mutableutf8output:bool=false
160-
let mutablesubsystemVersion:string=null
161-
let mutablehighEntropyVA:bool=false
162-
let mutabletargetProfile:string=null
163-
let mutabledotnetFscCompilerPath:string=null
164-
let mutableskipCompilerExecution:bool=false
165-
let mutableprovideCommandLineArgs:bool=false
166-
let mutablecommandLineArgs:ITaskItem list=[]
167-
168-
let mutablecapturedArguments:string list=[]// list of individual args, to pass to HostObject Compile()
169-
let mutablecapturedFilenames:string list=[]// list of individual source filenames, to pass to HostObject Compile()
170171

171172
#if ENABLE_MONO_SUPPORT
172173
// The property YieldDuringToolExecution is not available on Mono.
@@ -216,6 +217,8 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
216217
builder.AppendSwitchIfNotNull("--sig:", generateInterfaceFile)
217218
// KeyFile
218219
builder.AppendSwitchIfNotNull("--keyfile:", keyFile)
220+
if delaySignthen builder.AppendSwitch("--delaysign+")
221+
if publicSignthen builder.AppendSwitch("--publicsign+")
219222
// Optimize
220223
if optimizethen
221224
builder.AppendSwitch("--optimize+")
@@ -341,6 +344,9 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
341344
memberfsc.DebugType
342345
with get()= debugType
343346
andset(s)= debugType<- s
347+
memberfsc.DelaySign
348+
with get()= delaySign
349+
andset(s)= delaySign<- s
344350
// --nowarn <string>: Do not report the given specific warning.
345351
memberfsc.DisabledWarnings
346352
with get()= disabledWarnings
@@ -412,6 +418,9 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
412418
memberfsc.Prefer32Bit
413419
with get()= prefer32bit
414420
andset(s)= prefer32bit<- s
421+
memberfsc.PublicSign
422+
with get()= publicSign
423+
andset(s)= publicSign<- s
415424
// -r <string>: Reference an F# or .NET assembly.
416425
memberfsc.References
417426
with get()= references

‎src/fsharp/FSharp.Build/Fsc.fsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type Fsc = class
2121
member DebugSymbols: bool with get,set
2222
member DebugType: string with get,set
2323
member DefineConstants: Microsoft.Build.Framework.ITaskItem[] with get,set
24+
member DelaySign: bool with get,set
2425
member DisabledWarnings: string with get,set
2526
member DocumentationFile: string with get,set
2627
member Embed: string with get,set
@@ -29,6 +30,7 @@ type Fsc = class
2930
member KeyFile: string with get,set
3031
member NoFramework: bool with get,set
3132
member Optimize: bool with get,set
33+
member PublicSign: bool with get,set
3234
member Tailcalls: bool with get,set
3335
member OtherFlags: string with get,set
3436
member OutputAssembly: string with get,set

‎src/fsharp/FSharp.Build/Microsoft.FSharp.Targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ this file.
227227
DebugSymbols="$(DebugSymbols)"
228228
DebugType="$(DebugType)"
229229
DefineConstants="$(DefineConstants)"
230+
DelaySign="$(DelaySign)"
230231
DisabledWarnings="$(NoWarn)"
231232
DocumentationFile="$(DocumentationFile)"
232233
EmbedAllSources="$(EmbedAllSources)"
@@ -241,6 +242,7 @@ this file.
241242
PdbFile="$(PdbFile)"
242243
Platform="$(PlatformTarget)"
243244
Prefer32Bit="$(Actual32Bit)"
245+
PublicSign="$(PublicSign)"
244246
References="@(ReferencePath)"
245247
ReferencePath="$(ReferencePath)"
246248
Resources="@(ActualEmbeddedResources)"

0 commit comments

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