From fd2639ff7b9e8353bb48c0eb6668c8bf32d19792 Mon Sep 17 00:00:00 2001 From: Tim Cassell <35501420+timcassell@users.noreply.github.com> Date: Mon, 17 Jul 2023 04:14:13 -0400 Subject: [PATCH] Removed `PackageReference` from copied settings. (#2365) --- .../Toolchains/CsProj/CsProjGenerator.cs | 3 +- .../CsProjGeneratorTests.cs | 58 ------------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs index 2934a28ed2..d732275d95 100644 --- a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs +++ b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs @@ -34,8 +34,7 @@ public class CsProjGenerator : DotNetCliGenerator, IEquatable "CopyLocalLockFileAssemblies", "PreserveCompilationContext", "UserSecretsId", - "EnablePreviewFeatures", - "PackageReference" + "EnablePreviewFeatures" }.ToImmutableArray(); public string RuntimeFrameworkVersion { get; } diff --git a/tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs b/tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs index 1888e05227..715d7dad64 100644 --- a/tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs +++ b/tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs @@ -94,64 +94,6 @@ public void UseWpfSettingGetsCopied() Assert.Equal("Microsoft.NET.Sdk", sdkName); } - [Fact] - public void PackageReferenceSingleLineGetsCopied() - { - const string WithPackageReference = @" - - - AnyCPU - - - - - - -"; - var sut = new CsProjGenerator("netcoreapp3.0", null, null, null, true); - - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(WithPackageReference); - var (customProperties, sdkName) = sut.GetSettingsThatNeedToBeCopied(xmlDoc, TestAssemblyFileInfo); - - AssertCustomProperties(@" - -", customProperties); - Assert.Equal("Microsoft.NET.Sdk", sdkName); - } - - [Fact] - public void PackageReferenceMultiLineGetsCopied() - { - const string WithPackageReference = @" - - - AnyCPU - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - -"; - var sut = new CsProjGenerator("netcoreapp3.0", null, null, null, true); - - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(WithPackageReference); - var (customProperties, sdkName) = sut.GetSettingsThatNeedToBeCopied(xmlDoc, TestAssemblyFileInfo); - - AssertCustomProperties(@" - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - -", customProperties); - Assert.Equal("Microsoft.NET.Sdk", sdkName); - } - [Fact] public void SettingsFromPropsFileImportedUsingAbsolutePathGetCopies() {