From aed30cb46c38c08c061b63d529cd2b22453e94fe Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 18:32:33 +0000 Subject: [PATCH 1/9] Don't enable ILLink analyzers for unsupported TFMs --- Directory.Build.props | 1 - Directory.Build.targets | 1 + docs/project/analyzers.md | 2 +- eng/{Analyzers.props => Analyzers.targets} | 4 +++- eng/illink.targets | 2 +- global.json | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) rename eng/{Analyzers.props => Analyzers.targets} (82%) diff --git a/Directory.Build.props b/Directory.Build.props index 902f793b971d2b..b23a86cd674866 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -313,7 +313,6 @@ - $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) diff --git a/Directory.Build.targets b/Directory.Build.targets index 14d08b1b18b933..3081c1fd9b0d51 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,6 +7,7 @@ false + diff --git a/docs/project/analyzers.md b/docs/project/analyzers.md index 61318e8cfe63e2..cef5cc117cee76 100644 --- a/docs/project/analyzers.md +++ b/docs/project/analyzers.md @@ -4,7 +4,7 @@ This repo relies on [.NET Compiler Platform analyzers](https://learn.microsoft.c To add an analyzer package to the build: 1. Select a package you want to employ, for example https://www.nuget.org/packages/SonarAnalyzer.CSharp/. This analyzer package's name is `SonarAnalyzer.CSharp` and the latest version as of this edit is `8.50.0.58025`. -2. Add a `PackageReference` entry to , e.g. +2. Add a `PackageReference` entry to , e.g. ```XML ``` diff --git a/eng/Analyzers.props b/eng/Analyzers.targets similarity index 82% rename from eng/Analyzers.props rename to eng/Analyzers.targets index 2af4c0cd55b2db..601d7669f85318 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.targets @@ -4,7 +4,9 @@ false - true + true diff --git a/eng/illink.targets b/eng/illink.targets index 99c7f97be8e081..09ecd7d1fe95c8 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -3,7 +3,7 @@ true - <_IsTrimmingEnabled>false + <_RequiresILLinkPack>false _EmbedILLinkXmls;$(PrepareResourcesDependsOn) $(TargetsTriggeredByCompilation);ILLinkTrimAssembly diff --git a/global.json b/global.json index 042e68f7c98b6f..912acfa3e723e5 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.100-preview.4.23260.5", + "version": "8.0.100-preview.5.23254.20", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.4.23260.5" + "dotnet": "8.0.100-preview.5.23254.20" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23281.3", From 4f77730f7b453f8afaea88d35016da29057fadf7 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 19:05:24 +0000 Subject: [PATCH 2/9] Fix EditorConfig ordering, centralize more analyzer logic --- Directory.Build.props | 5 ----- Directory.Build.targets | 1 - eng/Analyzers.targets | 7 ++++++- .../src/{Directory.Build.props => Directory.Build.targets} | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) rename src/coreclr/nativeaot/Test.CoreLib/src/{Directory.Build.props => Directory.Build.targets} (81%) diff --git a/Directory.Build.props b/Directory.Build.props index b23a86cd674866..66120a0e9db699 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -382,11 +382,6 @@ false - - - - - $(RunAnalyzers) Microsoft%AE .NET diff --git a/eng/Analyzers.targets b/eng/Analyzers.targets index 601d7669f85318..515f5888ffc303 100644 --- a/eng/Analyzers.targets +++ b/eng/Analyzers.targets @@ -1,7 +1,8 @@ - false + false + $(RunAnalyzers) + + + + diff --git a/src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.props b/src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.targets similarity index 81% rename from src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.props rename to src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.targets index 8cd614967f4a70..6bf41bdd2e1b19 100644 --- a/src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.props +++ b/src/coreclr/nativeaot/Test.CoreLib/src/Directory.Build.targets @@ -1,5 +1,5 @@ - + From 688adb5f13f7edbaaeb79b08a1d335a9955e43b1 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 19:23:00 +0000 Subject: [PATCH 3/9] Use preview6 SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 912acfa3e723e5..06f13d272bb435 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.100-preview.5.23254.20", + "version": "8.0.100-preview.6.23302.3", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.5.23254.20" + "dotnet": "8.0.100-preview.6.23302.3" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23281.3", From 5f83365929b511577d1e46ff5bd03c5a83ec8be4 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 19:39:28 +0000 Subject: [PATCH 4/9] Remove win-arm RIDs --- eng/targetingpacks.targets | 10 +++++----- src/coreclr/.nuget/Directory.Build.props | 3 --- src/coreclr/scripts/superpmi_diffs_setup.py | 1 - src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +- src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj | 2 +- src/installer/pkg/projects/netcoreappRIDs.props | 3 --- .../Microsoft.NETCore.App.Crossgen2.sfxproj | 2 +- .../tests/Assets/TestUtils/TestProjects.targets | 4 ++-- .../TestAssets/NativeExports/NativeExports.csproj | 2 +- .../Common/test_dependencies/test_dependencies.csproj | 2 +- .../test_dependencies_fs/test_dependencies.fsproj | 2 +- 11 files changed, 13 insertions(+), 20 deletions(-) diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index ebdebf46c8b678..14ceef19b704da 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -35,7 +35,7 @@ LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimeFrameworkName="$(LocalFrameworkOverrideName)" RuntimePackNamePatterns="$(LocalFrameworkOverrideName).Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="$(LocalFrameworkOverrideName).Ref" TargetingPackVersion="$(ProductVersion)" @@ -45,20 +45,20 @@ RuntimeFrameworkName="$(LocalFrameworkOverrideName)" LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimePackNamePatterns="$(LocalFrameworkOverrideName).Runtime.Mono.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86;browser-wasm;wasi-wasm;ios-arm64;iossimulator-arm64;iossimulator-x64;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;android-arm64;android-arm;android-x64;android-x86" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86;browser-wasm;wasi-wasm;ios-arm64;iossimulator-arm64;iossimulator-x64;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;android-arm64;android-arm;android-x64;android-x86" RuntimePackLabels="Mono" Condition="'@(KnownRuntimePack)' == '' or !@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))"/> @@ -67,7 +67,7 @@ ExcludedRuntimeIdentifiers="android" AppHostPackNamePattern="$(LocalFrameworkOverrideName).Host.**RID**" AppHostPackVersion="$(ProductVersion)" - AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" + AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" TargetFramework="$(NetCoreAppCurrent)" Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" /> diff --git a/src/coreclr/.nuget/Directory.Build.props b/src/coreclr/.nuget/Directory.Build.props index 150e9ccfb0b82b..885f7f10739850 100644 --- a/src/coreclr/.nuget/Directory.Build.props +++ b/src/coreclr/.nuget/Directory.Build.props @@ -110,9 +110,6 @@ x86 - - arm - arm64 diff --git a/src/coreclr/scripts/superpmi_diffs_setup.py b/src/coreclr/scripts/superpmi_diffs_setup.py index db12452de8d86e..c54de696ccd972 100644 --- a/src/coreclr/scripts/superpmi_diffs_setup.py +++ b/src/coreclr/scripts/superpmi_diffs_setup.py @@ -171,7 +171,6 @@ def build_jit_analyze(coreclr_args, source_directory, jit_analyze_build_director # The RID catalog is here: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog. # Windows x64 => win-x64 # Windows x86 => win-x86 - # Windows arm32 => win-arm # Windows arm64 => win-arm64 # Linux x64 => linux-x64 # Linux arm32 => linux-arm diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index 464aa2bc429075..ceeb4d63ad0c1e 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -8,7 +8,7 @@ false true - linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm + linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64 $(PackageRID) false true diff --git a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj index c3d3fc03766719..ac3720d4f7e059 100644 --- a/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj +++ b/src/coreclr/tools/dotnet-pgo/dotnet-pgo.csproj @@ -13,7 +13,7 @@ true true dotnet-pgo - win-x64;win-x86;win-arm;osx-x64 + win-x64;win-x86;osx-x64 $(OutputPath) false .NET Performance Guided Optimization Tool diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props index fbc6e4dc4c1a98..4c73b3dcb3c2b5 100644 --- a/src/installer/pkg/projects/netcoreappRIDs.props +++ b/src/installer/pkg/projects/netcoreappRIDs.props @@ -17,9 +17,6 @@ x86 - - arm - arm64 diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj index c28c6ea8fb53ca..322bcf1d1cc85d 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -12,7 +12,7 @@ dotnet-crossgen2 crossgen2 - linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm + linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64 false tools/ true diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets index 3aaec8fbd355aa..bb5740e9b240ec 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.targets +++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets @@ -15,7 +15,7 @@ LatestRuntimeFrameworkVersion="7.0.0" RuntimeFrameworkName="Microsoft.NETCore.App" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="7.0.0" @@ -25,7 +25,7 @@ ExcludedRuntimeIdentifiers="android" AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" AppHostPackVersion="7.0.0" - AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" + AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" TargetFramework="$(NetCoreAppCurrent)" Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" /> diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj index 4ba1f17dd095ef..515dd2430360b2 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj @@ -29,7 +29,7 @@ ExcludedRuntimeIdentifiers="android" AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" AppHostPackVersion="7.0.0" - AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" + AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86" TargetFramework="$(NetCoreAppCurrent)" Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" /> diff --git a/src/tests/Common/test_dependencies/test_dependencies.csproj b/src/tests/Common/test_dependencies/test_dependencies.csproj index 454e4003f0c20f..112944f3544cf2 100644 --- a/src/tests/Common/test_dependencies/test_dependencies.csproj +++ b/src/tests/Common/test_dependencies/test_dependencies.csproj @@ -5,7 +5,7 @@ $(NetCoreAppToolCurrent) true true - win-arm;win-arm64;win-x64;win-x86;$(OutputRID) + win-arm64;win-x64;win-x86;$(OutputRID) true diff --git a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj index b7e9dde969981d..02551ebf2ae3e6 100644 --- a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj +++ b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj @@ -5,7 +5,7 @@ $(NetCoreAppToolCurrent) true true - win-arm;win-arm64;win-x64;win-x86;$(OutputRID) + win-arm64;win-x64;win-x86;$(OutputRID) true From a45319061e5f8ce5d8911129b9dc25c97a0f5131 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 20:03:30 +0000 Subject: [PATCH 5/9] Fix circular dependency --- src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj index ff511c3b065f59..528e4b12e10328 100644 --- a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -22,6 +22,8 @@ false false $(TargetsForTfmSpecificContentInPackage);AddBuildOutputToToolsPackage + + false From 150ac2d03600b8f21fd0cbdd066f67513ff0539d Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 20:45:03 +0000 Subject: [PATCH 6/9] Revert global.json change --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 06f13d272bb435..042e68f7c98b6f 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.100-preview.6.23302.3", + "version": "8.0.100-preview.4.23260.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.6.23302.3" + "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23281.3", From c676478128df181e102b26f048d61013f26ff9c4 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 2 Jun 2023 22:29:05 +0000 Subject: [PATCH 7/9] Keep build working with preview 4 --- eng/illink.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/illink.targets b/eng/illink.targets index 09ecd7d1fe95c8..c837c96e51dc47 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -2,7 +2,10 @@ true - + + <_IsTrimmingEnabled>false + <_RequiresILLinkPack>false _EmbedILLinkXmls;$(PrepareResourcesDependsOn) $(TargetsTriggeredByCompilation);ILLinkTrimAssembly From f9777835439d04154f1ae7cf2bb3687c560ee86b Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Mon, 5 Jun 2023 08:50:56 -0700 Subject: [PATCH 8/9] Update eng/Analyzers.targets Co-authored-by: Viktor Hofer --- eng/Analyzers.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Analyzers.targets b/eng/Analyzers.targets index 515f5888ffc303..9a85f1302ff3aa 100644 --- a/eng/Analyzers.targets +++ b/eng/Analyzers.targets @@ -7,7 +7,7 @@ true + '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">true From 6b898056815111c67e57b0946377173cb111f5fb Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Mon, 5 Jun 2023 09:45:03 -0700 Subject: [PATCH 9/9] Update eng/Analyzers.targets Co-authored-by: Viktor Hofer --- eng/Analyzers.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Analyzers.targets b/eng/Analyzers.targets index 9a85f1302ff3aa..4ca3df7737280a 100644 --- a/eng/Analyzers.targets +++ b/eng/Analyzers.targets @@ -1,7 +1,7 @@ - false + false $(RunAnalyzers)