From 754a554c0072ccb2013bbf7e0952ded8a44b56f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 25 Jan 2024 15:19:26 +0100 Subject: [PATCH] Set FlagNetStandard1XDependencies=true and fix issues (#96795) The only product change is upgrading Microsoft.DiaSymReader from 1.4.0 to 2.0.0 in ILCompiler.TypeSystem.csproj, the rest are test changes. --- eng/Versions.props | 9 +- eng/testing/xunit/xunit.targets | 7 - .../ILCompiler.Reflection.ReadyToRun.csproj | 2 +- .../ILCompiler.Trimming.Tests.csproj | 5 +- .../ILCompiler.TypeSystem.csproj | 4 +- .../HostActivation.Tests.csproj | 4 - .../tests/TestUtilities/TestUtilities.csproj | 2 - ...ndencyInjection.Specification.Tests.csproj | 6 - ...yInjection.ExternalContainers.Tests.csproj | 3 + .../tests/DependencyContextBuilderTests.cs | 436 ------------------ ...ft.Extensions.DependencyModel.Tests.csproj | 2 - ...sions.Logging.Generators.Roslyn3.11.csproj | 2 + ...nsions.Logging.Generators.Roslyn4.0.csproj | 2 + ...Logging.Generators.Roslyn3.11.Tests.csproj | 2 + ....Logging.Generators.Roslyn4.0.Tests.csproj | 2 + .../System.Collections.Immutable.Tests.csproj | 2 +- ...rinsicsInSystemPrivateCoreLib.Tests.csproj | 5 + .../JSImportGenerator.Unit.Tests.csproj | 6 + .../ComInterfaceGenerator.Unit.Tests.csproj | 5 + .../LibraryImportGenerator.Unit.Tests.csproj | 5 + .../SerializationTypes.csproj | 2 +- ...xt.Json.SourceGeneration.Roslyn3.11.csproj | 2 + ...ext.Json.SourceGeneration.Roslyn4.0.csproj | 2 + ...em.Text.Json.TestLibrary.Roslyn3.11.csproj | 5 + ...rceGeneration.Roslyn3.11.Unit.Tests.csproj | 2 + ...ystem.Text.RegularExpressions.Tests.csproj | 6 + .../DebuggerTestSuite.csproj | 3 + src/tests/Common/external/external.csproj | 2 +- .../ILLink.RoslynAnalyzer.Tests.csproj | 5 + 29 files changed, 73 insertions(+), 467 deletions(-) delete mode 100644 src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextBuilderTests.cs diff --git a/eng/Versions.props b/eng/Versions.props index d444bef6c0c4c..dd1fd5130b49d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,6 +23,7 @@ false false + true true @@ -129,6 +130,7 @@ 5.0.0 4.5.5 7.0.0 + 7.0.0 6.0.0 5.0.0 5.0.0 @@ -163,6 +165,7 @@ 1.0.0-prerelease.24071.2 1.0.0-prerelease.24071.2 + 2.0.0 16.11.29-beta1.23404.4 2.0.0-beta4.23407.1 3.1.7 @@ -186,7 +189,7 @@ 9.0.0-prerelease.24066.3 9.0.0-alpha.0.24065.1 3.12.0 - 4.1.0 + 4.5.0 6.0.0 13.0.3 1.0.2 @@ -194,6 +197,7 @@ 4.18.4 6.7.0 2.14.3 + 2.9.1 3.19.4 2.46.0 @@ -203,6 +207,9 @@ 2.45.0 2.45.0 1.1.2-beta1.23323.1 + 1.7.2 + 10.2.0 + 17.0.46 8.0.0-preview-20230918.1 diff --git a/eng/testing/xunit/xunit.targets b/eng/testing/xunit/xunit.targets index e72ebd444ad83..3a9fc1a0da846 100644 --- a/eng/testing/xunit/xunit.targets +++ b/eng/testing/xunit/xunit.targets @@ -1,11 +1,4 @@ - - - - - true true diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj index 032944c103350..34a1cfed3463b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj index b8455700bc57d..508575ebce3b2 100644 --- a/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj +++ b/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj @@ -15,10 +15,11 @@ - + + - + diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj index c528fb3c67340..268e2e6b1248d 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj @@ -28,9 +28,7 @@ - - 1.4.0 - + diff --git a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj index 9724d3326e75a..f335c8c509ee5 100644 --- a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj +++ b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj @@ -15,8 +15,4 @@ - - - - diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj index 2a09abb5e79f6..1566f163697bc 100644 --- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj +++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj @@ -108,8 +108,6 @@ - - diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 13eefea9b5abe..af88313e6c130 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -21,12 +21,6 @@ - - - diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index ef3967f7d162e..07eea0b402195 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -4,6 +4,9 @@ $(NetCoreAppCurrent);$(NetFrameworkMinimum) true $(NoWarn);CS8002 + + + false diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextBuilderTests.cs b/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextBuilderTests.cs deleted file mode 100644 index b6f64911bcf5c..0000000000000 --- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextBuilderTests.cs +++ /dev/null @@ -1,436 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using FluentAssertions; -using Microsoft.DotNet.ProjectModel; -using Microsoft.DotNet.ProjectModel.Compilation; -using Microsoft.DotNet.ProjectModel.Graph; -using NuGet.Frameworks; -using NuGet.Versioning; -using Xunit; - -namespace Microsoft.Extensions.DependencyModel.Tests -{ - public class DependencyContextBuilderTests - { - private string _referenceAssembliesPath = Path.Combine("reference", "assemblies"); - private NuGetFramework _defaultFramework; - private string _defaultName = "Library.Name"; - private string _defaultHash = "Hash"; - private NuGetVersion _defaultVersion = new NuGetVersion(1, 2, 3, new []{"dev"}, string.Empty); - - public DependencyContext Build(CommonCompilerOptions compilerOptions = null, - IEnumerable compilationExports = null, - IEnumerable runtimeExports = null, - bool portable = false, - NuGetFramework target = null, - string runtime = null) - { - _defaultFramework = NuGetFramework.Parse("net451"); - return new DependencyContextBuilder(_referenceAssembliesPath).Build( - compilerOptions, - compilationExports ?? new LibraryExport[] { }, - runtimeExports ?? new LibraryExport[] {}, - portable, - target ?? _defaultFramework, - runtime ?? string.Empty); - } - - [Fact] - public void PreservesCompilationOptions() - { - var context = Build(new CommonCompilerOptions() - { - AllowUnsafe = true, - Defines = new[] { "Define", "D" }, - DelaySign = true, - EmitEntryPoint = true, - GenerateXmlDocumentation = true, - KeyFile = "Key.snk", - LanguageVersion = "C#8", - Optimize = true, - Platform = "Platform", - PublicSign = true, - WarningsAsErrors = true - }); - - context.CompilationOptions.AllowUnsafe.Should().Be(true); - context.CompilationOptions.DelaySign.Should().Be(true); - context.CompilationOptions.EmitEntryPoint.Should().Be(true); - context.CompilationOptions.GenerateXmlDocumentation.Should().Be(true); - context.CompilationOptions.Optimize.Should().Be(true); - context.CompilationOptions.PublicSign.Should().Be(true); - context.CompilationOptions.WarningsAsErrors.Should().Be(true); - - context.CompilationOptions.Defines.Should().BeEquivalentTo(new[] { "Define", "D" }); - context.CompilationOptions.KeyFile.Should().Be("Key.snk"); - context.CompilationOptions.LanguageVersion.Should().Be("C#8"); - context.CompilationOptions.Platform.Should().Be("Platform"); - } - - - [Fact] - public void AlowsNullCompilationOptions() - { - var context = Build(compilerOptions: null); - - context.CompilationOptions.Should().Be(CompilationOptions.Default); - } - - [Fact] - public void SetsPortableFlag() - { - var context = Build(portable: true); - - context.Target.IsPortable.Should().BeTrue(); - } - - [Fact] - public void FillsRuntimeAndTarget() - { - var context = Build(target: new NuGetFramework("SomeFramework",new Version(1,2)), runtime: "win8-x86"); - context.Target.Runtime.Should().Be("win8-x86"); - context.Target.Framework.Should().Be("SomeFramework,Version=v1.2"); - } - - [Fact] - public void SetsServiceableToTrueForPackageDescriptions() - { - var context = Build(runtimeExports: new[] - { - Export(PackageDescription("Pack.Age", servicable: false)) - }); - - var lib = context.RuntimeLibraries.Single(); - lib.Serviceable.Should().BeTrue(); - } - - [Fact] - public void TakesServicableFromPackageDescription() - { - var context = Build(runtimeExports: new[] - { - Export(PackageDescription("Pack.Age", servicable: true)) - }); - - var lib = context.RuntimeLibraries.Single(); - lib.Serviceable.Should().BeTrue(); - } - - [Fact] - public void FillsRuntimeLibraryProperties() - { - var context = Build(runtimeExports: new[] - { - Export( - PackageDescription( - "Pack.Age", - servicable: true, - hash: "Hash", - version: new NuGetVersion(1, 2, 3), - dependencies: new[] - { - new LibraryRange("System.Collections", - new VersionRange(new NuGetVersion(2, 1, 2)), - LibraryType.ReferenceAssembly, - LibraryDependencyType.Default) - }, - path: "path/TO/package", - hashPath: "Pack.Age.1.2.3.nupkg.sha512"), - resourceAssemblies: new[] - { - new LibraryResourceAssembly( - new LibraryAsset("Dll", "en-US/Pack.Age.resources.dll", ""), - "en-US" - ) - }, - runtimeAssemblyGroups: new[] - { - new LibraryAssetGroup( - new LibraryAsset("Dll", "lib/Pack.Age.dll", "")), - new LibraryAssetGroup("win8-x64", - new LibraryAsset("Dll", "win8-x64/Pack.Age.dll", "")) - }, - nativeLibraryGroups: new [] - { - new LibraryAssetGroup("win8-x64", - new LibraryAsset("Dll", "win8-x64/Pack.Age.native.dll", "")) - }), - Export( - ReferenceAssemblyDescription("System.Collections", - version: new NuGetVersion(3, 3, 3)), - runtimeAssemblyGroups: new[] - { - new LibraryAssetGroup( - new LibraryAsset("Dll", "System.Collections.dll", "System.Collections.dll")) - }) - }); - - context.RuntimeLibraries.Should().HaveCount(2); - - var lib = context.RuntimeLibraries.Should().Contain(l => l.Name == "Pack.Age").Subject; - lib.Type.Should().Be("package"); - lib.Serviceable.Should().BeTrue(); - lib.Hash.Should().Be("sha512-Hash"); - lib.Version.Should().Be("1.2.3"); - lib.Dependencies.Should().OnlyContain(l => l.Name == "System.Collections" && l.Version == "3.3.3"); - lib.ResourceAssemblies.Should().OnlyContain(l => l.Path == "en-US/Pack.Age.resources.dll" && l.Locale == "en-US"); - - // When ProjectModel supports path and hashPath in the lock file library, this should assert the values - // provided above. - lib.Path.Should().BeNull(); - lib.HashPath.Should().BeNull(); - - lib.RuntimeAssemblyGroups.GetDefaultAssets().Should().OnlyContain(l => l == "lib/Pack.Age.dll"); - lib.RuntimeAssemblyGroups.GetRuntimeAssets("win8-x64").Should().OnlyContain(l => l == "win8-x64/Pack.Age.dll"); - lib.NativeLibraryGroups.GetRuntimeAssets("win8-x64").Should().OnlyContain(l => l == "win8-x64/Pack.Age.native.dll"); - - var asm = context.RuntimeLibraries.Should().Contain(l => l.Name == "System.Collections").Subject; - asm.Type.Should().Be("referenceassembly"); - asm.Version.Should().Be("3.3.3"); - asm.Hash.Should().BeEmpty(); - asm.Dependencies.Should().BeEmpty(); - asm.RuntimeAssemblyGroups.GetDefaultAssets().Should().OnlyContain(l => l == "System.Collections.dll"); - asm.Path.Should().BeNull(); - asm.HashPath.Should().BeNull(); - } - - [Fact] - public void FiltersDuplicatedDependencies() - { - var context = Build(runtimeExports: new[] - { - Export(PackageDescription("Pack.Age", - dependencies: new[] - { - new LibraryRange("System.Collections", - new VersionRange(new NuGetVersion(2, 0, 0)), - LibraryType.ReferenceAssembly, - LibraryDependencyType.Default), - new LibraryRange("System.Collections", - new VersionRange(new NuGetVersion(2, 1, 2)), - LibraryType.Package, - LibraryDependencyType.Default) - }) - ), - Export(ReferenceAssemblyDescription("System.Collections", - version: new NuGetVersion(2, 0, 0))) - }); - - context.RuntimeLibraries.Should().HaveCount(2); - - var lib = context.RuntimeLibraries.Should().Contain(l => l.Name == "Pack.Age").Subject; - lib.Dependencies.Should().HaveCount(1); - lib.Dependencies.Should().OnlyContain(l => l.Name == "System.Collections" && l.Version == "2.0.0"); - } - - [Fact] - public void FillsCompileLibraryProperties() - { - var context = Build(compilationExports: new[] - { - Export(PackageDescription("Pack.Age", - servicable: true, - hash: "Hash", - version: new NuGetVersion(1, 2, 3), - dependencies: new[] - { - new LibraryRange("System.Collections", - new VersionRange(new NuGetVersion(2, 1, 2)), - LibraryType.ReferenceAssembly, - LibraryDependencyType.Default) - }, - path: "path/TO/package", - hashPath: "Pack.Age.1.2.3.nupkg.sha512"), - compilationAssemblies: new[] - { - new LibraryAsset("Dll", "lib/Pack.Age.dll", ""), - } - ), - Export(ReferenceAssemblyDescription("System.Collections", - version: new NuGetVersion(3, 3, 3)), - compilationAssemblies: new[] - { - new LibraryAsset("Dll", "", "System.Collections.dll"), - }) - }); - - context.CompileLibraries.Should().HaveCount(2); - - var lib = context.CompileLibraries.Should().Contain(l => l.Name == "Pack.Age").Subject; - lib.Type.Should().Be("package"); - lib.Serviceable.Should().BeTrue(); - lib.Hash.Should().Be("sha512-Hash"); - lib.Version.Should().Be("1.2.3"); - lib.Dependencies.Should().OnlyContain(l => l.Name == "System.Collections" && l.Version == "3.3.3"); - lib.Assemblies.Should().OnlyContain(a => a == "lib/Pack.Age.dll"); - - // When ProjectModel supports path and hashPath in the lock file library, this should assert the values - // provided above. - lib.Path.Should().BeNull(); - lib.HashPath.Should().BeNull(); - - var asm = context.CompileLibraries.Should().Contain(l => l.Name == "System.Collections").Subject; - asm.Type.Should().Be("referenceassembly"); - asm.Version.Should().Be("3.3.3"); - asm.Hash.Should().BeEmpty(); - asm.Dependencies.Should().BeEmpty(); - asm.Assemblies.Should().OnlyContain(a => a == "System.Collections.dll"); - asm.Path.Should().BeNull(); - asm.HashPath.Should().BeNull(); - } - - [Fact] - public void FillsResources() - { - var context = Build(runtimeExports: new[] - { - Export(PackageDescription("Pack.Age", version: new NuGetVersion(1, 2, 3)), - resourceAssemblies: new [] - { - new LibraryResourceAssembly(new LibraryAsset("Dll", "resources/en-US/Pack.Age.dll", ""), "en-US") - }) - }); - - context.RuntimeLibraries.Should().HaveCount(1); - - var lib = context.RuntimeLibraries.Should().Contain(l => l.Name == "Pack.Age").Subject; - lib.ResourceAssemblies.Should().OnlyContain(l => l.Locale == "en-US" && l.Path == "resources/en-US/Pack.Age.dll"); - } - - [Fact] - public void ReferenceAssembliesPathRelativeToDefaultRoot() - { - var context = Build(compilationExports: new[] - { - Export(ReferenceAssemblyDescription("System.Collections", - version: new NuGetVersion(3, 3, 3)), - compilationAssemblies: new[] - { - new LibraryAsset("Dll", "", Path.Combine(_referenceAssembliesPath, "sub", "System.Collections.dll")) - }) - }); - - var asm = context.CompileLibraries.Should().Contain(l => l.Name == "System.Collections").Subject; - asm.Assemblies.Should().OnlyContain(a => a == Path.Combine("sub", "System.Collections.dll")); - } - - [Fact] - public void SkipsBuildDependencies() - { - var context = Build(compilationExports: new[] - { - Export(PackageDescription("Pack.Age", - dependencies: new[] - { - new LibraryRange("System.Collections", - new VersionRange(new NuGetVersion(2, 1, 2)), - LibraryType.ReferenceAssembly, - LibraryDependencyType.Build) - }) - ), - Export(ReferenceAssemblyDescription("System.Collections", - version: new NuGetVersion(3, 3, 3))) - }); - - var lib = context.CompileLibraries.Should().Contain(l => l.Name == "Pack.Age").Subject; - lib.Dependencies.Should().BeEmpty(); - } - - [Fact] - public void GeneratesRuntimeSignatureOutOfPackageNamesAndVersions() - { - var context = Build(runtimeExports: new[] - { - Export(PackageDescription("Pack.Age", new NuGetVersion(1, 2, 3))), - Export(PackageDescription("Pack.Age", new NuGetVersion(1, 2, 3))), - }); - - context.Target.RuntimeSignature.Should().Be("d0fc00006ed69e4aae80383dda08599a6892fd31"); - } - - - private LibraryExport Export( - LibraryDescription description, - IEnumerable compilationAssemblies = null, - IEnumerable runtimeAssemblyGroups = null, - IEnumerable nativeLibraryGroups = null, - IEnumerable resourceAssemblies = null) - { - return LibraryExportBuilder.Create(description) - .WithCompilationAssemblies(compilationAssemblies) - .WithRuntimeAssemblyGroups(runtimeAssemblyGroups) - .WithNativeLibraryGroups(nativeLibraryGroups) - .WithResourceAssemblies(resourceAssemblies) - .Build(); - } - - private PackageDescription PackageDescription( - string name = null, - NuGetVersion version = null, - string hash = null, - IEnumerable dependencies = null, - bool? servicable = null, - string path = null, - string hashPath = null) - { - // The LockFilePackageLibrary type in Microsoft.DotNet.ProjectModel currently does not - // support the "path" property. Therefore, the path property to this method is ignored - // and calling tests should assert that the value is not plumbed through. - return new PackageDescription( - "PATH", - new LockFilePackageLibrary() - { - Files = new string[] { }, - IsServiceable = servicable ?? false, - Name = name ?? _defaultName, - Version = version ?? _defaultVersion, - Sha512 = hash ?? _defaultHash - }, - new LockFileTargetLibrary(), - dependencies ?? Enumerable.Empty(), - true, - true); - } - - private ProjectDescription ProjectDescription( - string name = null, - NuGetVersion version = null, - IEnumerable dependencies = null) - { - return new ProjectDescription( - new LibraryRange( - name ?? _defaultName, - new VersionRange(version ?? _defaultVersion), - LibraryType.Project, - LibraryDependencyType.Default - ), - new Project(), - dependencies ?? Enumerable.Empty(), - new TargetFrameworkInformation(), - true); - } - - private LibraryDescription ReferenceAssemblyDescription( - string name = null, - NuGetVersion version = null) - { - return new LibraryDescription( - new LibraryIdentity( - name ?? _defaultName, - version ?? _defaultVersion, - LibraryType.ReferenceAssembly), - string.Empty, // Framework assemblies don't have hashes - "PATH", - Enumerable.Empty(), - _defaultFramework, - true, - true); - } - } -} diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj index da448526ca8df..7717367bbbbe1 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj @@ -13,8 +13,6 @@ - - diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj index 3396f4b39c095..48a4bb08533e0 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj @@ -3,6 +3,8 @@ 3.11 $(MicrosoftCodeAnalysisVersion_3_11) + + false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj index 862fe40be95fa..5edc008cb5b86 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj @@ -4,6 +4,8 @@ 4.0 $(MicrosoftCodeAnalysisVersion_4_0) $(DefineConstants);ROSLYN4_0_OR_GREATER + + false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj index 477019528c026..a4ba910907f02 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj @@ -3,6 +3,8 @@ $(MicrosoftCodeAnalysisVersion_3_11) true + + false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj index 2c991cca742c3..85734f21fcca6 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj @@ -6,6 +6,8 @@ true -O1 false + + false diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index 350d11a76a9a9..77a909d923c9d 100644 --- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -94,6 +94,6 @@ - + diff --git a/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj b/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj index 594def676a1ad..d180cd0e34b89 100644 --- a/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj +++ b/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj @@ -10,6 +10,11 @@ + + + + + diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj index 076244c304bb8..f5fa756b2fc3e 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj @@ -19,6 +19,12 @@ + + + + + + diff --git a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj index 635669006eb25..65bccc63b316c 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj @@ -28,6 +28,11 @@ + + + + + diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj index 7574caa597790..471d660264837 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj @@ -43,6 +43,11 @@ + + + + + diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/SerializationTypes/SerializationTypes.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/SerializationTypes/SerializationTypes.csproj index e8099b1694ee7..4967c15f1e066 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/SerializationTypes/SerializationTypes.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/SerializationTypes/SerializationTypes.csproj @@ -14,7 +14,7 @@ - + all diff --git a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn3.11.csproj b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn3.11.csproj index 8806a744913a7..3cdebbd97e2e7 100644 --- a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn3.11.csproj +++ b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn3.11.csproj @@ -4,6 +4,8 @@ netstandard2.0 3.11 $(MicrosoftCodeAnalysisVersion_3_11) + + false diff --git a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.0.csproj b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.0.csproj index f6105fd254134..b1e819265f8d2 100644 --- a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.0.csproj +++ b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.0.csproj @@ -5,6 +5,8 @@ 4.0 $(MicrosoftCodeAnalysisVersion_4_0) $(DefineConstants);ROSLYN4_0_OR_GREATER + + false diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.TestLibrary/System.Text.Json.TestLibrary.Roslyn3.11.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.TestLibrary/System.Text.Json.TestLibrary.Roslyn3.11.csproj index 367b28d96d371..19b817863914b 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.TestLibrary/System.Text.Json.TestLibrary.Roslyn3.11.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.TestLibrary/System.Text.Json.TestLibrary.Roslyn3.11.csproj @@ -1,5 +1,10 @@ + + + false + + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Roslyn3.11.Unit.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Roslyn3.11.Unit.Tests.csproj index 6c89551e7dd97..5326f2b2da2d3 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Roslyn3.11.Unit.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Roslyn3.11.Unit.Tests.csproj @@ -2,6 +2,8 @@ $(MicrosoftCodeAnalysisVersion_3_11) true + + false diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj index dd8f9603cd719..1edf95f93769f 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj @@ -74,6 +74,12 @@ + + + + + + $(OutputPath).runsettings $(ArtifactsObjDir)vscode\.runsettings + + + false diff --git a/src/tests/Common/external/external.csproj b/src/tests/Common/external/external.csproj index 471ccb1f3a16d..0d8ceaa3f7d2a 100644 --- a/src/tests/Common/external/external.csproj +++ b/src/tests/Common/external/external.csproj @@ -66,7 +66,7 @@ - + diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj index 8323dd02f82af..3379e06af5725 100644 --- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj +++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj @@ -22,6 +22,11 @@ + + + + +