diff --git a/eng/illink.targets b/eng/illink.targets index f56f799fcfcc6..0dca1cd421991 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -27,12 +27,11 @@ $(IntermediateOutputPath)ILLink.Substitutions.xml $(IntermediateOutputPath)ILLink.LinkAttributes.xml - $(ILLinkDirectory)ILLink.Suppressions - $(ILLinkSuppressionsXmlFilePrefix).xml - $(ILLinkSuppressionsXmlFilePrefix).$(Configuration).xml - $(ILLinkSuppressionsXmlFilePrefix).LibraryBuild.xml + $(ILLinkDirectory)ILLink.Suppressions + $(ILLinkSuppressionsXmlPrefix).xml + $(ILLinkSuppressionsXmlPrefix).$(Configuration).xml - false + false true @@ -41,13 +40,15 @@ true - - - - + + + + + + @@ -210,25 +211,15 @@ $(ILLinkArgs) -x "$(ILLinkDescriptorsLibraryBuildXml)" $(ILLinkArgs) --substitutions "$(ILLinkSubstitutionsLibraryBuildXml)" + $(ILLinkArgs) --link-attributes "@(ILLinkSuppressionsLibraryBuildXml->'%(FullPath)', '" --link-attributes "')" - IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2050 - - $(LinkerNoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061 - - $(LinkerNoWarn);IL2062;IL2063;IL2064;IL2065;IL2066 - - $(LinkerNoWarn);IL2067;IL2068;IL2069;IL2070;IL2071;IL2072;IL2073;IL2074;IL2075;IL2076;IL2077;IL2078;IL2079;IL2080;IL2081;IL2082;IL2083;IL2084;IL2085;IL2086;IL2087;IL2088;IL2089;IL2090;IL2091 - - $(LinkerNoWarn);IL2121 + $(LinkerNoWarn);IL2008;IL2009;IL2121;IL2025;IL2035 $(ILLinkArgs) --nowarn $(LinkerNoWarn) $(ILLinkArgs) --disable-opt ipconstprop diff --git a/eng/testing/tests.browser.targets b/eng/testing/tests.browser.targets index c1eaa6c0817db..ea561e42ccaff 100644 --- a/eng/testing/tests.browser.targets +++ b/eng/testing/tests.browser.targets @@ -60,7 +60,7 @@ So, set those parameters explicitly here. --> - <_ExtraTrimmerArgs Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.LegacyJsInterop.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.LegacyJsInterop.xml" diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 2d7ff9622aa6d..e76f1acb374cd 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -64,8 +64,8 @@ So, set those parameters explicitly here. --> - <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' == 'true' and '$(RunAOTCompilation)' == 'true'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.WasmIntrinsics.xml" - <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' != 'true'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.NoWasmIntrinsics.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' == 'true' and '$(RunAOTCompilation)' == 'true'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.WasmIntrinsics.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' != 'true'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.NoWasmIntrinsics.xml" diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.targets.template b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.targets.template index ebb865af5582e..7cd5c90e14374 100644 --- a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.targets.template +++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.targets.template @@ -77,7 +77,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_ilResourceReference>%(ILResourceReference.FullPath) - <_IldasmCommand>"$(_IldasmDir)ildasm" + <_IldasmCommand>"$(_IldasmDir)ildasm" <_IldasmCommand>$(_IldasmCommand) "$(_ilResourceReference)" <_IldasmCommand>$(_IldasmCommand) /OUT="$(IntermediateOutputPath)/$(MSBuildProjectName).ref.il" diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems index 7a2cbf5b43460..1c1d6d3530110 100644 --- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems +++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems @@ -67,6 +67,7 @@ + $(ILLinkSharedDirectory)ILLink.Descriptors.LibraryBuild.xml diff --git a/src/libraries/oob.proj b/src/libraries/oob.proj index b879127a13a81..34823cd1ba4fe 100644 --- a/src/libraries/oob.proj +++ b/src/libraries/oob.proj @@ -55,7 +55,7 @@ $(ILLinkArgs) $(ILLinkArgs) --nowarn IL2121 - $(OOBILLinkArgs) --link-attributes "@(OOBLibrarySuppressionsXml->'%(FullPath)', '" --link-attributes "')" + $(OOBILLinkArgs) --link-attributes "@(OOBLibrarySuppressionsXml->'%(FullPath)', '" --link-attributes "')" diff --git a/src/libraries/sfx.proj b/src/libraries/sfx.proj index 278b269eb219b..9b174d57c90f0 100644 --- a/src/libraries/sfx.proj +++ b/src/libraries/sfx.proj @@ -98,7 +98,7 @@ $(ILLinkArgs) $(SharedFrameworkILLinkArgs) -b true - $(SharedFrameworkILLinkArgs) --link-attributes "@(SharedFrameworkSuppressionsXml, '" --link-attributes "')" + $(SharedFrameworkILLinkArgs) --link-attributes "@(SharedFrameworkSuppressionsXml, '" --link-attributes "')" diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 1de2f40fdbace..7e7453a432649 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -263,8 +263,8 @@ - <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]" - <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" + <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]" + <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" <_EmccExportedFunctions>@(EmccExportedFunction -> '%(Identity)',',') 16777216 5MB diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index bded4ae2b4499..7ca72154951a9 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -46,9 +46,9 @@ <_WasmGenerateAppBundleDependsOn>_GetWasmGenerateAppBundleDependencies;$(_WasmGenerateAppBundleDependsOn) - <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' == 'true' and '$(RunAOTCompilation)' == 'true'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.WasmIntrinsics.xml" - <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' != 'true'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.NoWasmIntrinsics.xml" - <_ExtraTrimmerArgs Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.LegacyJsInterop.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' == 'true' and '$(RunAOTCompilation)' == 'true'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.WasmIntrinsics.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableSIMD)' != 'true'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.NoWasmIntrinsics.xml" + <_ExtraTrimmerArgs Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(_ExtraTrimmerArgs) --substitutions "$(MSBuildThisFileDirectory)ILLink.Substitutions.LegacyJsInterop.xml" true emcc @@ -427,8 +427,8 @@ <_WasmSIMDLib Condition="'$(WasmEnableSIMD)' != 'true'">libmono-wasm-nosimd.a <_WasmSIMDLibToExclude Condition="'$(WasmEnableSIMD)' != 'true'">libmono-wasm-simd.a <_WasmSIMDLibToExclude Condition="'$(WasmEnableSIMD)' == 'true'">libmono-wasm-nosimd.a - <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]" - <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" + <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]" + <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" <_EmccExportedFunctions>@(EmccExportedFunction -> '%(Identity)',',')