Skip to content

Commit 73f38e4

Browse files
KevinRansombrettfo
authored andcommitted
Relax --noframework for mscorlib, netstandard and system.runtime (#7612)
* Eliminate Relax requirement to apply --noframework when referencing mscorlib/system.runtime.dll/netstandard.dll * Relax requirement to pass --noframework with System.Runtime, netstandard and mscorlib.dll
1 parent b834b12 commit 73f38e4

17 files changed

+0
-77
lines changed

FSharp.Profiles.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@
55
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
8-
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
98
</PropertyGroup>
109

1110
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1211
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1312
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
1413
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
1814
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
1915
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
2016
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>

src/fsharp/CompileOps.fs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2589,12 +2589,6 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
25892589
| Some _ -> dllReference
25902590
| None -> AssemblyReference(range0, getDefaultFSharpCoreReference, None)
25912591

2592-
// If either mscorlib.dll/System.Runtime.dll/netstandard.dll or FSharp.Core.dll are explicitly specified then we require the --noframework flag.
2593-
// The reason is that some non-default frameworks may not have the default dlls. For example, Client profile does
2594-
// not have System.Web.dll.
2595-
do if (primaryAssemblyExplicitFilenameOpt.IsSome && data.framework) then
2596-
error(Error(FSComp.SR.buildExplicitCoreLibRequiresNoFramework("--noframework"), rangeStartup))
2597-
25982592
// clrRoot: the location of the primary assembly (mscorlib.dll or netstandard.dll or System.Runtime.dll)
25992593
//
26002594
// targetFrameworkVersionValue: Normally just HighestInstalledNetFrameworkVersion()

src/fsharp/DotNetFrameworkDependencies.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies
182182
// (a) included in the environment used for all .fsx files (see service.fs)
183183
// (b) included in environment for files 'orphaned' from a project context
184184
// -- for orphaned files (files in VS without a project context)
185-
// -- for files given on a command line without --noframework set
186185
let getDesktopDefaultReferences useFsiAuxLib = [
187186
yield "mscorlib"
188187
yield "System"

src/fsharp/FSComp.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,6 @@ lexIndentOffForML,"Consider using a file with extension '.ml' or '.mli' instead"
10861086
1219,tcUnionCaseNameConflictsWithGeneratedType,"The union case named '%s' conflicts with the generated type '%s'"
10871087
1220,chkNoReflectedDefinitionOnStructMember,"ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter"
10881088
1221,tcDllImportNotAllowed,"DLLImport bindings must be static members in a class or function definitions in a module"
1089-
1222,buildExplicitCoreLibRequiresNoFramework,"When mscorlib.dll is explicitly referenced the %s option must also be passed"
10901089
1223,buildExpectedSigdataFile,"FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required."
10911090
1225,buildExpectedFileAlongSideFSharpCore,"File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required."
10921091
1227,buildUnexpectedFileNameCharacter,"Filename '%s' contains invalid character '%s'"

src/fsharp/xlf/FSComp.txt.cs.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">Vazby DLLImport musí být statickými členy v definici třídy nebo funkce v modulu.</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">Pokud se na knihovnu mscorlib.dll nebo FSharp.Core.dll odkazuje explicitně, musí se předávat taky možnost {0}.</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">V FSharp.Core se nenašel soubor FSharp.Core.sigdata. Soubor se očekával v {0}. Zvažte upgrade na novější verzi FSharp.Core, kde se tento soubor už nevyžaduje.</target>

src/fsharp/xlf/FSComp.txt.de.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">Bei DLLImport-Bindungen muss es sich um statische Member von Klassen- oder Funktionsdefinitionen eines Moduls handeln.</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">Wenn explizit auf "mscorlib.dll" oder "FSharp.Core.dll" verwiesen wird, muss auch die Option "{0}" übergeben werden.</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">FSharp.Core.sigdata wurde nicht neben "FSharp.Core" gefunden. Die Datei wurde in {0} erwartet. Erwägen Sie ein Upgrade auf eine aktuellere Version von "FSharp.Core", in der die Datei nicht mehr erforderlich ist.</target>

src/fsharp/xlf/FSComp.txt.es.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">Los enlaces DLLImport deben ser miembros estáticos en definiciones de función o clase dentro de un módulo.</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">Cuando se hace referencia de forma explícita a mscorlib.dll o FSharp.Core.dll, debe pasarse también la opción {0}.</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">No se encontró FSharp.Core.sigdata junto con FSharp.Core. Archivo esperado en {0}. Considere la posibilidad de actualizar a una versión más reciente de FSharp.Core en la que ya no se requiere el archivo.</target>

src/fsharp/xlf/FSComp.txt.fr.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">Les liaisons DLLImport doivent être des membres statiques dans une classe ou des définitions de fonction dans un module</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">Lorsque mscorlib.dll ou FSharp.Core.dll est explicitement référencé, l'option {0} doit également être passée</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">FSharp.Core.sigdata introuvable avec FSharp.Core. Fichier attendu dans {0}. Effectuez une mise à niveau vers une version plus récente de FSharp.Core, où ce fichier n'est plus nécessaire.</target>

src/fsharp/xlf/FSComp.txt.it.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">I binding DLLImport devono essere membri statici in una classe o definizioni di funzione in un modulo</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">Quando si fa riferimento in modo esplicito a mscorlib.dll o FSharp.Core.dll è necessario passare anche l'opzione {0}</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">Il file FSharp.Core.sigdata non è stato trovato con FSharp.Core. Il file deve trovarsi in {0}. Provare a eseguire l'aggiornamento a una versione più recente di FSharp.Core, in cui questo file non è più obbligatorio.</target>

src/fsharp/xlf/FSComp.txt.ja.xlf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,11 +5322,6 @@
53225322
<target state="translated">DLLImport 束縛はモジュール内のクラスまたは関数定義の静的メンバーであることが必要です</target>
53235323
<note />
53245324
</trans-unit>
5325-
<trans-unit id="buildExplicitCoreLibRequiresNoFramework">
5326-
<source>When mscorlib.dll is explicitly referenced the {0} option must also be passed</source>
5327-
<target state="needs-review-translation">mscorlib.dll または FSharp.Core.dll が明示的に参照される場合は、{0} オプションも渡す必要があります</target>
5328-
<note />
5329-
</trans-unit>
53305325
<trans-unit id="buildExpectedSigdataFile">
53315326
<source>FSharp.Core.sigdata not found alongside FSharp.Core. File expected in {0}. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required.</source>
53325327
<target state="translated">FSharp.Core と同じ場所に FSharp.Core.sigdata が見つかりません。ファイルは {0} にある必要があります。このファイルを必要としない、より新しいバージョンの FSharp.Core にアップグレードすることをご検討ください。</target>

0 commit comments

Comments
 (0)